jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Browse Source 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/tool/gen/index.vue
This commit is contained in:
疯狂的狮子li
2021-07-27 12:42:41 +08:00
parent 51ae60820d 6a5c86541a
commit 06944747fd
14 changed files with 132 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-ui/src/router/index.js
View File

@ -21,6 +21,7 @@ import Layout from '@/layout'
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。
}
*/
@ -80,7 +81,7 @@ export const constantRoutes = [
]
},
{
path: '/auth',
path: '/system/user-auth',
component: Layout,
hidden: true,
children: [
@ -88,12 +89,12 @@ export const constantRoutes = [
path: 'role/:userId(\\d+)',
component: (resolve) => require(['@/views/system/user/authRole'], resolve),
name: 'AuthRole',
meta: { title: '分配角色'}
meta: { title: '分配角色', activeMenu: '/system/user'}
}
]
},
{
path: '/auth',
path: '/system/role-auth',
component: Layout,
hidden: true,
children: [
@ -101,46 +102,46 @@ export const constantRoutes = [
path: 'user/:roleId(\\d+)',
component: (resolve) => require(['@/views/system/role/authUser'], resolve),
name: 'AuthUser',
meta: { title: '分配用户'}
meta: { title: '分配用户', activeMenu: '/system/role'}
}
]
},
{
path: '/dict',
path: '/system/dict-data',
component: Layout,
hidden: true,
children: [
{
path: 'type/data/:dictId(\\d+)',
path: 'index/:dictId(\\d+)',
component: (resolve) => require(['@/views/system/dict/data'], resolve),
name: 'Data',
meta: { title: '字典数据', icon: '' }
meta: { title: '字典数据', activeMenu: '/system/dict'}
}
]
},
{
path: '/job',
path: '/monitor/job-log',
component: Layout,
hidden: true,
children: [
{
path: 'log',
path: 'index',
component: (resolve) => require(['@/views/monitor/job/log'], resolve),
name: 'JobLog',
meta: { title: '调度日志' }
meta: { title: '调度日志', activeMenu: '/monitor/job'}
}
]
},
{
path: '/gen',
path: '/tool/gen-edit',
component: Layout,
hidden: true,
children: [
{
path: 'edit/:tableId(\\d+)',
path: 'index/:tableId(\\d+)',
component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit',
meta: { title: '修改生成配置' }
meta: { title: '修改生成配置', activeMenu: '/tool/gen'}
}
]
}