From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-ui/src/router/index.js | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index cedf0b3..cda6d4c 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -95,7 +95,7 @@
path: 'role/:userId(\\d+)',
component: (resolve) => require(['@/views/system/user/authRole'], resolve),
name: 'AuthRole',
- meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user'}
+ meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user' }
}
]
},
@@ -108,7 +108,7 @@
path: 'user/:roleId(\\d+)',
component: (resolve) => require(['@/views/system/role/authUser'], resolve),
name: 'AuthUser',
- meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role'}
+ meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role' }
}
]
},
@@ -121,7 +121,7 @@
path: 'index/:dictId(\\d+)',
component: (resolve) => require(['@/views/system/dict/data'], resolve),
name: 'Data',
- meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict'}
+ meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict' }
}
]
},
@@ -139,19 +139,6 @@
]
},
{
- path: '/monitor/job-log',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'index',
- component: (resolve) => require(['@/views/monitor/job/log'], resolve),
- name: 'JobLog',
- meta: { title: '璋冨害鏃ュ織', activeMenu: '/monitor/job'}
- }
- ]
- },
- {
path: '/tool/gen-edit',
component: Layout,
hidden: true,
@@ -160,14 +147,13 @@
path: 'index',
component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit',
- meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen'}
+ meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen' }
}
]
}
]
export default new Router({
- base: "", // 椤圭洰鍓嶇紑 涓� publicPath 鍚屾 渚嬪 /api
mode: 'history', // 鍘绘帀url涓殑#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
--
Gitblit v1.9.3