From bdfd2f0787b0a39fb65793a7f57c95f5de09edf4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 30 八月 2021 12:49:19 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/router/index.js | 96 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 633235a..381264e 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -17,10 +17,11 @@
* redirect: noRedirect // 褰撹缃� noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮
* name:'router-name' // 璁惧畾璺敱鐨勫悕瀛楋紝涓�瀹氳濉啓涓嶇劧浣跨敤<keep-alive>鏃朵細鍑虹幇鍚勭闂
* meta : {
- roles: ['admin','editor'] // 璁剧疆璇ヨ矾鐢辫繘鍏ョ殑鏉冮檺锛屾敮鎸佸涓潈闄愬彔鍔�
+ noCache: true // 濡傛灉璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive> 缂撳瓨(榛樿 false)
title: 'title' // 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛�
- icon: 'svg-name' // 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/icons/svg
+ icon: 'svg-name' // 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/assets/icons/svg
breadcrumb: false // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: '/system/user' // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
}
*/
@@ -33,23 +34,28 @@
children: [
{
path: '/redirect/:path(.*)',
- component: () => import('@/views/redirect')
+ component: (resolve) => require(['@/views/redirect'], resolve)
}
]
},
{
path: '/login',
- component: () => import('@/views/login'),
+ component: (resolve) => require(['@/views/login'], resolve),
+ hidden: true
+ },
+ {
+ path: '/register',
+ component: (resolve) => require(['@/views/register'], resolve),
hidden: true
},
{
path: '/404',
- component: () => import('@/views/error/404'),
+ component: (resolve) => require(['@/views/error/404'], resolve),
hidden: true
},
{
path: '/401',
- component: () => import('@/views/error/401'),
+ component: (resolve) => require(['@/views/error/401'], resolve),
hidden: true
},
{
@@ -59,9 +65,9 @@
children: [
{
path: 'index',
- component: () => import('@/views/index'),
- name: '棣栭〉',
- meta: { title: '棣栭〉', icon: 'dashboard', noCache: true, affix: true }
+ component: (resolve) => require(['@/views/index'], resolve),
+ name: 'Index',
+ meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
}
]
},
@@ -73,35 +79,87 @@
children: [
{
path: 'profile',
- component: () => import('@/views/system/user/profile/index'),
+ component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
name: 'Profile',
meta: { title: '涓汉涓績', icon: 'user' }
}
]
},
{
- path: '/dict',
+ path: '/system/user-auth',
component: Layout,
hidden: true,
children: [
{
- path: 'type/data/:dictId(\\d+)',
- component: () => import('@/views/system/dict/data'),
- name: 'Data',
- meta: { title: '瀛楀吀鏁版嵁', icon: '' }
+ path: 'role/:userId(\\d+)',
+ component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+ name: 'AuthRole',
+ meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user'}
}
]
},
{
- path: '/gen',
+ path: '/system/role-auth',
component: Layout,
hidden: true,
children: [
{
- path: 'edit',
- component: () => import('@/views/tool/gen/editTable'),
+ path: 'user/:roleId(\\d+)',
+ component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+ name: 'AuthUser',
+ meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role'}
+ }
+ ]
+ },
+ {
+ path: '/system/dict-data',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: 'index/:dictId(\\d+)',
+ component: (resolve) => require(['@/views/system/dict/data'], resolve),
+ name: 'Data',
+ meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict'}
+ }
+ ]
+ },
+ {
+ path: '/system/oss-config',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: 'index',
+ component: (resolve) => require(['@/views/system/oss/config'], resolve),
+ name: 'OssConfig',
+ meta: { title: '閰嶇疆绠＄悊', activeMenu: '/system/oss'}
+ }
+ ]
+ },
+ {
+ 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,
+ children: [
+ {
+ path: 'index/:tableId(\\d+)',
+ component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit',
- meta: { title: '淇敼鐢熸垚閰嶇疆' }
+ meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen'}
}
]
}
--
Gitblit v1.9.3