From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/router/index.js |  129 +++++++++++++++++-------------------------
 1 files changed, 53 insertions(+), 76 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index c62b00d..fdf4514 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -27,8 +27,6 @@
       name: 'main',
       component: () => import('../layout/MainErpView.vue'),
       children:[
-        
-        
         {
           path: 'Temperedlayout',
           name: 'Temperedlayout',
@@ -41,45 +39,12 @@
             }
          ]
         },
-      
-/*----------- 鐢ㄦ埛鍒楄〃 ----------------*/
-// {
-//   path: 'User',
-//   name: 'User',
-//   component: () => import('../views/User/userlist.vue'),
-//   children:[
-//     {
-//       path: '/User/userlist',
-//       name: 'userlist',
-//       component: () => import('../views/User/userlist.vue')
-//     },
-//   ]
-//   },
-  
-/*----------- 鏉冮檺鍒楄〃 ----------------*/
-// {
-//   path: 'Permissions',
-//   name: 'Permissions',
-//   component: () => import('../views/Permissions/permissionslist.vue'),
-//   children:[
-//     {
-//       path: '/Permissions/permissionslist',
-//       name: 'permissionslist',
-//       component: () => import('../views/Permissions/permissionslist.vue')
-//     },
-//   ]
-//   },
         /*----------- 涓婄墖鏈� ----------------*/
       {
         path: 'Returns',
         name: 'return',
         component: () => import('../views/Returns/return.vue'),
         children:[
-          {
-            path: '/Returns/returns',
-            name: 'returns',
-            component: () => import('../views/Returns/returns.vue')
-          },
           {
             path: '/Returns/upreturns',
             name: 'upreturns',
@@ -108,6 +73,11 @@
           name: 'identifwu',
           component: () => import('../views/Identify/identifwu.vue')
         },
+        {
+          path: '/Identify/identifwutwo',
+          name: 'identifwutwo',
+          component: () => import('../views/Identify/identifwutwo.vue')
+        },
       ]
     },
     /*----------- 鍗у紡缂撳瓨 ----------------*/
@@ -125,11 +95,6 @@
         path: '/Caching/cachingun',
         name: 'cachingun',
         component: () => import('../views/Caching/cachingun.vue')
-      },
-      {
-        path: '/Caching/cachingyiwu',
-        name: 'cachingyiwu',
-        component: () => import('../views/Caching/cachingyiwu.vue')
       },
     ]
   },
@@ -187,34 +152,6 @@
   },
 ]
 },
-          /*----------- 涓嬬墖鍙� ----------------*/
-        {
-          path: 'UnLoadGlass',
-          name: 'UnLoadGlass',
-          component: () => import('../views/UnLoadGlass/UnLoadGlass.vue'),
-          children:[
-            {
-              path: '/UnLoadGlass/loadmachinerack',
-              name: 'loadmachinerack',
-              component: () => import('../views/UnLoadGlass/loadmachinerack.vue')
-            },
-            {
-              path: '/UnLoadGlass/loadmachineracktwo',
-              name: 'loadmachineracktwo',
-              component: () => import('../views/UnLoadGlass/loadmachineracktwo.vue')
-            },
-            {
-              path: '/UnLoadGlass/Landingindication',
-              name: 'Landingindication',
-              component: () => import('../views/UnLoadGlass/Landingindication.vue')
-            },
-            {
-              path: '/UnLoadGlass/Landingindicationtwo',
-              name: 'Landingindicationtwo',
-              component: () => import('../views/UnLoadGlass/Landingindicationtwo.vue')
-            }
-          ]
-        },
          /*----------- 浠撳偍涓績 ----------------*/
          {
           path: 'GlassStorage',
@@ -280,7 +217,7 @@
     }
   ]
  },
-  /*----------- 澶у睆鏄剧ず ----------------*/
+  /*----------- 鏄剧ず ----------------*/
   {
     path: 'largescreen',
     name: 'largescreen',
@@ -298,7 +235,7 @@
     path: 'reportWork',
     name: 'reportWork',
     component: () => import('../views/ReportWork/reportWork.vue'),
-    children:[
+    children: [
       {
         path: '/ReportWork/reportWork',
         name: 'reportWork',
@@ -306,6 +243,48 @@
       },
     ]
   },
+  
+  /*----------- 澶у睆鏄剧ず ----------------*/
+  {
+    path: 'largescreendisplay',
+    name: 'screendisplay',
+    component: () => import('../views/largescreendisplay/screendisplay.vue'),
+    children: [
+      {
+        path: '/largescreendisplay/screendisplay',
+        name: 'screendisplay',
+        component: () => import('../views/largescreendisplay/screendisplay.vue')
+      },
+    ]
+  },
+        /*----------- 涓┖ ----------------*/
+        {
+          path: 'hollow',
+          name: 'hol',
+          component: () => import('../views/hollow/hol.vue'),
+          children: [
+            {
+              path: '/hollow/hollowequipment',
+              name: 'hollowequipment',
+              component: () => import('../views/hollow/hollowequipment.vue')
+            },
+            {
+              path: '/hollow/hollowequipmenttwo',
+              name: 'hollowequipmenttwo',
+              component: () => import('../views/hollow/hollowequipmenttwo.vue')
+            },
+            {
+              path: '/hollow/hollowslicecage',
+              name: 'hollowslicecage',
+              component: () => import('../views/hollow/hollowslicecage.vue')
+            },
+            {
+              path: '/hollow/hollowaluminum',
+              name: 'hollowaluminum',
+              component: () => import('../views/hollow/hollowaluminum.vue')
+            },
+          ]
+        },
         /*----------- 绠＄悊绯荤粺 ----------------*/
         {
           path: 'sys',
@@ -329,10 +308,10 @@
             // },
           ]
         },
-        {
-          path: '',
-          redirect: '/Returns/returns'
-        }
+        // {
+        //   path: '',
+        //   redirect: '/hollow/hollowslicecage'
+        // }
       ]
     },
     {
@@ -340,10 +319,8 @@
       name: 'register',
       component: () => import('../views/RegisterView.vue')
     }
-    
   ]
 })
- 
 // 瀵艰埅瀹堝崼  
 router.beforeEach((to, from, next) => {  
   const isAuthenticated = !!localStorage.getItem('authToken'); // 鍋囪杩欐槸浣犵殑鐧诲綍鐘舵�佹鏌ラ�昏緫  

--
Gitblit v1.8.0