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 | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 9851eb8..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')
- },
+ }
]
},
/*----------- 鎺扮墖/璇嗗埆 ----------------*/
@@ -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')
}
]
},
@@ -281,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')
@@ -289,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')
},
]
},
@@ -374,6 +394,18 @@
},
]
},
+ {
+ 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',
@@ -458,6 +490,30 @@
},
]
},
+ {
+ 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