From 9da65b49f79adda9264c4c6b523647efdbc5131c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 22 Nov 2024 16:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E9=99=86=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw-ui/src/store/modules/permission.js |  4 ++--
 hw-ui/src/views/login.vue             | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/hw-ui/src/store/modules/permission.js b/hw-ui/src/store/modules/permission.js
index 5bfd2cf..0078e8a 100644
--- a/hw-ui/src/store/modules/permission.js
+++ b/hw-ui/src/store/modules/permission.js
@@ -59,7 +59,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
     if (type && route.children) {
       route.children = filterChildren(route.children)
     }
-    if (route.component &&  !(route.name === 'Board')) {
+    if (route.component &&  !(route.name === 'Board' || route.name === 'Produce')) {
       // Layout ParentView 组件特殊处理
       if (route.component === 'Layout') {
         route.component = Layout
@@ -71,7 +71,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
         route.component = loadView(route.component)
       }
     }
-    if(route.name === 'Board'){
+    if(route.name === 'Board' || route.name === 'Produce'){
       route.component = Layout2
     }
     if (route.children != null && route.children && route.children.length) {
diff --git a/hw-ui/src/views/login.vue b/hw-ui/src/views/login.vue
index 69bd3ef..fd2b992 100644
--- a/hw-ui/src/views/login.vue
+++ b/hw-ui/src/views/login.vue
@@ -120,57 +120,57 @@ export default {
         {
           floor: 1,
           processId: 11,
-          route: '/board/firstFloor'
+          route: '/produce/firstFloor'
         },
         {
           floor: 1,
           processId: 12,
-          route: '/board/firstFloor'
+          route: '/produce/firstFloor'
         },
         {
           floor: 4,
           processId: 41,
-          route: '/board/laserLight'
+          route: '/produce/laserLight'
         },
         {
           floor: 4,
           processId: 42,
-          route: '/board/weld'//折弯
+          route: '/produce/weld'//折弯
         },
         {
           floor: 4,
           processId: 43,
-          route: '/board/weld'//焊接
+          route: '/produce/weld'//焊接
         },
         {
           floor: 4,
           processId: 44,
-          route: '/board/assemble'//装配
+          route: '/produce/assemble'//装配
         },
         {
           floor: 5,
           processId: 51,
-          route: '/board/fifthFloor?id=1'//拆分
+          route: '/produce/fifthFloor?id=1'//拆分
         },
         {
           floor: 5,
           processId: 52,
-          route: '/board/fifthFloor?id=2'//装配
+          route: '/produce/fifthFloor?id=2'//装配
         },
         {
           floor: 5,
           processId: 54,
-          route: '/board/fifthFloor?id=3'//自检
+          route: '/produce/fifthFloor?id=3'//自检
         },
         {
           floor: 1,
           processId: 511,
-          route: '/board/firstFloor?id=2'//一楼包装制作工序
+          route: '/produce/firstFloor?id=2'//一楼包装制作工序
         },
         {
           floor: 1,
           processId: 512,
-          route: '/board/firstFloor?id=3'//一楼包装工序
+          route: '/produce/firstFloor?id=3'//一楼包装工序
         }
       ]
     }
@@ -234,7 +234,7 @@ export default {
               routeData = {
                 floor: 4,
                 processId: 44,
-                route: '/board/assemble'//装配
+                route: '/produce/assemble'//装配
               }
             }
             let query = { processName: this.loginForm.processName }