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 |   55 +++++++++++++++++++++++++------------------------------
 1 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 6b71a6e..fdf4514 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -152,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',
@@ -245,7 +217,7 @@
     }
   ]
  },
-  /*----------- 澶у睆鏄剧ず ----------------*/
+  /*----------- 鏄剧ず ----------------*/
   {
     path: 'largescreen',
     name: 'largescreen',
@@ -271,7 +243,20 @@
       },
     ]
   },
-
+  
+  /*----------- 澶у睆鏄剧ず ----------------*/
+  {
+    path: 'largescreendisplay',
+    name: 'screendisplay',
+    component: () => import('../views/largescreendisplay/screendisplay.vue'),
+    children: [
+      {
+        path: '/largescreendisplay/screendisplay',
+        name: 'screendisplay',
+        component: () => import('../views/largescreendisplay/screendisplay.vue')
+      },
+    ]
+  },
         /*----------- 涓┖ ----------------*/
         {
           path: 'hollow',
@@ -284,10 +269,20 @@
               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')
+            },
           ]
         },
         /*----------- 绠$悊绯荤粺 ----------------*/

--
Gitblit v1.8.0