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

疯狂的狮子li

2020-04-29 1dae7c9bc944880863e81438d46f36ccb6865ca0

 ruoyi-ui/src/router/index.js

@@ -33,23 +33,23 @@
    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 @@
    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 @@
    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 @@
    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 @@
    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 @@
    children: [
      {
        path: 'edit',
        component: () => import('@/views/tool/gen/editTable'),
        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
        name: 'GenEdit',
        meta: { title: '修改生成配置' }
      }