From b8317a562c1e144f74435ccedf7db68a8e1cd5ee Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Mon, 30 Aug 2021 16:59:55 +0800
Subject: [PATCH] !303 修改非管理员登录时，获取菜单报错sql Merge pull request !303 from Gold_Fish/master
---
ruoyi-ui/src/router/index.js | 92 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 74 insertions(+), 18 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 47ddd61..95824b3 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -17,28 +17,45 @@
* redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
* name:'router-name' // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
* meta : {
- roles: ['admin','editor'] // 设置该路由进入的权限，支持多个权限叠加
+ noCache: true // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
- icon: 'svg-name' // 设置该路由的图标，对应路径src/icons/svg
+ icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
+ activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。
}
*/
// 公共路由
export const constantRoutes = [
{
+ path: '/redirect',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: '/redirect/:path(.*)',
+ 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
},
{
@@ -48,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 }
}
]
},
@@ -62,35 +79,74 @@
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: '/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.2