合并冲突

2023-11-15 09:10:45 +08:00
parent 95f7004d1c 9a1aa047b0
commit ecc84a1c4b
96 changed files with 7088 additions and 1279 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -71,17 +71,23 @@ export const constantRoutes = [
  },
  {
    path: '/',
-    component: Layout,
-    // redirect: 'core/base/factory',
-    // children: [{
-    //   path: 'index',
-    //   redirect: 'core/base/factory',
-    //   component: (resolve) => require(['@/views/index'], resolve),
-    //   name: '首页',
-    //   meta: { title: '首页', icon: 'dashboard', affix: true }
-    // }
-    // ]
+    component: () => import('@/views/choicePart'),
+    hidden: true,
+    meta: { requireToken: true }
  },
+  // {
+  //   path: '/',
+  //   component: Layout,
+  //   // redirect: 'core/base/factory',
+  //   // children: [{
+  //   //   path: 'index',
+  //   //   redirect: 'core/base/factory',
+  //   //   component: (resolve) => require(['@/views/index'], resolve),
+  //   //   name: '首页',
+  //   //   meta: { title: '首页', icon: 'dashboard', affix: true }
+  //   // }
+  //   // ]
+  // },
  {
    path: '/AGVBoard',
    name: 'AGVBoard',