From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/router/index.js | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index b62dc2c..73a2754 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -85,18 +85,28 @@
name: 'upreturns',
component: () => import('../views/Returns/upreturns.vue')
},
+ {
+ path: '/Returns/upreturns2',
+ name: 'upreturns2',
+ component: () => import('../views/Returns/upreturns2.vue')
+ },
]
},
/*----------- 鎺扮墖/璇嗗埆 ----------------*/
{
path: 'Identify',
- name: 'Identify',
- component: () => import('../views/Identify/identify.vue'),
- children:[
+ name: 'ident',
+ component: () => import('../views/Identify/ident.vue'),
+ children: [
{
path: '/Identify/identify',
name: 'identify',
component: () => import('../views/Identify/identify.vue')
+ },
+ {
+ path: '/Identify/identifwu',
+ name: 'identifwu',
+ component: () => import('../views/Identify/identifwu.vue')
},
]
},
@@ -116,6 +126,11 @@
name: 'cachingun',
component: () => import('../views/Caching/cachingun.vue')
},
+ {
+ path: '/Caching/cachingyiwu',
+ name: 'cachingyiwu',
+ component: () => import('../views/Caching/cachingyiwu.vue')
+ },
]
},
/*----------- 纾ㄨ竟锛堝喎鍔犲伐锛� ----------------*/
@@ -133,6 +148,11 @@
path: '/StockBasicData/stockBasicDatatwo',
name: 'stockBasicDatatwo',
component: () => import('../views/StockBasicData/stockBasicDatatwo.vue')
+ },
+ {
+ path: '/StockBasicData/stockBasicyiwu',
+ name: 'stockBasicyiwu',
+ component: () => import('../views/StockBasicData/stockBasicyiwu.vue')
},
]
},
@@ -213,7 +233,7 @@
}
]
},
-
+
/*----------- 鍙鍖栫郴缁� ----------------*/
{
path: 'Visualization',
@@ -278,7 +298,7 @@
path: 'reportWork',
name: 'reportWork',
component: () => import('../views/ReportWork/reportWork.vue'),
- children:[
+ children: [
{
path: '/ReportWork/reportWork',
name: 'reportWork',
@@ -286,6 +306,20 @@
},
]
},
+
+ /*----------- 涓┖ ----------------*/
+ {
+ path: 'hollow',
+ name: 'hollowequipment',
+ component: () => import('../views/hollow/hollowequipment.vue'),
+ children: [
+ {
+ path: '/hollow/hollowequipment',
+ name: 'hollowequipment',
+ component: () => import('../views/hollow/hollowequipment.vue')
+ },
+ ]
+ },
/*----------- 绠＄悊绯荤粺 ----------------*/
{
path: 'sys',
@@ -323,7 +357,7 @@
]
})
-
+
// 瀵艰埅瀹堝崼
router.beforeEach((to, from, next) => {
const isAuthenticated = !!localStorage.getItem('authToken'); // 鍋囪杩欐槸浣犵殑鐧诲綍鐘舵�佹鏌ラ�昏緫
@@ -333,4 +367,4 @@
next(); // 鍚﹀垯缁х画瀵艰埅
}
});
-export default router
+export default router
\ No newline at end of file
--
Gitblit v1.8.0