From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/router/index.js |  199 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 197 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index fdf4514..ac5b19f 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -54,7 +54,7 @@
             path: '/Returns/upreturns2',
             name: 'upreturns2',
             component: () => import('../views/Returns/upreturns2.vue')
-          },
+          }
         ]
       },
       /*----------- 鎺扮墖/璇嗗埆 ----------------*/
@@ -132,7 +132,14 @@
     name: 'slicecage',
     component: () => import('../views/Slicecage/slicecage.vue')
   },
+  
 ]
+
+// {
+//   path: '/slicecagehistory',  
+//   name: 'slicecagehistory',  
+//   component: () => import('../views/slicecagehistory.vue')
+// },
 },
 /*----------- 閽㈠寲 ----------------*/
 {
@@ -214,6 +221,11 @@
       path: '/User/permissions',
       name: 'permissions',
       component: () => import('../views/User/permissions.vue')
+    },
+    {
+      path: '/User/userpageNo',
+      name: 'userpageNo',
+      component: () => import('../views/User/userpageNo.vue')
     }
   ]
  },
@@ -274,6 +286,11 @@
               component: () => import('../views/hollow/hollowequipmenttwo.vue')
             },
             {
+              path: '/hollow/hollowequipmenthree',
+              name: 'hollowequipmenthree',
+              component: () => import('../views/hollow/hollowequipmenthree.vue')
+            },
+            {
               path: '/hollow/hollowslicecage',
               name: 'hollowslicecage',
               component: () => import('../views/hollow/hollowslicecage.vue')
@@ -282,6 +299,16 @@
               path: '/hollow/hollowaluminum',
               name: 'hollowaluminum',
               component: () => import('../views/hollow/hollowaluminum.vue')
+            },
+            {
+              path: '/hollow/hollowaluminumtwo',
+              name: 'hollowaluminumtwo',
+              component: () => import('../views/hollow/hollowaluminumtwo.vue')
+            },
+            {
+              path: '/hollow/hollowaluminumthree',
+              name: 'hollowaluminumthree',
+              component: () => import('../views/hollow/hollowaluminumthree.vue')
             },
           ]
         },
@@ -318,7 +345,175 @@
       path: '/register',
       name: 'register',
       component: () => import('../views/RegisterView.vue')
-    }
+    },
+    {
+       path: '/slicecagehistory',
+        name: 'slicecagehistory',
+        component: () => import('../views/Slicecage/slicecagehistory.vue'),
+        children: [
+          {
+           path: '/Slicecage/slicecagehistory',
+           name: 'slicecagehistory',
+           component: () => import('../views/Slicecage/slicecagehistory.vue')
+          },
+        ]
+       },
+       {
+          path: '/hellowslicecagehistory',
+           name: 'hellowslicecagehistory',
+           component: () => import('../views/hollow/hellowslicecagehistory.vue'),
+           children: [
+             {
+              path: '/hollow/hellowslicecagehistory',
+              name: 'hellowslicecagehistory',
+              component: () => import('../views/hollow/hellowslicecagehistory.vue')
+             },
+           ]
+          },
+          {
+             path: '/hellowquiphistory',
+              name: 'hellowquiphistory',
+              component: () => import('../views/hollow/hellowquiphistory.vue'),
+              children: [
+                {
+                 path: '/hollow/hellowquiphistory',
+                 name: 'hellowquiphistory',
+                 component: () => import('../views/hollow/hellowquiphistory.vue')
+                },
+              ]
+             },
+             {
+                path: '/hellowquiptwohistory',
+                 name: 'hellowquiptwohistory',
+                 component: () => import('../views/hollow/hellowquiptwohistory.vue'),
+                 children: [
+                   {
+                    path: '/hollow/hellowquiptwohistory',
+                    name: 'hellowquiptwohistory',
+                    component: () => import('../views/hollow/hellowquiptwohistory.vue')
+                   },
+                 ]
+                },
+                {
+                   path: '/hellowquipthreehistory',
+                    name: 'hellowquipthreehistory',
+                    component: () => import('../views/hollow/hellowquipthreehistory.vue'),
+                    children: [
+                      {
+                       path: '/hollow/hellowquipthreehistory',
+                       name: 'hellowquipthreehistory',
+                       component: () => import('../views/hollow/hellowquipthreehistory.vue')
+                      },
+                    ]
+                   },
+          {
+             path: '/cachingbeforehistory',
+              name: 'cachingbeforehistory',
+              component: () => import('../views/Caching/cachingbeforehistory.vue'),
+              children: [
+                {
+                 path: '/Caching/cachingbeforehistory',
+                 name: 'cachingbeforehistory',
+                 component: () => import('../views/Caching/cachingbeforehistory.vue')
+                },
+              ]
+             },
+             {
+              path: '/cachingunhistory',
+               name: 'cachingunhistory',
+               component: () => import('../views/Caching/cachingunhistory.vue'),
+               children: [
+                 {
+                  path: '/Caching/cachingunhistory',
+                  name: 'cachingunhistory',
+                  component: () => import('../views/Caching/cachingunhistory.vue')
+                 },
+               ]
+              },
+              {
+               path: '/rawhistory',
+                name: 'rawhistory',
+                component: () => import('../views/GlassStorage/rawhistory.vue'),
+                children: [
+                  {
+                   path: '/GlassStorage/rawhistory',
+                   name: 'rawhistory',
+                   component: () => import('../views/GlassStorage/rawhistory.vue')
+                  },
+                ]
+               },
+               {
+                path: '/stockhistory',
+                 name: 'stockhistory',
+                 component: () => import('../views/StockBasicData/stockhistory.vue'),
+                 children: [
+                   {
+                    path: '/StockBasicData/stockhistory',
+                    name: 'stockhistory',
+                    component: () => import('../views/StockBasicData/stockhistory.vue')
+                   },
+                 ]
+                },
+                {
+                 path: '/upreturnhistory',
+                  name: 'upreturnhistory',
+                  component: () => import('../views/Returns/upreturnhistory.vue'),
+                  children: [
+                    {
+                     path: '/Returns/upreturnhistory',
+                     name: 'upreturnhistory',
+                     component: () => import('../views/Returns/upreturnhistory.vue')
+                    },
+                  ]
+                 },
+                 {
+                  path: '/upreturnhistory2',
+                   name: 'upreturnhistory2',
+                   component: () => import('../views/Returns/upreturnhistory2.vue'),
+                   children: [
+                     {
+                      path: '/Returns/upreturnhistory2',
+                      name: 'upreturnhistory2',
+                      component: () => import('../views/Returns/upreturnhistory2.vue')
+                     },
+                   ]
+                  },
+                  {
+                   path: '/statistics',
+                    name: 'statistics',
+                    component: () => import('../views/largescreendisplay/statistics.vue'),
+                    children: [
+                      {
+                       path: '/largescreendisplay/statistics',
+                       name: 'statistics',
+                       component: () => import('../views/largescreendisplay/statistics.vue')
+                      },
+                    ]
+                   },
+                   {
+                    path: '/productionstatistics',
+                     name: 'productionstatistics',
+                     component: () => import('../views/largescreendisplay/productionstatistics.vue'),
+                     children: [
+                       {
+                        path: '/largescreendisplay/productionstatistics',
+                        name: 'productionstatistics',
+                        component: () => import('../views/largescreendisplay/productionstatistics.vue')
+                       },
+                     ]
+                    },
+                    {
+                    path: '/timeaxis',
+                     name: 'timeaxis',
+                     component: () => import('../views/largescreendisplay/timeaxis.vue'),
+                     children: [
+                       {
+                        path: '/largescreendisplay/timeaxis',
+                        name: 'timeaxis',
+                        component: () => import('../views/largescreendisplay/timeaxis.vue')
+                       },
+                     ]
+                    }
   ]
 })
 // 瀵艰埅瀹堝崼  

--
Gitblit v1.8.0