From 44d7a737dc0d63ad1dd7c52d45fc2233d1950173 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 09 六月 2022 09:56:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

---
 src/router/index.js |  542 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 377 insertions(+), 165 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 0b0ea4e..0e3db1e 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'),
@@ -129,187 +128,400 @@
         meta: { title: '安全生产标准化', icon: 'el-icon-security' },
         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: 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: '/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: '/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
-            },
-            {
-                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: '/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: '/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: '/fillRectification',
-                // name: '自查隐患管理-填写整改',
-                component: () => import('@/views/hiddenDangerManagement/fillRectification'),
-                // meta: { title: '自查隐患管理-填写整改', icon: '' }
+                path: '/manage',
+                component: () => import('@/views/oneFromanother/manage'),
                 hidden: true
             },
             {
-                path: '/fillInspector',
-                // name: '自查隐患管理-填写督察',
-                component: () => import('@/views/hiddenDangerManagement/fillInspector'),
-                // meta: { title: '自查隐患管理-填写督察', icon: '' }
+                path: '/exist',
+                component: () => import('@/views/oneFromanother/exist'),
                 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: '/hiddenDangerList',
-    //               // name: '重大隐患整改进度-发送隐患单',
-    //               component: () => import('@/views/accidentHidden/hiddenDangerList'),
-    //               // 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: 10,
+                parentId: 0,
+                path: '/oneFromanotherN',
+                name: '内部举一反三',
+                component: () => import('@/views/oneFromanotherN'),
+                meta: { title: '内部举一反三', icon: '' }
+            },
+            {
+              path: '/addDanger',
+              component: () => import('@/views/oneFromanotherN/addDanger'),
+              hidden: true
+            },
+            {
+                path: '/existN',
+                component: () => import('@/views/oneFromanotherN/existN'),
+                hidden: true
+            },
+              {
+                  path: '/superiorsSend',
+                  // name: '上级下达隐患-点击发送',
+                  component: () => import('@/views/Issuedbysuperiors/superiorsSend'),
+                  // meta: { title: '上级下达隐患-点击发送', icon: '' }
+                  hidden: true
+              },
+              {
+                  id: 10,
+                  parentId: 0,
+                  path: '/summaryPotentialSafetyHzards',
+                  name: '安全隐患汇总',
+                  component: () => import('@/views/summaryPotentialSafetyHzards'),
+                  meta: { title: '安全隐患汇总', icon: '' }
+              },
+              {
+                  id: 11,
+                  parentId: 0,
+                  path: '/safetyHazardAccount',
+                  name: '安全隐患台账',
+                  component: () => import('@/views/safetyHazardAccount'),
+                  meta: { title: '安全隐患台账', icon: '' }
+              },
+              {
+                  path: '/accountSend',
+                  // name: '安全隐患台账-查看隐患单',
+                  component: () => import('@/views/safetyHazardAccount/accountSend'),
+                  // meta: { title: '安全隐患台账-查看隐患单', icon: '' }
+                  hidden: true
+              },
+              {
+                  path: '/hazardSource',
+                  // name: '安全隐患台账-关联危险源',
+                  component: () => import('@/views/safetyHazardAccount/hazardSource'),
+                  // meta: { title: '安全隐患台账-关联危险源', icon: '' }
+                  hidden: true
+              },
+              {
+                path: '/safetyedit',
+                // name: '安全隐患台账-编辑',
+                component: () => import('@/views/safetyHazardAccount/safetyedit'),
+                // meta: { title: '安全隐患台账-编辑', icon: '' }
+                hidden: true
+            },
+            {
+                path: '/Dualbase',
+                // name: '安全隐患台账-双基考核',
+                component: () => import('@/views/safetyHazardAccount/Dualbase'),
+                // meta: { title: '安全隐患台账-编辑', icon: '' }
+                hidden: true
+            },
+            {
+                path: '/DualbaseLost',
+                // name: '安全隐患台账-双基考核',
+                component: () => import('@/views/safetyHazardAccount/DualbaseLost'),
+                // meta: { title: '安全隐患台账-编辑', icon: '' }
+                hidden: true
+            },
+              {
+                  path: '/supervision',
+                  // name: '安全隐患台账-督查督办',
+                  component: () => import('@/views/safetyHazardAccount/supervision'),
+                  // meta: { title: '安全隐患台账-督查督办', icon: '' }
+                  hidden: true
+              },
+              {
+                  path: '/inferOtherThings',
+                  // name: '安全隐患台账-举一反三',
+                  component: () => import('@/views/safetyHazardAccount/inferOtherThings'),
+                  // meta: { title: '安全隐患台账-举一反三', icon: '' }
+                  hidden: true
+              },
+              {
+                  path: '/summaryList',
+                  // name: '安全隐患台账-举一反三',
+                  component: () => import('@/views/summaryPotentialSafetyHzards/summaryList'),
+                  // meta: { title: '安全隐患台账-举一反三', icon: '' }
+                  hidden: true
+              },
+              {
+                  path: '/summaryForm',
+                  // name: '安全隐患汇总-发送隐患单',
+                  component: () => import('@/views/summaryPotentialSafetyHzards/summaryForm'),
+                  // meta: { title: '安全隐患汇总-发送隐患单', icon: '' }
+                  hidden: true
+              },
+              {
+                  path: '/dangerDetails',
+                  // name: '安全隐患汇总-发送隐患单',
+                  component: () => import('@/views/dangerDetails/dnagerDetails'),
+                  // meta: { title: '安全隐患汇总-发送隐患单', icon: '' }
+                  hidden: true
+              },
+              {
+                  id: 12,
+                  parentId: 0,
+                  path: '/chartAnalysis',
+                  name: '隐患图表分析',
+                  component: () => import('@/views/chartAnalysis'),
+                  meta: { title: '隐患图表分析', icon: '' }
+              },
+              {
+                id: 13,
+                parentId: 0,
+                path: '/careabout',
+                name: '您关注的隐患',
+                component: () => import('@/views/careabout'),
+                meta: { title: '您关注的隐患', icon: '' }
+            },
+            {
+                id: 14,
+                parentId: 0,
+                path: '/troubleshooting',
+                name: '隐患排查会议',
+                component: () => import('@/views/troubleshooting'),
+                meta: { title: '隐患排查会议', icon: '' }
+            },
+          ]
+      }
 ]
 
 export default new Router({

--
Gitblit v1.9.2