From aebc5d85da25b3b352dba1ceb76bacf3f464382b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 四月 2025 17:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/router/index.js |   70 +++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 3e4acc2..c320bf6 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -221,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')
     }
   ]
  },
@@ -279,6 +284,11 @@
               path: '/hollow/hollowequipmenttwo',
               name: 'hollowequipmenttwo',
               component: () => import('../views/hollow/hollowequipmenttwo.vue')
+            },
+            {
+              path: '/hollow/hollowequipmenthree',
+              name: 'hollowequipmenthree',
+              component: () => import('../views/hollow/hollowequipmenthree.vue')
             },
             {
               path: '/hollow/hollowslicecage',
@@ -351,6 +361,42 @@
            ]
           },
           {
+             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'),
@@ -410,6 +456,30 @@
                     },
                   ]
                  },
+                 {
+                  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')
+                      },
+                    ]
+                   },
   ]
 })
 // 瀵艰埅瀹堝崼  

--
Gitblit v1.8.0