From c81bf2132d6d3b7246075c6faa1382365d5f17e2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 26 八月 2023 15:28:41 +0800
Subject: [PATCH] modified: package.json modified: src/api/standardLibrary.js new file: src/components/experiment/checkTheReport/index.vue modified: src/layout/components/Navbar.vue modified: src/main.js modified: src/router/index.js modified: src/views/chart/work/index.vue modified: src/views/experiment/checkTheReport/index.vue modified: src/views/standardLibrary/index.vue
---
src/router/index.js | 248 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 198 insertions(+), 50 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 94dc6d7..31ff874 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,6 +42,11 @@
hidden: true
},
{
+ path: '/addCommision',
+ component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
+ hidden:true
+ },
+ {
path: '/',
component: Layout,
redirect: '/home',
@@ -53,6 +58,11 @@
meta: { title: '涓婚〉', icon: 'el-icon-s-home' }
}]
},
+ {
+ path: '/addCommision/:viewId',
+ hidden: true,
+ component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
+ },
{
path: '/standardLibrary',
component: Layout,
@@ -74,81 +84,160 @@
}
]
},
+ // {
+ // path: '/rawMaterials',
+ // component: Layout,
+ // redirect: '/rawMaterials/reportForInspection',
+ // name: 'rawMaterials',
+ // meta: { title: '妫�楠�', icon: 'el-icon-s-help' },
+ // children: [
+ // {
+ // path: 'reportForInspection',
+ // name: 'ReportForInspection',
+ // component: () => import('@/views/rawMaterials/reportForInspection/index'),
+ // meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'table' },
+ // children: [
+ // // {
+ // // path: 'index',
+ // // name: 'ReportForInspectionIndex',
+ // // // hidden: true,
+ // // component: () => import('@/views/rawMaterials/reportForInspection/index'),
+ // // meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'table' }
+ // // },
+ // {
+ // path: 'forInspectionDetail',
+ // name: 'ForInspectionDetail',
+ // hidden: true,
+ // component: () => import('@/views/rawMaterials/reportForInspection/forInspectionDetail'),
+ // meta: { title: '鏂板妫�楠屽崟璇︽儏', icon: 'table' }
+ // }
+ // ]
+ // },
+ // {
+ // path: 'print',
+ // name: 'Print',
+ // component: () => import('@/views/rawMaterials/print/index'),
+ // meta: { title: '鏉＄爜鎵撳嵃', icon: 'tree' }
+ // },
+ // {
+ // path: 'planAssignments',
+ // name: 'PlanAssignments',
+ // component: () => import('@/views/rawMaterials/planAssignments/index'),
+ // meta: { title: '妫�楠岃鍒掑垎閰�', icon: 'tree' }
+ // },
+ // {
+ // path: 'rawMaterialInspection',
+ // name: 'RawMaterialInspection',
+ // component: () => import('@/views/rawMaterials/rawMaterialInspection/index'),
+ // meta: { title: '鍘熸潗鏂欐楠�', icon: 'tree' }
+ // },
+ // {
+ // path: 'checkTheReport',
+ // name: 'CheckTheReport',
+ // component: () => import('@/views/rawMaterials/checkTheReport/index'),
+ // meta: { title: '妫�楠屾姤鍛�', icon: 'tree' }
+ // },
+ // {
+ // path: 'reportAuditing',
+ // name: 'ReportAuditing',
+ // component: () => import('@/views/rawMaterials/reportAuditing/index'),
+ // meta: { title: '鎶ュ憡瀹℃牳', icon: 'tree' }
+ // },
+ // {
+ // path: 'nonConformanceReview',
+ // name: 'NonConformanceReview',
+ // component: () => import('@/views/rawMaterials/nonConformanceReview/index'),
+ // meta: { title: '涓嶅悎鏍煎弽棣�', icon: 'tree' }
+ // },
+ // {
+ // path: 'nonConformingFeedback',
+ // name: 'NonConformingFeedback',
+ // component: () => import('@/views/rawMaterials/nonConformingFeedback/index'),
+ // meta: { title: '涓嶅悎鏍艰瘎瀹�', icon: 'tree' }
+ // },
+ // {
+ // path: 'passRateStatistics',
+ // name: 'PassRateStatistics',
+ // component: () => import('@/views/rawMaterials/passRateStatistics/index'),
+ // meta: { title: '鍚堟牸鐜囩粺璁�', icon: 'tree' }
+ // }
+ // ]
+ // },
{
- path: '/rawMaterials',
+ path: '/inspectionManagement',
component: Layout,
- redirect: '/rawMaterials/reportForInspection',
- name: 'rawMaterials',
- meta: { title: '妫�楠�', icon: 'el-icon-s-help' },
+ redirect: '/inspectionManagement/commissionInspection',
+ name: 'InspectionManagement',
+ meta: { title: '鎶ユ绠＄悊', icon: 'el-icon-s-help' },
children: [
+ {
+ path: 'commissionInspection',
+ name: 'CommissionInspection',
+ component: () => import('@/views/inspectionManagement/commissionInspection/index'),
+ meta: { title: '濮旀墭妫�楠�', icon: 'table' }
+ },
{
path: 'reportForInspection',
name: 'ReportForInspection',
- component: () => import('@/views/rawMaterials/reportForInspection/index'),
- meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'table' },
- children: [
- // {
- // path: 'index',
- // name: 'ReportForInspectionIndex',
- // // hidden: true,
- // component: () => import('@/views/rawMaterials/reportForInspection/index'),
- // meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'table' }
- // },
- {
- path: 'forInspectionDetail',
- name: 'ForInspectionDetail',
- hidden: true,
- component: () => import('@/views/rawMaterials/reportForInspection/forInspectionDetail'),
- meta: { title: '鏂板妫�楠屽崟璇︽儏', icon: 'table' }
- }
- ]
- },
+ component: () => import('@/views/inspectionManagement/reportForInspection/index'),
+ meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'tree' }
+ }
+ ]
+ },
+ {
+ path: '/experiment',
+ component: Layout,
+ redirect: '/experiment/inspectionApplication',
+ name: 'Experiment',
+ meta: { title: '璇曢獙绠＄悊', icon: 'el-icon-s-help' },
+ children: [
{
- path: 'print',
- name: 'Print',
- component: () => import('@/views/rawMaterials/print/index'),
- meta: { title: '鏉＄爜鎵撳嵃', icon: 'tree' }
+ path: '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/rawMaterials/planAssignments/index'),
- meta: { title: '妫�楠岃鍒掑垎閰�', icon: 'tree' }
- },
- {
- path: 'rawMaterialInspection',
- name: 'RawMaterialInspection',
- component: () => import('@/views/rawMaterials/rawMaterialInspection/index'),
- meta: { title: '鍘熸潗鏂欐楠�', icon: 'tree' }
+ component: () => import('@/views/experiment/planAssignments/plan'),
+ meta: { title: '妫�楠岃鍒�', icon: 'tree' }
},
{
path: 'checkTheReport',
name: 'CheckTheReport',
- component: () => import('@/views/rawMaterials/checkTheReport/index'),
+ component: () => import('@/views/experiment/checkTheReport/index'),
meta: { title: '妫�楠屾姤鍛�', icon: 'tree' }
},
{
path: 'reportAuditing',
name: 'ReportAuditing',
- component: () => import('@/views/rawMaterials/reportAuditing/index'),
+ component: () => import('@/views/experiment/reportAuditing/index'),
meta: { title: '鎶ュ憡瀹℃牳', icon: 'tree' }
},
{
path: 'nonConformanceReview',
name: 'NonConformanceReview',
- component: () => import('@/views/rawMaterials/nonConformanceReview/index'),
- meta: { title: '涓嶅悎鏍煎弽棣�', icon: 'tree' }
+ component: () => import('@/views/experiment/nonConformanceReview/index'),
+ meta: { title: '涓嶅悎鏍煎搧鍙嶉', icon: 'tree' }
},
{
path: 'nonConformingFeedback',
name: 'NonConformingFeedback',
- component: () => import('@/views/rawMaterials/nonConformingFeedback/index'),
- meta: { title: '涓嶅悎鏍艰瘎瀹�', icon: 'tree' }
+ component: () => import('@/views/experiment/nonConformingFeedback/index'),
+ meta: { title: '涓嶅悎鏍煎搧璇勫', icon: 'tree' }
},
{
path: 'passRateStatistics',
name: 'PassRateStatistics',
- component: () => import('@/views/rawMaterials/passRateStatistics/index'),
+ component: () => import('@/views/experiment/passRateStatistics/index'),
meta: { title: '鍚堟牸鐜囩粺璁�', icon: 'tree' }
}
]
@@ -246,6 +335,51 @@
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' }
+ }
+ ]
+ },
+ {
+ path: '/CNAS',
+ component: Layout,
+ redirect: '/CNAS/reviewAnnualPlan',
+ name: 'CNAS',
+ meta: { title: 'CNAS绠＄悊', icon: 'el-icon-s-help' },
+ children: [
+ {
+ path: 'reviewAnnualPlan',
+ name: 'ReviewAnnualPlan',
+ component: () => import('@/views/CNAS/reviewAnnualPlan/index'),
+ meta: { title: '瀹℃牳骞村害璁″垝', icon: 'table' }
+ },
+ {
+ path: 'nonConformanceManage',
+ name: 'NonConformanceManage',
+ component: () => import('@/views/CNAS/nonConformanceManage/index'),
+ meta: { title: '涓嶇鍚堥」绠＄悊', icon: 'tree' }
+ },
+ {
+ path: 'nonConformanceStatistics',
+ name: 'NonConformanceStatistics',
+ component: () => import('@/views/CNAS/nonConformanceStatistics/index'),
+ meta: { title: '涓嶇鍚堥」缁熻', icon: 'tree' }
+ },
+ {
+ path: 'satisfactionSurveys',
+ name: 'SatisfactionSurveys',
+ component: () => import('@/views/CNAS/satisfactionSurveys/index'),
+ meta: { title: '婊℃剰搴﹁皟鏌�', icon: 'tree' }
}
]
},
@@ -285,22 +419,22 @@
{
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',
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' }
- }
]
},
{
@@ -324,6 +458,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