From fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 30 Mar 2022 16:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/router/index.js | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 06ba469..9dd394d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -53,24 +53,6 @@
hidden: true
},
{
- path: '/productionEquipment',
- // 重大生产设备
- component: () => import('@/views/productionEquipment'),
- hidden: true
- },
- {
- path: '/instrumentData',
- // 重大仪表实时数据
- component: () => import('@/views/instrumentData'),
- hidden: true
- },
- {
- path: '/equipmentAlarm',
- // 设备报警信息
- component: () => import('@/views/equipmentAlarm'),
- hidden: true
- },
- {
path: '/',
component: Layout,
redirect: '/doublePreventAction/doublePreventAction/riskLevelManage/index/doublePreventAction/riskLevelManage/analyseUnit/index',
@@ -168,12 +150,11 @@
meta: { title: '自查清单_去评审', icon: '' }
},
{
- id: 2,
- parentId: 0,
path: '/new',
- name: '自查清单_新增|修改',
+ // name: '自查清单_新增|修改',
component: () => import('@/views/safetyproduction/new'),
- meta: { title: '自查清单_新增|修改', icon: '' }
+ // meta: { title: '自查清单_新增|修改', icon: '' }
+ hidden: true
},
{
id: 2,
@@ -183,8 +164,42 @@
component: () => import('@/views/safetyproduction/reviewXG'),
meta: { title: '自查清单_修改', icon: '' }
}
- ]
+ ]
},
+ {
+ 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: '' }
+ },
+ ]
+ }
]
export default new Router({
--
Gitblit v1.9.2