From 250e2cd3c6b63605d2d23d496884ff18fac5e536 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 23 十二月 2024 17:15:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/router/index.js | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 9643500..50c803e 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -46,11 +46,6 @@
component: () => import('../views/Returns/return.vue'),
children:[
{
- path: '/Returns/returns',
- name: 'returns',
- component: () => import('../views/Returns/returns.vue')
- },
- {
path: '/Returns/upreturns',
name: 'upreturns',
component: () => import('../views/Returns/upreturns.vue')
@@ -95,11 +90,6 @@
path: '/Caching/cachingun',
name: 'cachingun',
component: () => import('../views/Caching/cachingun.vue')
- },
- {
- path: '/Caching/cachingyiwu',
- name: 'cachingyiwu',
- component: () => import('../views/Caching/cachingyiwu.vue')
},
]
},
@@ -280,13 +270,18 @@
/*----------- 涓┖ ----------------*/
{
path: 'hollow',
- name: 'hollowequipment',
- component: () => import('../views/hollow/hollowequipment.vue'),
+ name: 'hol',
+ component: () => import('../views/hollow/hol.vue'),
children: [
{
path: '/hollow/hollowequipment',
name: 'hollowequipment',
component: () => import('../views/hollow/hollowequipment.vue')
+ },
+ {
+ path: '/hollow/hollowslicecage',
+ name: 'hollowslicecage',
+ component: () => import('../views/hollow/hollowslicecage.vue')
},
]
},
@@ -315,7 +310,7 @@
},
{
path: '',
- redirect: '/Returns/returns'
+ redirect: '/Returns/upreturns'
}
]
},
--
Gitblit v1.8.0