xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-10 19:23:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
	ruoyi/src/main/resources/vm/java/domain.java.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
This commit is contained in:
疯狂的狮子li
2020-04-29 09:16:29 +08:00
parent 405ad4280c aa23ef1e99
commit 1dae7c9bc9
11 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,23 +33,23 @@ export const constantRoutes = [
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: '/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,7 +59,7 @@ export const constantRoutes = [
children: [
{
path: 'index',
component: () => import('@/views/index'),
component: (resolve) => require(['@/views/index'], resolve),
name: '首页',
meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
}
@@ -73,7 +73,7 @@ export const constantRoutes = [
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' }
}
@@ -86,7 +86,7 @@ export const constantRoutes = [
children: [
{
path: 'type/data/:dictId(\\d+)',
component: () => import('@/views/system/dict/data'),
component: (resolve) => require(['@/views/system/dict/data'], resolve),
name: 'Data',
meta: { title: '字典数据', icon: '' }
}
@@ -99,7 +99,7 @@ export const constantRoutes = [
children: [
{
path: 'log',
component: () => import('@/views/monitor/job/log'),
component: (resolve) => require(['@/views/monitor/job/log'], resolve),
name: 'JobLog',
meta: { title: '调度日志' }
}
@@ -112,7 +112,7 @@ export const constantRoutes = [
children: [
{
path: 'edit',
component: () => import('@/views/tool/gen/editTable'),
component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit',
meta: { title: '修改生成配置' }
}