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 |  210 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 139 insertions(+), 71 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index f28481b..0b0ea4e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -53,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 }
             }
@@ -114,75 +120,137 @@
     //       }
     //     ]
     //   },
-    //   {
-    //     id: 2,
-    //     parentId: 0,
-    //     path: '/safetyproduction',
-    //     component: Layout,
-    //     // redirect: '/contingencyplan',
-    //     name: '安全生产标准化',
-    //     meta: { title: '安全生产标准化', icon: 'el-icon-security' },
-    //     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: '/aqscbzh',
+        component: Layout,
+        name: '安全生产标准化',
+        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: '/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: '/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: 2,
     //         parentId: 0,

--
Gitblit v1.9.2