From 7be17ea89a0f18e47bccd7560d4dacc82891eb82 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 11 八月 2021 10:13:34 +0800
Subject: [PATCH] Excel注解支持Image图片导入

---
 ruoyi-ui/src/router/index.js |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 67fca82..b593898 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -5,7 +5,6 @@
 
 /* Layout */
 import Layout from '@/layout'
-import ParentView from '@/components/ParentView';
 
 /**
  * Note: 路由配置项
@@ -22,6 +21,7 @@
     title: 'title'               // 设置该路由在侧边栏和面包屑中展示的名字
     icon: 'svg-name'             // 设置该路由的图标,对应路径src/assets/icons/svg
     breadcrumb: false            // 如果设置为false,则不会在breadcrumb面包屑中显示
+    activeMenu: '/system/user'   // 当路由设置了该属性,则会高亮相对应的侧边栏。
   }
  */
 
@@ -41,6 +41,11 @@
   {
     path: '/login',
     component: (resolve) => require(['@/views/login'], resolve),
+    hidden: true
+  },
+  {
+    path: '/register',
+    component: (resolve) => require(['@/views/register'], resolve),
     hidden: true
   },
   {
@@ -81,7 +86,7 @@
     ]
   },
   {
-    path: '/auth',
+    path: '/system/user-auth',
     component: Layout,
     hidden: true,
     children: [
@@ -89,46 +94,59 @@
         path: 'role/:userId(\\d+)',
         component: (resolve) => require(['@/views/system/user/authRole'], resolve),
         name: 'AuthRole',
-        meta: { title: '分配角色'}
+        meta: { title: '分配角色', activeMenu: '/system/user'}
       }
     ]
   },
   {
-    path: '/dict',
+    path: '/system/role-auth',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: 'type/data/:dictId(\\d+)',
+        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: '字典数据', 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'}
       }
     ]
   }

--
Gitblit v1.9.2