zhangys36 2 年之前
父節點
當前提交
56276f4912
共有 2 個文件被更改,包括 11 次插入21 次删除
  1. 1 1
      src/permission.js
  2. 10 20
      src/router/index.js

+ 1 - 1
src/permission.js

@@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/login', '/auth-redirect', '/dashboard-screen'] // no redirect whitelist
+const whiteList = ['/login', '/auth-redirect', '/dashboard-screen', '/login1'] // no redirect whitelist
 
 router.beforeEach(async(to, from, next) => {
   // start progress bar

+ 10 - 20
src/router/index.js

@@ -48,6 +48,11 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
+  {
+    path: '/login1',
+    component: () => import('@/views/login/index'),
+    hidden: true
+  },
   {
     path: '/',
     component: Layout,
@@ -70,7 +75,10 @@ export const constantRoutes = [
   //     }
   //   ]
   // },
-
+  {
+    path: '/dashboard-screen',
+    component: () => import('@/views/dashboard-screen/index') // Parent router-view
+  },
   // 404 page must be placed at the end !!!
   {
     path: '/404',
@@ -80,25 +88,7 @@ export const constantRoutes = [
 
 ]
 export const asyncRoutes = [
-  {
-    path: '/dashboard-screen',
-    component: FullScreenLayout,
-    // redirect: '/catenary/fault',
-    name: 'dashboard-screen',
-    meta: {
-      title: '',
-      icon: 'icon-jiechuwang',
-      pages: ['pc:catenary']
-    },
-    children: [
-      {
-        path: '',
-        component: () => import('@/views/dashboard-screen/index'), // Parent router-view
-        name: 'fault',
-        meta: { title: '大屏', pages: ['pc:catenary:jlgz'] }
-      }
-    ]
-  },
+
   {
     path: '/catenary',
     component: Layout,