From d94af68ec3f6317124df81296b08c7c110641fca Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 24 八月 2023 09:10:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/router/index.js | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index d7d2464..524e084 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -167,7 +167,7 @@
meta: { title: '濮旀墭妫�楠�', icon: 'table' },
children: [
{
- path: 'addCommision',
+ path: 'addCommision/:viewId',
name: 'AddCommision',
hidden: true,
component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
@@ -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'),
--
Gitblit v1.9.3