From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/router/index.js | 453 +++++++++++++++++++++++--------------------------------
1 files changed, 191 insertions(+), 262 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 1304f79..0b0ea4e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,6 +34,7 @@
component: () => import('@/views/login/index'),
hidden: true
},
+
{
path: '/auth-redirect',
component: () => import('@/views/login/authredirect'),
@@ -52,13 +53,19 @@
hidden: true
},
{
+ path: '/pwdChange',
+ // 密码变更
+ component: () => import('@/views/login/pwdChange'),
+ hidden: true
+ },
+ {
path: '/',
component: Layout,
- redirect: '/workPlan/workPlan/reserve',
+ redirect: '/specialWorkManage/index/specialWorkManage/workPlan/index/specialWorkManage/workPlan/reserve',
children: [
{
path: 'dashboard',
- component: () => import('@/views/workPlan/reserve'),
+ component: () => import('@/views/specialWorkManage/workPlan/reserve'),
name: 'Dashboard1',
meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
}
@@ -79,21 +86,21 @@
// ],
// hidden: true
// },
- {
- path: 'dashboard',
- component: Layout,
- redirect: 'dashboard',
- children: [
- {
- path: 'dashboard',
- component: () => import('@/views/dashboard/index'),
- name: 'Dashboard1',
- meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
- }
-
- ],
- hidden: true
- },
+ // {
+ // path: 'dashboard',
+ // component: Layout,
+ // redirect: 'dashboard',
+ // children: [
+ // {
+ // path: 'dashboard',
+ // component: () => import('@/views/dashboard/index'),
+ // name: 'Dashboard1',
+ // meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
+ // }
+ //
+ // ],
+ // hidden: true
+ // },
// {
// id: 2,
// parentId: 0,
@@ -113,274 +120,196 @@
// }
// ]
// },
- {
- id: 2,
+ {
+ id: 2,
parentId: 0,
path: '/aqscbzh',
component: Layout,
name: '安全生产标准化',
meta: { title: '安全生产标准化', icon: 'el-icon-security' },
- hidden: true,
+ hidden: true,
children: [
- {
- path: '/new',
- // name: '自查清单_新增|修改',
- component: () => import('@/views/safetyproduction/new'),
- meta: { title: '自查清单', icon: 'el-icon-dash', noCache: true, affix: true },
- 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',
- component: Layout,
- name: '重大危险源监测',
- meta: { title: '重大危险源监测', icon: 'el-icon-facilities' },
- 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,
- 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: '/fillProgress',
- // name: '重大隐患整改进度-填写进度',
- component: () => import('@/views/accidentHidden/fillProgress'),
- // meta: { title: '重大隐患整改进度-填写进度', icon: '' }
- hidden: true
- },
- {
- id: 2,
- parentId: 0,
- path: '/hiddenDangerRegistration',
- name: '隐患登记下达',
- component: () => import('@/views/hiddenDangerRegistration'),
- meta: { title: '隐患登记下达', icon: '' }
- },
- {
+ {
+ path: '/new',
+ // name: '自查清单_新增|修改',
+ component: () => import('@/views/safetyproduction/new'),
+ meta: { title: '自查清单', icon: 'el-icon-dash', noCache: true, affix: true },
+ 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: 124,
+ parentId: 0,
+ path: '/sgyhpczl',
+ component: Layout,
+ name: '事故隐患排查治理',
+ meta: { title: '事故隐患排查治理', icon: 'el-icon-facilities' },
+ hidden: true,
+ children: [
+ {
+ path: '/fillProgress',
+ // name: '重大隐患整改进度-填写进度',
+ component: () => import('@/views/accidentHidden/fillProgress'),
+ // meta: { title: '重大隐患整改进度-填写进度', icon: '' }
+ hidden: true
+ },
+ {
path: '/hiddenDangerAdd',
// name: '新增',
component: () => import('@/views/hiddenDangerRegistration/hiddenDangerAdd'),
// meta: { title: '隐患登记下达-发送隐患单', icon: '' }
hidden: true
- },
- {
- path: '/hiddenDangerList',
- // name: '隐患登记下达-发送隐患单',
- component: () => import('@/views/hiddenDangerRegistration/hiddenDangerList'),
- // meta: { title: '隐患登记下达-发送隐患单', icon: '' }
- hidden: true
- },
- {
- path: '/listAssociatedHazards',
- // name: '隐患登记下达-关联危险源-列表页面',
- component: () => import('@/views/hiddenDangerRegistration/listAssociatedHazards'),
- // meta: { title: '隐患登记下达-关联危险源-列表页面', icon: '' }
- hidden: true
- },
- {
- path: '/reboundHiddenDanger',
- // name: '风险预控-重复反弹隐患-列表页面',
- component: () => import('@/views/hiddenDangerRegistration/reboundHiddenDanger'),
- // meta: { title: '风险预控-重复反弹隐患-列表页面', icon: '' }
- hidden: true
- },
- {
- id: 3,
- parentId: 0,
- path: '/hiddenDangerRectification',
- name: '隐患整改治理',
- component: () => import('@/views/hiddenDangerRectification'),
- meta: { title: '隐患整改治理', icon: '' }
- },
- {
- path: '/sendHiddenDangerList',
- // name: '隐患整改治理-发送隐患单',
- component: () => import('@/views/hiddenDangerRectification/sendHiddenDangerList'),
- // meta: { title: '隐患整改治理-发送隐患单', icon: '' }
- hidden: true
- },
- {
- path: '/applicationForExtension',
- // name: '隐患整改治理-申请延期',
- component: () => import('@/views/hiddenDangerRectification/applicationForExtension'),
- // meta: { title: '隐患整改治理-申请延期', icon: '' }
- hidden: true
- },
- {
- id: 4,
- parentId: 0,
- path: '/recheckCancellationNumber',
- name: '隐患复查销号',
- component: () => import('@/views/hiddenDangerReview/recheckCancellationNumber'),
- meta: { title: '隐患复查销号', icon: '' }
- },
- {
- path: '/recheckHiddenDangerList',
- // name: '隐患复查销号-发送隐患单',
- component: () => import('@/views/hiddenDangerReview/recheckHiddenDangerList'),
- // meta: { title: '隐患复查销号-发送隐患单', icon: '' }
- hidden: true
- },
- {
- id: 5,
- parentId: 0,
- path: '/delayHiddenDangerRectification',
- name: '隐患整改延期',
- component: () => import('@/views/delayHiddenDangerRectification'),
- meta: { title: '隐患整改延期', icon: '' }
- },
- {
- path: '/rectificationDelayHiddenDanger',
- // name: '隐患整改延期-发送隐患单',
- component: () => import('@/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger'),
- // meta: { title: '隐患整改延期-发送隐患单', icon: '' }
- hidden: true
- },
- {
- id: 6,
- parentId: 0,
- path: '/hiddenDangerManagement',
- name: '自查隐患管理',
- component: () => import('@/views/hiddenDangerManagement'),
- meta: { title: '自查隐患管理', icon: '' }
- },
- {
+ },
+ {
+ path: '/hiddenDangerList',
+ // name: '隐患登记下达-发送隐患单',
+ component: () => import('@/views/hiddenDangerRegistration/hiddenDangerList'),
+ // meta: { title: '隐患登记下达-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/listAssociatedHazards',
+ // name: '隐患登记下达-关联危险源-列表页面',
+ component: () => import('@/views/hiddenDangerRegistration/listAssociatedHazards'),
+ // meta: { title: '隐患登记下达-关联危险源-列表页面', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/reboundHiddenDanger',
+ // name: '风险预控-重复反弹隐患-列表页面',
+ component: () => import('@/views/hiddenDangerRegistration/reboundHiddenDanger'),
+ // meta: { title: '风险预控-重复反弹隐患-列表页面', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/sendHiddenDangerList',
+ // name: '隐患整改治理-发送隐患单',
+ component: () => import('@/views/hiddenDangerRectification/sendHiddenDangerList'),
+ // meta: { title: '隐患整改治理-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/applicationForExtension',
+ // name: '隐患整改治理-申请延期',
+ component: () => import('@/views/hiddenDangerRectification/applicationForExtension'),
+ // meta: { title: '隐患整改治理-申请延期', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/recheckHiddenDangerList',
+ // name: '隐患复查销号-发送隐患单',
+ component: () => import('@/views/hiddenDangerReview/recheckHiddenDangerList'),
+ // meta: { title: '隐患复查销号-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/rectificationDelayHiddenDanger',
+ // name: '隐患整改延期-发送隐患单',
+ component: () => import('@/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger'),
+ // meta: { title: '隐患整改延期-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
path: '/fillRectificationAdd',
// name: '自查隐患管理-填写整改',
component: () => import('@/views/hiddenDangerManagement/fillRectificationAdd'),
// meta: { title: '自查隐患管理-填写整改', icon: '' }
hidden: true
},
- {
- path: '/fillRectification',
- // name: '自查隐患管理-填写整改',
- component: () => import('@/views/hiddenDangerManagement/fillRectification'),
- // meta: { title: '自查隐患管理-填写整改', icon: '' }
- hidden: true
- },
- {
- path: '/fillInspector',
- // name: '自查隐患管理-填写督察',
- component: () => import('@/views/hiddenDangerManagement/fillInspector'),
- // meta: { title: '自查隐患管理-填写督察', icon: '' }
- hidden: true
- },
- {
- id: 7,
- parentId: 0,
- path: '/oneFromanother',
- name: '内部举一反三',
- component: () => import('@/views/oneFromanother'),
- meta: { title: '内部举一反三', icon: '' }
- },
{
- path: '/manage',
- component: () => import('@/views/oneFromanother/manage'),
+ path: '/fillRectification',
+ // name: '自查隐患管理-填写整改',
+ component: () => import('@/views/hiddenDangerManagement/fillRectification'),
+ // meta: { title: '自查隐患管理-填写整改', icon: '' }
hidden: true
},
{
- path: '/exist',
- component: () => import('@/views/oneFromanother/exist'),
+ path: '/fillInspector',
+ // name: '自查隐患管理-填写督察',
+ component: () => import('@/views/hiddenDangerManagement/fillInspector'),
+ // meta: { title: '自查隐患管理-填写督察', icon: '' }
hidden: true
},
- {
- path: '/inspectionNotExist',
- // name: '内部举一反三-待自查-不存在',
- component: () => import('@/views/oneFromanother/inspectionNotExist'),
- // meta: { title: '内部举一反三-待自查-不存在', icon: '' }
- hidden: true
- },
- {
- path: '/send',
- // name: '内部举一反三-发送弹窗',
- component: () => import('@/views/oneFromanother/send'),
- // meta: { title: '内部举一反三-发送弹窗', icon: '' }
- hidden: true
- },
- {
- id: 8,
- parentId: 0,
- path: '/hiddenDangerTroubleshootingList',
- name: '隐患排查清单',
- component: () => import('@/views/hiddenDangerTroubleshootingList'),
- meta: { title: '隐患排查清单', icon: '' }
- },
- {
- path: '/preview',
- // name: '隐患排查清单-预览',
- component: () => import('@/views/hiddenDangerTroubleshootingList/preview'),
- // meta: { title: '隐患排查清单-预览', icon: '' }
- hidden: true
- },
- {
- id: 9,
- parentId: 0,
- path: '/Issuedbysuperiors',
- name: '上级下达隐患',
- component: () => import('@/views/Issuedbysuperiors'),
- meta: { title: '上级下达隐患', icon: '' }
- },
- ]
- }
+ ]
+ },
+ // {
+ // id: 2,
+ // parentId: 0,
+ // path: '/majorHazardSourceMonitoring',
+ // component: Layout,
+ // name: '重大危险源监测',
+ // meta: { title: '重大危险源监测', icon: 'el-icon-facilities' },
+ // 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,
+ // 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