From c9fb21b31f8a3deef02de529815bf9a13cd6e756 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 08 四月 2022 16:59:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/router/index.js | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 739eea2..d9f9406 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -55,17 +55,31 @@
{
path: '/',
component: Layout,
- redirect: '/doublePreventAction/doublePreventAction/riskLevelManage/index/doublePreventAction/riskLevelManage/analyseUnit/index',
+ redirect: '/workPlan/workPlan/reserve',
children: [
{
path: 'dashboard',
- component: () => import('@/views/doublePreventAction/riskLevelManage/analyseUnit/index'),
+ component: () => import('@/views/workPlan/reserve'),
name: 'Dashboard1',
meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
}
],
hidden: true
},
+ // {
+ // path: '/',
+ // component: Layout,
+ // redirect: '/doublePreventAction/doublePreventAction/riskLevelManage/index/doublePreventAction/riskLevelManage/analyseUnit/index',
+ // children: [
+ // {
+ // path: 'dashboard',
+ // component: () => import('@/views/doublePreventAction/riskLevelManage/analyseUnit/index'),
+ // name: 'Dashboard1',
+ // meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
+ // }
+ // ],
+ // hidden: true
+ // },
{
path: 'dashboard',
component: Layout,
@@ -107,7 +121,7 @@
component: Layout,
// redirect: '/contingencyplan',
name: '安全生产标准化',
- meta: { title: '安全生产标准化', icon: 'el-icon-dash' },
+ meta: { title: '安全生产标准化', icon: 'el-icon-security' },
children: [
{
id: 1,
@@ -134,36 +148,38 @@
meta: { title: '自查清单', icon: '' }
},
{
- id: 2,
- parentId: 0,
+ // id: 2,
+ // parentId: 0,
path: '/review',
- name: '自查清单_评审',
+ // name: '自查清单_评审',
component: () => import('@/views/safetyproduction/review'),
- meta: { title: '自查清单_评审', icon: '' }
+ // meta: { title: '自查清单_评审', icon: '' }
+ hidden: true
},
{
- id: 2,
- parentId: 0,
+ // id: 2,
+ // parentId: 0,
path: '/gojudging',
- name: '自查清单_去评审',
+ // name: '自查清单_去评审',
component: () => import('@/views/safetyproduction/gojudging'),
- meta: { title: '自查清单_去评审', icon: '' }
+ // meta: { title: '自查清单_去评审', icon: '' }
+ hidden: true
},
{
- id: 2,
- parentId: 0,
path: '/new',
- name: '自查清单_新增|修改',
+ // name: '自查清单_新增|修改',
component: () => import('@/views/safetyproduction/new'),
- meta: { title: '自查清单_新增|修改', icon: '' }
+ // meta: { title: '自查清单_新增|修改', icon: '' }
+ hidden: true
},
{
- id: 2,
- parentId: 0,
+ // id: 2,
+ // parentId: 0,
path: '/reviewXG',
- name: '自查清单_修改',
+ // name: '自查清单_修改',
component: () => import('@/views/safetyproduction/reviewXG'),
- meta: { title: '自查清单_修改', icon: '' }
+ // meta: { title: '自查清单_修改', icon: '' }
+ hidden: true
}
]
},
@@ -173,7 +189,7 @@
path: '/majorHazardSourceMonitoring',
component: Layout,
name: '重大危险源监测',
- meta: { title: '重大危险源监测', icon: 'el-icon-dash' },
+ meta: { title: '重大危险源监测', icon: 'el-icon-facilities' },
children: [
{
id: 1,
@@ -200,7 +216,32 @@
meta: { title: '仪表实时数据', icon: '' }
},
]
- }
+ },
+ {
+ id: 2,
+ parentId: 0,
+ path: '/accidentHidden',
+ component: Layout,
+ name: '事故隐患排查治理',
+ meta: { title: '事故隐患排查治理', icon: 'el-icon-facilities' },
+ children: [
+ {
+ id: 1,
+ parentId: 0,
+ path: '/majorHidden',
+ name: '重大隐患整改进度',
+ component: () => import('@/views/accidentHidden/majorHidden'),
+ meta: { title: '重大隐患整改进度', icon: '' }
+ },
+ {
+ path: '/hiddenDangerList',
+ // name: '重大隐患整改进度-发送隐患单',
+ component: () => import('@/views/accidentHidden/hiddenDangerList'),
+ // meta: { title: '重大隐患整改进度-发送隐患单', icon: '' }
+ hidden: true
+ },
+ ]
+ }
]
export default new Router({
--
Gitblit v1.9.2