diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js index d840231d..5a643ac5 100644 --- a/ruoyi-ui/src/common/menuData.js +++ b/ruoyi-ui/src/common/menuData.js @@ -199,6 +199,14 @@ export default [ path: "/datav/maintainQuery", component: "datav/maintainQuery/index.vue", } + // , + // { + // title: "数字路网", + // name: "roadNet", + // path: "/datav/roadNet", + // component: "datav/roadNet/index.vue", + // hide:true + // } ], }, { diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index d9b5789d..baaada2b 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -9,7 +9,7 @@ import permission from './store/modules/permission' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/auth-redirect', '/bind', '/register'] +const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/test'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/ruoyi-ui/src/router/routerCreater.js b/ruoyi-ui/src/router/routerCreater.js index 75122681..40099d32 100644 --- a/ruoyi-ui/src/router/routerCreater.js +++ b/ruoyi-ui/src/router/routerCreater.js @@ -67,6 +67,11 @@ function processNode(node) { let childrenRoutes = processNode(menuData); let routes = [ + { + path:"/test", + name:"test", + component: () => import("@/views/JiHeExpressway/pages/datav/roadNet"), + }, { path: "/index", name: "index", diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index d709779b..e373b439 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -88,7 +88,6 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user - console.log(user , "usssssserrrrrrrrrrr") const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.roles) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/assets/online_bj.jpg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/assets/online_bj.jpg deleted file mode 100644 index 02b4998e..00000000 Binary files a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/assets/online_bj.jpg and /dev/null differ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/index.vue deleted file mode 100644 index 95052e57..00000000 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/index.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/ShareAll.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/ShareAll.svg new file mode 100644 index 00000000..7f32ab1c --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/ShareAll.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/applyitem.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/applyitem.svg new file mode 100644 index 00000000..e6c08e99 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/applyitem.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/arrowRight.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/arrowRight.svg new file mode 100644 index 00000000..e0b03ce6 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/arrowRight.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/process.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/process.svg new file mode 100644 index 00000000..5daac2a9 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/process.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/shareCenter.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/shareCenter.svg new file mode 100644 index 00000000..b085257a --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/shareCenter.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/shareItem.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/shareItem.svg new file mode 100644 index 00000000..f461e4c6 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/shareItem.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/sourceItem.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/sourceItem.svg new file mode 100644 index 00000000..501ab1f8 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/img/sourceItem.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue new file mode 100644 index 00000000..c024691e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue @@ -0,0 +1,52 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue index 947f1d51..35be4143 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue @@ -1,6 +1,5 @@