From ca74edaff644f4ba3b8db64366bf9cdde265b61c Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 15:14:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/router/index.js | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index ba88b65..d21d534 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -192,14 +192,21 @@
children: [
{
path: 'inspectionApplication',
- name: 'InspectionApplication',
+ name: 'inspectionApplication',
component: () => import('@/views/experiment/inspectionApplication/index'),
meta: { title: '鏂板妫�楠�', icon: 'tree' }
},
+ {
+ path: 'Viewdetails',
+ name: 'Viewdetails',
+ hidden: true ,
+ component: () => import('@/views/experiment/inspectionApplication/Viewdetails/index'),
+ meta: { title: '璇︽儏椤�', icon: 'tree' }
+ },
{
path: 'planAssignments',
name: 'PlanAssignments',
- component: () => import('@/views/experiment/planAssignments/index'),
+ component: () => import('@/views/experiment/planAssignments/plan'),
meta: { title: '妫�楠岃鍒�', icon: 'tree' }
},
{
@@ -327,7 +334,14 @@
name: 'Personnel',
component: () => import('@/views/laboratory/personnel/index'),
meta: { title: '浜哄憳绠＄悊', icon: 'tree' }
- },{
+ },
+ {
+ path: 'org',
+ name: 'Organizational',
+ component: () => import('@/views/laboratory/organizational/index.vue'),
+ meta: { title: '缁勭粐鏋舵瀯', icon: 'tree'}
+ },
+ {
path: 'role',
name: 'Role',
component: () => import('@/views/laboratory/role/index'),
@@ -443,6 +457,20 @@
}
]
},
+ {
+ path: '/baseData',
+ component: Layout,
+ redirect: '/baseData/basicDataMessage',
+ meta: { title: '鍩虹鏁版嵁', icon: 'el-icon-s-tools' },
+ children: [
+ {
+ path: '/basicDataMessage',
+ name: 'BasicDataMessage',
+ component: () => import('@/views/basicData/index'),
+ meta: { title: '鍩虹鏁版嵁', icon: 'el-icon-s-tools' }
+ }
+ ]
+ },
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }
]
--
Gitblit v1.9.3