Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-04-08 c9fb21b31f8a3deef02de529815bf9a13cd6e756

 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,
@@ -175,7 +189,7 @@
            path: '/majorHazardSourceMonitoring',
            component: Layout,
            name: '重大危险源监测',
            meta: { title: '重大危险源监测', icon: 'el-icon-dash' },
            meta: { title: '重大危险源监测', icon: 'el-icon-facilities' },
            children: [
                {
                    id: 1,
@@ -202,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({