From 3b3513a1b653af76231ed053cb0d22a362d36876 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期五, 25 八月 2023 17:33:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/router/index.js | 82 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index e1261b7..25cd92c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,6 +42,16 @@
hidden: true
},
{
+ path: '/addCommision',
+ component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
+ hidden:true
+ },
+ {
+ path: '/testReport',
+ component: () => import('@/views/template_testReport/index'),
+ hidden:true
+ },
+ {
path: '/',
component: Layout,
redirect: '/home',
@@ -53,6 +63,11 @@
meta: { title: '涓婚〉', icon: 'el-icon-s-home' }
}]
},
+ {
+ path: '/addCommision/:viewId',
+ hidden: true,
+ component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
+ },
{
path: '/standardLibrary',
component: Layout,
@@ -164,16 +179,7 @@
path: 'commissionInspection',
name: 'CommissionInspection',
component: () => import('@/views/inspectionManagement/commissionInspection/index'),
- meta: { title: '濮旀墭妫�楠�', icon: 'table' },
- children: [
- {
- path: 'addCommision',
- name: 'AddCommision',
- hidden: true,
- component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
- meta: { title: '妫�娴嬩俊鎭�', icon: 'table' }
- }
- ]
+ meta: { title: '濮旀墭妫�楠�', icon: 'table' }
},
{
path: 'reportForInspection',
@@ -192,14 +198,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,6 +340,18 @@
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'),
+ meta: { title: '瑙掕壊绠＄悊', icon: 'tree' }
}
]
},
@@ -399,22 +424,23 @@
{
path: '/message',
component: Layout,
- redirect: '/message/message',
+ redirect: '/message/toDo',
name: 'Message',
meta: { title: '娑堟伅寰呭姙', icon: 'el-icon-s-help' },
children: [
+ {
+ path: 'toDo',
+ name: 'ToDo',
+ component: () => import('@/views/message/toDo/index'),
+ meta: { title: '鎴戠殑寰呭姙', icon: 'tree' }
+ },
{
path: 'message',
name: 'Message',
+ // hidden: true,
component: () => import('@/views/message/message/index'),
- meta: { title: '鎴戠殑娑堟伅', icon: 'table' }
+ // meta: { title: '鎴戠殑娑堟伅', icon: 'table' }
},
- {
- path: 'toDo',
- name: 'ToDo',
- component: () => import('@/views/message/toDo/index'),
- meta: { title: '鎴戠殑寰呭姙', icon: 'tree' }
- }
]
},
{
@@ -438,12 +464,26 @@
}
]
},
+ {
+ 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 }
]
const createRouter = () => new Router({
- // mode: 'history', // require service support
+ mode: 'history',
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})
--
Gitblit v1.9.3