From 5a2f90a16ea969022be66783c26178c83cfc484d Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 08 四月 2022 18:57:37 +0800
Subject: [PATCH] Merge branches 'master' and 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/router/index.js | 214 +++++++++-------------------------------------------
1 files changed, 39 insertions(+), 175 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 3f428f8..62095f4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,7 +34,6 @@
component: () => import('@/views/login/index'),
hidden: true
},
-
{
path: '/auth-redirect',
component: () => import('@/views/login/authredirect'),
@@ -52,6 +51,20 @@
component: () => import('@/views/login/register'),
hidden: true
},
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/workPlan/workPlan/reserve',
+ children: [
+ {
+ path: 'dashboard',
+ component: () => import('@/views/workPlan/reserve'),
+ name: 'Dashboard1',
+ meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
+ }
+ ],
+ hidden: true
+ },
// {
// path: '/',
// component: Layout,
@@ -66,20 +79,6 @@
// ],
// hidden: true
// },
- {
- path: '/',
- component: Layout,
- redirect: '/contingencyplan',
- children: [
- {
- path: 'dashboard',
- component: () => import('@/views/contingencyplan/index'),
- name: 'Dashboard1',
- meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
- }
- ],
- hidden: true
- },
{
path: 'dashboard',
component: Layout,
@@ -114,179 +113,44 @@
// }
// ]
// },
- // {
- // id: 2,
- // parentId: 0,
- // path: '/safetyproduction',
- // component: Layout,
- // // redirect: '/contingencyplan',
- // name: '安全生产标准化',
- // meta: { title: '安全生产标准化', icon: 'el-icon-dash' },
- // children: [
- // {
- // id: 1,
- // parentId: 0,
- // path: '/feature',
- // name: '要素管理',
- // component: () => import('@/views/safetyproduction/feature'),
- // meta: { title: '要素管理', icon: '' }
- // },
- // {
- // id: 2,
- // parentId: 0,
- // path: '/checklist',
- // name: '检查清单',
- // component: () => import('@/views/safetyproduction/checklist'),
- // meta: { title: '检查清单', icon: '' }
- // },
- // {
- // id: 2,
- // parentId: 0,
- // path: '/checklistself',
- // name: '自查清单',
- // component: () => import('@/views/safetyproduction/checklistself'),
- // meta: { title: '自查清单', icon: '' }
- // },
- // {
- // // id: 2,
- // // parentId: 0,
- // path: '/review',
- // // name: '自查清单_评审',
- // component: () => import('@/views/safetyproduction/review'),
- // // meta: { title: '自查清单_评审', icon: '' }
- // hidden: true
- // },
- // {
- // // id: 2,
- // // parentId: 0,
- // path: '/gojudging',
- // // name: '自查清单_去评审',
- // component: () => import('@/views/safetyproduction/gojudging'),
- // // meta: { title: '自查清单_去评审', icon: '' }
- // hidden: true
- // },
- // {
- // path: '/new',
- // // name: '自查清单_新增|修改',
- // component: () => import('@/views/safetyproduction/new'),
- // // meta: { title: '自查清单_新增|修改', icon: '' }
- // hidden: true
- // },
- // {
- // // id: 2,
- // // parentId: 0,
- // path: '/reviewXG',
- // // name: '自查清单_修改',
- // component: () => import('@/views/safetyproduction/reviewXG'),
- // // meta: { title: '自查清单_修改', icon: '' }
- // hidden: true
- // }
- // ]
- // },
- // {
- // id: 2,
- // parentId: 0,
- // path: '/majorHazardSourceMonitoring',
- // component: Layout,
- // name: '重大危险源监测',
- // meta: { title: '重大危险源监测', icon: 'el-icon-dash' },
- // children: [
- // {
- // id: 1,
- // parentId: 0,
- // path: '/productionEquipment',
- // name: '生产设备',
- // component: () => import('@/views/majorHazardSourceMonitoring/productionEquipment'),
- // meta: { title: '生产设备', icon: '' }
- // },
- // {
- // id: 2,
- // parentId: 0,
- // path: '/equipmentAlarm',
- // name: '设备报警信息',
- // component: () => import('@/views/majorHazardSourceMonitoring/equipmentAlarm'),
- // meta: { title: '设备报警信息', icon: '' }
- // },
- // {
- // id: 3,
- // parentId: 0,
- // path: '/instrumentData',
- // name: '仪表实时数据',
- // component: () => import('@/views/majorHazardSourceMonitoring/instrumentData'),
- // meta: { title: '仪表实时数据', icon: '' }
- // },
- // ]
- // }
{
- id: 2,
+ id: 2,
parentId: 0,
path: '/safetyproduction',
component: Layout,
- // redirect: '/contingencyplan',
name: '安全生产标准化',
meta: { title: '安全生产标准化', icon: 'el-icon-security' },
+ hidden: true,
children: [
- {
- id: 1,
- parentId: 0,
- path: '/feature',
- name: '要素管理',
- component: () => import('@/views/safetyproduction/feature'),
- meta: { title: '要素管理', icon: '' }
- },
- {
- id: 2,
- parentId: 0,
- path: '/checklist',
- name: '检查清单',
- component: () => import('@/views/safetyproduction/checklist'),
- meta: { title: '检查清单', icon: '' }
- },
- {
- id: 2,
- parentId: 0,
- path: '/checklistself',
- name: '自查清单',
- component: () => import('@/views/safetyproduction/checklistself'),
- meta: { title: '自查清单', icon: '' }
- },
- {
- // id: 2,
- // parentId: 0,
- path: '/review',
- // name: '自查清单_评审',
- component: () => import('@/views/safetyproduction/review'),
- // meta: { title: '自查清单_评审', icon: '' }
- hidden: true
- },
- {
- // id: 2,
- // parentId: 0,
- path: '/gojudging',
- // name: '自查清单_去评审',
- component: () => import('@/views/safetyproduction/gojudging'),
- // meta: { title: '自查清单_去评审', icon: '' }
- hidden: true
- },
{
path: '/new',
// name: '自查清单_新增|修改',
component: () => import('@/views/safetyproduction/new'),
- // meta: { title: '自查清单_新增|修改', icon: '' }
+ meta: { title: '自查清单', icon: 'el-icon-dash', noCache: true, affix: true },
hidden: true
},
- {
- // id: 2,
- // parentId: 0,
- path: '/reviewXG',
- // name: '自查清单_修改',
- component: () => import('@/views/safetyproduction/reviewXG'),
- // meta: { title: '自查清单_修改', icon: '' }
- hidden: true
- }
- ]
- },
{
+ //自查清单-去评审
+ path: '/gojudging',
+ component: () => import('@/views/safetyproduction/gojudging'),
+ hidden: true
+ },
+ {
+ //自查清单_评审
+ path: '/review',
+ component: () => import('@/views/safetyproduction/review'),
+ hidden: true
+ },
+ {
+ //自查清单_修改检查项
+ path: '/reviewXG',
+ component: () => import('@/views/safetyproduction/reviewXG'),
+ hidden: true
+ },
+
+ ]
+ },
+ /* {
id: 2,
parentId: 0,
path: '/majorHazardSourceMonitoring',
@@ -319,7 +183,7 @@
meta: { title: '仪表实时数据', icon: '' }
},
]
- },
+ },*/
{
id: 2,
parentId: 0,
--
Gitblit v1.9.2