From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新

---
 项目代码/WCS/WCSClient/src/router/viewGird.js |   98 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 98 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
index 7814d0a..571ad18 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
@@ -1,5 +1,6 @@
 
 let viewgird = [
+<<<<<<< HEAD
   {
     path: '/Sys_Log',
     name: 'sys_Log',
@@ -66,5 +67,102 @@
     name: 'packaxis',
     component: () => import('@/views/PackInfo/packaxis.vue')
   }]
+=======
+    {
+        path: '/Sys_Log',
+        name: 'sys_Log',
+        component: () => import('@/views/system/Sys_Log.vue')
+    },
+    {
+        path: '/Sys_User',
+        name: 'Sys_User',
+        component: () => import('@/views/system/Sys_User.vue')
+    },
+    {
+        path: '/permission',
+        name: 'permission',
+        component: () => import('@/views/system/Permission.vue')
+    },
+
+    {
+        path: '/Sys_Dictionary',
+        name: 'Sys_Dictionary',
+        component: () => import('@/views/system/Sys_Dictionary.vue')
+    },
+    {
+        path: '/Sys_Role',
+        name: 'Sys_Role',
+        component: () => import('@/views/system/Sys_Role.vue')
+    }, {
+        path: '/Sys_Role1',
+        name: 'Sys_Role1',
+        component: () => import('@/views/system/Sys_Role1.vue')
+    }, {
+        path: '/Sys_DictionaryList',
+        name: 'Sys_DictionaryList',
+        component: () => import('@/views/system/Sys_DictionaryList.vue')
+    }, {
+        path: '/deviceInfo',
+        name: 'deviceInfo',
+        component: () => import('@/views/quartzJob/deviceInfo.vue')
+    }, {
+        path: '/deviceProtocol',
+        name: 'deviceProtocol',
+        component: () => import('@/views/quartzJob/deviceProtocol.vue')
+    }, {
+        path: '/deviceProtocolDetail',
+        name: 'deviceProtocolDetail',
+        component: () => import('@/views/quartzJob/deviceProtocolDetail.vue')
+    }, {
+        path: '/dispatchInfo',
+        name: 'dispatchInfo',
+        component: () => import('@/views/quartzJob/dispatchInfo.vue')
+    }, {
+        path: '/task',
+        name: 'task',
+        component: () => import('@/views/taskinfo/task.vue')
+    }, {
+        path: '/task_hty',
+        name: 'task_hty',
+        component: () => import('@/views/taskinfo/task_hty.vue')
+    }, {
+        path: '/router',
+        name: 'router',
+        component: () => import('@/views/basicinfo/router.vue')
+    }, {
+        path: '/packaxis',
+        name: 'packaxis',
+        component: () => import('@/views/PackInfo/packaxis.vue')
+    }, {
+        path: '/packtype',
+        name: 'packtype',
+        component: () => import('@/views/PackInfo/packtype.vue')
+    }, {
+        path: '/stationPackInfo',
+        name: 'stationPackInfo',
+        component: () => import('@/views/PackInfo/stationPackInfo.vue')
+    }, {
+        path: '/stationPackDetail',
+        name: 'stationPackDetail',
+        component: () => import('@/views/PackInfo/stationPackDetail.vue')
+    },{
+        path: '/packinfo',
+        name: 'packinfo',
+        component: () => import('@/views/PackInfo/packinfo.vue')
+    }, {
+        path: '/packinfo_hty',
+        name: 'packinfo_hty',
+        component: () => import('@/views/PackInfo/packinfo_hty.vue')
+    },{
+        path: '/packaxistask',
+        name: 'packaxistask',
+        component: () => import('@/views/taskinfo/packaxistask.vue')
+    },{
+        path: '/packaxistask_hty',
+        name: 'packaxistask_hty',
+        component: () => import('@/views/taskinfo/packaxistask_hty.vue')
+    }
+]
+>>>>>>> main
 
 export default viewgird

--
Gitblit v1.9.3