zhaobao 2 ani în urmă
părinte
comite
67957c04ff

+ 8 - 20
src/layout/components/Navbar.vue

@@ -77,28 +77,16 @@ export default {
       logo: require('@/assets/images/logo/logo.png'),
       sideMenuTabIndex: 0,
       sideMenuTabList: [
-        // { name: '数字全景', icon: 'el-icon-s-platform', path: '/', permit: 'aqpt_panorama', id: 0 },
-        // { name: '预警中心', icon: 'icon-common_saving', path: '/alert', permit: 'aqpt_alert_center', id: 1 },
+        /** ckq */
+        { name: '采空区信息', icon: 'icon-common_quality', path: '/goaf/info', permit: 'aqpt_workflow', id: 0 },
+        { name: '人员巡检', icon: 'icon-common_saving', path: '/alert', permit: 'aqpt_alert_center', id: 5 },
+        { name: '传感器', icon: 'icon-common_equipment', path: '/aqpt/equipment', permit: 'aqpt_equipment', id: 4 },
+        { name: '预警', icon: 'icon-common_saving', path: '/alert', permit: 'aqpt_alert_center', id: 1 },
         // { name: '工作台', icon: 'icon-common_task', path: '/task', permit: 'aqpt_task_center', id: 2 },
-        // { name: '双重预防', icon: 'icon-common_quality', path: '/aqpt/scene', permit: 'aqpt_workflow', id: 3 },
-        // { name: '设备管理', icon: 'icon-common_equipment', path: '/aqpt/equipment', permit: 'aqpt_equipment', id: 4 },
-        // { name: '作业票', icon: 'icon-common_satisfaction', path: '/aqpt/ticket', permit: 'aqpt_ticket', id: 5 },
-        // { name: '奖惩考核', icon: 'icon-common_quality', path: '/aqpt/kpi/regulation', permit: 'aqpt_kpi', id: 6 },
         // { name: '安全智库', icon: 'icon-common_knowledge', path: '/aqpt/art', permit: 'aqpt_art_center', id: 7 },
-        // { name: '文件中心', icon: 'icon-common_file', path: '/aqpt/doc', permit: 'aqpt_doc_center', id: 8 },
-        // { name: '系统管理', icon: 'icon iconfont icon-common_configuration', path: '/aqpt/account', permit: 'aqpt_system', id: 9 },
-
-        /** ckq */
-        { name: '数字全景', icon: 'el-icon-s-platform', href: 'http://localhost:8080/', permit: 'aqpt_panorama', id: 0 },
-        { name: '双重预防', icon: 'icon-common_quality', path: '/aqpt/scene', permit: 'aqpt_workflow', id: 3 },
-        { name: '设备管理', icon: 'icon-common_equipment', path: '/aqpt/equipment', permit: 'aqpt_equipment', id: 4 },
-        { name: '预警中心', icon: 'icon-common_saving', path: '/alert', permit: 'aqpt_alert_center', id: 1 },
-        { name: '工作台', icon: 'icon-common_task', path: '/task', permit: 'aqpt_task_center', id: 2 },
-        // { name: '作业票', icon: 'icon-common_satisfaction', path: '/aqpt/ticket', permit: 'aqpt_ticket', id: 5 },
-        // { name: '奖惩考核', icon: 'icon-common_quality', path: '/aqpt/kpi/regulation', permit: 'aqpt_kpi', id: 6 },
-        { name: '安全智库', icon: 'icon-common_knowledge', path: '/aqpt/art', permit: 'aqpt_art_center', id: 7 },
-        { name: '文件中心', icon: 'icon-common_file', path: '/aqpt/doc', permit: 'aqpt_doc_center', id: 8 },
-        { name: '系统管理', icon: 'icon iconfont icon-common_configuration', path: '/aqpt/account', permit: 'aqpt_system', id: 9 }
+        { name: '文档中心', icon: 'icon-common_file', path: '/aqpt/doc', permit: 'aqpt_doc_center', id: 8 },
+        { name: '系统管理', icon: 'icon iconfont icon-common_configuration', path: '/aqpt/account', permit: 'aqpt_system', id: 9 },
+        { name: '数字全景', icon: 'el-icon-s-platform', href: 'http://localhost:8080/', permit: 'aqpt_panorama', id: 10 }
       ]
     }
   },

+ 607 - 0
src/router/modules/aqpt - 副本.js

@@ -0,0 +1,607 @@
+import Layout from '@/layout/index'
+
+const aqptRouter = [
+  {
+    path: '/',
+    component: Layout,
+    name: 'AqptPanorama',
+    redirect: '/panorama',
+    meta: { permit: 'aqpt_panorama' },
+    groupId: [0],
+    hidden: true,
+    children: [
+      {
+        path: 'panorama',
+        component: () => import('@/views/aqpt/panorama'),
+        name: 'aqpt_panorama',
+        meta: { title: '数字总览', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_panorama' }
+      }
+    ]
+  },
+  /** 不能跟路由1重复出现 */
+  {
+    path: '/',
+    component: () => import('@/views/aqpt/visualEditor/index'),
+    name: 'VisualEditor',
+    meta: { title: '作业活动可视化配置', noCache: true, permit: 'jyprj_setting' }
+  },
+  {
+    path: '/alert',
+    component: Layout,
+    name: 'AlertCenter',
+    redirect: '/alert/index',
+    meta: { permit: 'aqpt_alert_center' },
+    groupId: [1],
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/alert/index'),
+        name: 'aqpt_alert_center',
+        meta: { title: '预警中心', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_alert_center' }
+      }
+    ]
+  },
+
+  {
+    path: '/task',
+    component: Layout,
+    name: 'TaskCenter',
+    redirect: '/task/index',
+    meta: { permit: 'aqpt_task_center' },
+    groupId: [2],
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/system/task/index'),
+        name: 'aqpt_task_center',
+        meta: { title: '工作台', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_task_center' }
+      }
+    ]
+  },
+
+  {
+    path: '/aqpt/management',
+    component: Layout,
+    redirect: '/aqpt/management/leadingGroup',
+    name: 'AqptManagement',
+    meta: {
+      title: '管理体系',
+      icon: 'icon-common_organization',
+      permit: 'aqpt_management'
+    },
+    groupId: [3],
+    children: [
+      {
+        path: 'leadingGroup',
+        component: () => import('@/views/system/leadingGroup/index'),
+        name: 'aqpt_management_leading_group',
+        meta: { title: '领导小组', noCache: true, permit: 'aqpt_management_leading_group' }
+      }, {
+        path: 'regulation',
+        component: () => import('@/views/system/regulation/index'),
+        name: 'aqpt_management_regulation',
+        meta: { title: '管理制度', noCache: true, permit: 'aqpt_management_regulation' }
+      },
+      {
+        path: 'hazard',
+        component: () => import('@/views/aqpt/hazard/index'),
+        name: 'aqpt_management_hazard',
+        meta: { title: '危险源库', noCache: true, permit: 'aqpt_management_hazard' }
+      },
+      {
+        path: 'checkList',
+        component: () => import('@/views/system/checklist/index'),
+        name: 'aqpt_management_checkList',
+        meta: { title: '检查清单', noCache: true, permit: 'aqpt_management_checklist' }
+      }
+    ]
+  },
+  /** 采空区*/
+  {
+    path: '/goaf',
+    component: Layout,
+    name: 'goaf',
+    redirect: '/goaf/info',
+    meta: {
+      title: '采空区管理',
+      permit: 'aqpt_danger',
+      icon: 'icon-common_riskmanagement'
+    },
+    groupId: [3],
+    children: [
+      {
+        path: 'info',
+        component: () => import('@/views/goaf/info/index'),
+        name: 'goaf-info',
+        meta: {
+          title: '采空区信息配置',
+          noCache: true,
+          permit: 'aqpt_danger'
+        }
+      },
+      {
+        path: 'sensor',
+        component: () => import('@/views/goaf/sensor/index'),
+        name: 'goaf-sensor',
+        meta: {
+          title: '传感器配置',
+          noCache: true,
+          // icon: 'icon-common_equipment',
+          permit: 'aqpt_danger'
+        }
+      },
+      {
+        path: 'map',
+        component: () => import('@/views/goaf/map/index'),
+        name: 'goaf-map',
+        meta: {
+          title: '可视化编辑',
+          noCache: true,
+          // icon: 'icon-common_equipment',
+          permit: 'aqpt_danger'
+        }
+      },
+      {
+        path: 'checklist',
+        component: () => import('@/views/goaf/checklist'),
+        name: 'goaf-checklist',
+        meta: {
+          title: '检查表',
+          noCache: true,
+          // icon: 'icon-common_equipment',
+          permit: 'aqpt_danger'
+        }
+      }
+    ]
+  },
+  {
+    path: '/aqpt/scene',
+    component: Layout,
+    name: 'AqptScene',
+    redirect: '/aqpt/scene/riskPoint',
+    groupId: [3],
+    meta: {
+      title: '现场管理',
+      icon: 'icon-common_overview',
+      permit: 'aqpt_scene'
+    },
+    children: [
+      {
+        path: 'map',
+        component: () => import('@/views/aqpt/map/index'),
+        name: 'entMap',
+        meta: { title: '地图', noCache: true, permit: 'aqpt_scene_map' }
+      },
+      {
+        path: 'manage',
+        component: () => import('@/views/system/grid/index'),
+        name: 'entGrid',
+        meta: { title: '网格', noCache: true, permit: 'aqpt_scene_grid' }
+      },
+      {
+        path: 'riskPoint',
+        component: () => import('@/views/aqpt/riskpoint/index'),
+        name: 'entRiskPoint',
+        meta: { title: '风险点', noCache: true, permit: 'aqpt_scene_riskpoint' }
+      },
+
+      {
+        path: 'projectWork',
+        component: () => import('@/views/aqpt/projectWork/index'),
+        name: 'projectWork',
+        meta: { title: '工作项目管理', noCache: true, permit: 'aqpt_scene_riskpoint' }
+      }
+    ]
+  },
+  {
+    path: '/aqpt/check',
+    component: Layout,
+    name: 'AqptCheck',
+    redirect: '/aqpt/check/index',
+    meta: {
+      title: '隐患排查',
+      icon: 'icon-common_task',
+      permit: 'aqpt_check_manage'
+    },
+    groupId: [3],
+    children: [
+      {
+        path: 'plan',
+        component: () => import('@/views/aqpt/checkTask/plan/index'),
+        name: 'aqpt_check_plan',
+        meta: { title: '巡检计划', noCache: true, permit: 'aqpt_check_plan' }
+      },
+
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/checkTask/manage/index'),
+        name: 'aqpt_check_manage',
+        meta: { title: '巡检任务', noCache: true, permit: 'aqpt_check_task' }
+      },
+
+      {
+        path: 'record',
+        component: () => import('@/views/aqpt/checkTask/record/index'),
+        name: 'aqpt_check_record',
+        meta: { title: '巡检记录', noCache: true, permit: 'aqpt_check_record' }
+      }
+    ]
+  },
+  {
+    path: '/aqpt/danger',
+    component: Layout,
+    name: 'AqptDanger',
+    redirect: '/aqpt/danger/index',
+    meta: {
+      title: '隐患管理',
+      permit: 'aqpt_danger'
+    },
+    groupId: [3],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/danger/index'),
+        name: 'aqpt_danger_index',
+        meta: { title: '隐患管理', noCache: true, icon: 'icon-common_riskmanagement', permit: 'aqpt_danger' }
+      }
+    ]
+  },
+
+  {
+    path: '/aqpt/report',
+    component: Layout,
+    name: 'AqptLedger',
+    redirect: '/aqpt/report/index',
+    meta: {
+      title: '台帐清单',
+      permit: 'aqpt_report'
+    },
+    groupId: [3],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/report/index'),
+        name: 'aqpt_report_index',
+        meta: { title: '台帐中心', noCache: true, icon: 'icon-common_statistical', permit: 'aqpt_report' }
+      }
+    ]
+  },
+
+  {
+    path: '/aqpt/equipment',
+    component: Layout,
+    name: 'AqptEquipment',
+    redirect: '/aqpt/equipment/index',
+    meta: {
+      title: '设备管理',
+      icon: 'icon-common_equipment',
+      permit: 'aqpt_equipment'
+    },
+    groupId: [4],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/equipment/index'),
+        name: 'aqpt_equipment_index',
+        meta: { title: '设备管理', noCache: true, permit: 'aqpt_equipment' }
+      }
+    ]
+  },
+
+  {
+    path: '/aqpt/ticket',
+    component: Layout,
+    name: 'AqptTicket',
+    meta: {
+      title: '危险作业',
+      icon: 'icon-common_satisfaction',
+      permit: 'aqpt_ticket'
+    },
+    groupId: [5],
+    redirect: '/aqpt/ticket/dz',
+    children: [
+      {
+        path: 'dz',
+        component: () => import('@/views/aqpt/ticket/dz/index'),
+        name: 'aqpt_ticket_dz',
+        meta: { title: '吊装作业', affix: true, permit: 'aqpt_ticket_dz' }
+      },
+      {
+        path: 'dh',
+        component: () => import('@/views/aqpt/ticket/dh/index'),
+        name: 'aqpt_ticket_dh',
+        meta: { title: '动火作业', affix: true, permit: 'aqpt_ticket_dh' }
+      },
+      {
+        path: 'dt',
+        component: () => import('@/views/aqpt/ticket/dt/index'),
+        name: 'aqpt_ticket_dt',
+        meta: { title: '动土作业', affix: true, permit: 'aqpt_ticket_dt' }
+      },
+      {
+        path: 'dl',
+        component: () => import('@/views/aqpt/ticket/dl/index'),
+        name: 'aqpt_ticket_dl',
+        meta: { title: '断路作业', affix: true, permit: 'aqpt_ticket_dl' }
+      },
+      {
+        path: 'gk',
+        component: () => import('@/views/aqpt/ticket/gk/index'),
+        name: 'aqpt_ticket_gk',
+        meta: { title: '高处作业', affix: true, permit: 'aqpt_ticket_gk' }
+      },
+      {
+        path: 'sbjx',
+        component: () => import('@/views/aqpt/ticket/sbjx/index'),
+        name: 'aqpt_ticket_sbjx',
+        meta: { title: '设备检修作业', affix: true, permit: 'aqpt_ticket_sbjx' }
+      },
+      {
+        path: 'mbcd',
+        component: () => import('@/views/aqpt/ticket/mbcd/index'),
+        name: 'aqpt_ticket_mbcd',
+        meta: { title: '盲板抽堵作业', affix: true, permit: 'aqpt_ticket_mbcd' }
+      },
+      {
+        path: 'sxkj',
+        component: () => import('@/views/aqpt/ticket/sxkj/index'),
+        name: 'aqpt_ticket_sxkj',
+        meta: { title: '受限空间作业', affix: true, permit: 'aqpt_ticket_sxkj' }
+      }
+    ]
+  },
+
+  {
+    path: '/aqpt/training',
+    component: Layout,
+    name: 'AqptTraining',
+    meta: { title: '安全教育', permit: 'aqpt_training' },
+    groupId: [6],
+    redirect: '/aqpt/training/index',
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/training/index'),
+        name: 'aqpt_training',
+        meta: { title: '安全教育', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_training' }
+      }
+    ]
+  },
+
+  {
+    path: '/aqpt/kpi/regulation',
+    component: Layout,
+    name: 'aqptKpiRegulation',
+    meta: { title: '考核制度', permit: 'aqpt_kpi' },
+    redirect: '/aqpt/kpi/regulation/index',
+    groupId: [6],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/kpi/regulation/index'),
+        name: 'aqpt_kpi_index',
+        meta: { title: '考核制度', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_kpi_regulation' }
+      }
+    ]
+  },
+  {
+    path: '/aqpt/kpi/rule',
+    component: Layout,
+    name: 'aqptKpiRule',
+    meta: { title: '考核办法', permit: 'aqpt_kpi_rule' },
+    redirect: '/aqpt/kpi/rule/index',
+    groupId: [6],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/kpi/rule/index'),
+        name: 'aqpt_kpi_rule',
+        meta: { title: '考核办法', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_kpi_rule' }
+      }
+    ]
+  },
+  {
+    path: '/aqpt/kpi/rank',
+    component: Layout,
+    name: 'aqptKpiRank',
+    meta: {
+      title: '考核结果',
+      icon: 'icon-common_task',
+      permit: 'aqpt_kpi_rank'
+    },
+    redirect: '/aqpt/kpi/rule/group',
+    groupId: [6],
+    children: [
+      {
+        path: 'group',
+        component: () => import('@/views/aqpt/kpi/rank/group/index'),
+        name: 'aqpt_kpi_rank_group',
+        meta: { title: '部门排名', affix: true, permit: 'aqpt_kpi_rank_group' }
+      },
+      {
+        path: 'member',
+        component: () => import('@/views/aqpt/kpi/rank/member/index'),
+        name: 'aqpt_kpi_rank_member',
+        meta: { title: '部门排名', affix: true, permit: 'aqpt_kpi_rank_member' }
+      }
+    ]
+  },
+  {
+    path: '/aqpt/kpi/report',
+    component: Layout,
+    name: 'aqptKpiReport',
+    meta: { permit: 'aqpt_kpi_report' },
+    redirect: '/aqpt/kpi/report/index',
+    groupId: [6],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/aqpt/kpi/report/index'),
+        name: 'aqpt_kpi_report',
+        meta: { title: '考核报告', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_kpi_report' }
+      }
+    ]
+  },
+
+  {
+    path: '/aqpt/art',
+    component: Layout,
+    name: 'AqptArtCenter',
+    redirect: '/aqpt/art/index',
+    groupId: [7],
+    hidden: true,
+    meta: {
+      title: '安全智库',
+      permit: 'aqpt_art_center'
+    },
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/system/art/index'),
+        name: 'aqpt_art_center',
+        meta: { title: '安全智库', noCache: true, icon: 'icon-common_knowledge', permit: 'aqpt_art_center' }
+      }
+    ]
+  },
+  {
+    path: '/aqpt/doc',
+    component: Layout,
+    name: 'AqptDoc',
+    redirect: '/aqpt/doc/index',
+    groupId: [8],
+    hidden: true,
+    meta: {
+      title: '文件中心',
+      permit: 'aqpt_doc_center'
+    },
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/system/doc/index'),
+        name: 'aqpt_doc_center',
+        meta: { title: '文件中心', noCache: true, icon: 'icon-common_file', permit: 'aqpt_doc_center' }
+      }
+    ]
+  },
+
+  {
+    path: '/aqpt',
+    component: Layout,
+    redirect: '/aqpt/account',
+    name: 'aqpt',
+    groupId: [9],
+    meta: {
+      title: '组织管理',
+      icon: 'icon-common_digitization',
+      permit: 'aqpt_ent'
+    },
+    children: [
+      {
+        path: 'profile',
+        component: () => import('@/views/aqpt/profile/index'),
+        name: 'aqpt_ent_profile',
+        meta: { title: '企业信息', noCache: true, permit: 'aqpt_ent_profile' }
+      },
+      {
+        path: 'account',
+        component: () => import('@/views/system/group/index'),
+        name: 'aqpt_ent_group_user',
+        meta: { title: '帐号管理', noCache: true, permit: 'aqpt_ent_group_user' }
+      },
+      {
+        path: 'position',
+        component: () => import('@/views/system/position/index'),
+        name: 'aqpt_ent_position',
+        meta: { title: '岗位管理', noCache: true, permit: 'aqpt_ent_position' }
+      }
+    ]
+  },
+  {
+    path: '/aqpt/setting',
+    component: Layout,
+    redirect: '/aqpt/setting/groupCat',
+    name: 'aqptSetting',
+    groupId: [9],
+    meta: {
+      title: '系统配置',
+      icon: 'icon-common_configuration',
+      isGroup: true,
+      permit: 'aqpt_setting'
+    },
+    children: [
+      {
+        path: 'groupCat',
+        component: () => import('@/views/system/setting/groupCat/index'),
+        name: 'aqpt_setting_group_cat',
+        meta: { title: '群组类别', noCache: true, permit: 'aqpt_setting_group_cat' }
+      },
+
+      {
+        path: 'taskCat',
+        component: () => import('@/views/system/setting/taskCat/index'),
+        name: 'aqpt_setting_task_cat',
+        meta: { title: '任务类别', noCache: true, permit: 'aqpt_setting_task_cat' }
+      },
+
+      {
+        path: 'checklistCat',
+        component: () => import('@/views/system/setting/checklistCat/index'),
+        name: 'aqpt_setting_checklist_cat',
+        meta: { title: '清单类别', noCache: true, permit: 'aqpt_setting_checklist_cat' }
+      },
+
+      {
+        path: 'riskPointCat',
+        component: () => import('@/views/aqpt/setting/riskPointCat/index'),
+        name: 'aqpt_setting_riskpoint_cat',
+        meta: { title: '风险点类别', noCache: true, permit: 'aqpt_setting_riskpoint_cat' }
+      },
+
+      {
+        path: 'dangerCat',
+        component: () => import('@/views/aqpt/setting/dangerCat/index'),
+        name: 'aqpt_setting_danger_cat',
+        meta: { title: '隐患类别', noCache: true, permit: 'aqpt_setting_danger_cat' }
+      },
+
+      {
+        path: 'equipmentCat',
+        component: () => import('@/views/aqpt/setting/equipmentCat/index'),
+        name: 'aqpt_setting_equipment_cat',
+        meta: { title: '设备类别', noCache: true, permit: 'aqpt_setting_equipment_cat' }
+      },
+
+      {
+        path: 'checkCat',
+        component: () => import('@/views/aqpt/setting/checkCat/index'),
+        name: 'aqpt_setting_check_cat',
+        meta: { title: '检查类别', noCache: true, permit: 'aqpt_setting_check_cat' }
+      },
+
+      {
+        path: 'ctrlLevel',
+        component: () => import('@/views/aqpt/setting/ctrlLevel/index'),
+        name: 'aqpt_setting_ctrl_level',
+        meta: { title: '管控层级', noCache: true, permit: 'aqpt_setting_ctrl_level' }
+      },
+
+      {
+        path: 'measureType',
+        component: () => import('@/views/aqpt/setting/measureType/index'),
+        name: 'aqpt_setting_measure_type',
+        meta: { title: '控制措施类型', noCache: true, permit: 'aqpt_setting_measure_type' }
+      },
+
+      {
+        path: 'alertType',
+        component: () => import('@/views/aqpt/setting/alertType/index'),
+        name: 'aqpt_setting_alert_type',
+        meta: { title: '预警类型', noCache: true, permit: 'aqpt_setting_alert_type' }
+      }
+    ]
+  }
+]
+export default aqptRouter

+ 150 - 150
src/router/modules/aqpt.js

@@ -5,18 +5,18 @@ const aqptRouter = [
     path: '/',
     component: Layout,
     name: 'AqptPanorama',
-    redirect: '/panorama',
-    meta: { permit: 'aqpt_panorama' },
+    redirect: '/goaf/info',
+    // meta: { permit: 'aqpt_panorama' },
     groupId: [0],
-    hidden: true,
-    children: [
-      {
-        path: 'panorama',
-        component: () => import('@/views/aqpt/panorama'),
-        name: 'aqpt_panorama',
-        meta: { title: '数字总览', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_panorama' }
-      }
-    ]
+    hidden: true
+    // children: [
+    //   {
+    //     path: 'panorama',
+    //     component: () => import('@/views/aqpt/panorama'),
+    //     name: 'aqpt_panorama',
+    //     meta: { title: '数字总览', icon: 'icon-common_digitization', affix: true, permit: 'aqpt_panorama' }
+    //   }
+    // ]
   },
   /** 不能跟路由1重复出现 */
   {
@@ -61,43 +61,43 @@ const aqptRouter = [
     ]
   },
 
-  {
-    path: '/aqpt/management',
-    component: Layout,
-    redirect: '/aqpt/management/leadingGroup',
-    name: 'AqptManagement',
-    meta: {
-      title: '管理体系',
-      icon: 'icon-common_organization',
-      permit: 'aqpt_management'
-    },
-    groupId: [3],
-    children: [
-      {
-        path: 'leadingGroup',
-        component: () => import('@/views/system/leadingGroup/index'),
-        name: 'aqpt_management_leading_group',
-        meta: { title: '领导小组', noCache: true, permit: 'aqpt_management_leading_group' }
-      }, {
-        path: 'regulation',
-        component: () => import('@/views/system/regulation/index'),
-        name: 'aqpt_management_regulation',
-        meta: { title: '管理制度', noCache: true, permit: 'aqpt_management_regulation' }
-      },
-      {
-        path: 'hazard',
-        component: () => import('@/views/aqpt/hazard/index'),
-        name: 'aqpt_management_hazard',
-        meta: { title: '危险源库', noCache: true, permit: 'aqpt_management_hazard' }
-      },
-      {
-        path: 'checkList',
-        component: () => import('@/views/system/checklist/index'),
-        name: 'aqpt_management_checkList',
-        meta: { title: '检查清单', noCache: true, permit: 'aqpt_management_checklist' }
-      }
-    ]
-  },
+  // {
+  //   path: '/aqpt/management',
+  //   component: Layout,
+  //   redirect: '/aqpt/management/leadingGroup',
+  //   name: 'AqptManagement',
+  //   meta: {
+  //     title: '管理体系',
+  //     icon: 'icon-common_organization',
+  //     permit: 'aqpt_management'
+  //   },
+  //   groupId: [3],
+  //   children: [
+  //     {
+  //       path: 'leadingGroup',
+  //       component: () => import('@/views/system/leadingGroup/index'),
+  //       name: 'aqpt_management_leading_group',
+  //       meta: { title: '领导小组', noCache: true, permit: 'aqpt_management_leading_group' }
+  //     }, {
+  //       path: 'regulation',
+  //       component: () => import('@/views/system/regulation/index'),
+  //       name: 'aqpt_management_regulation',
+  //       meta: { title: '管理制度', noCache: true, permit: 'aqpt_management_regulation' }
+  //     },
+  //     {
+  //       path: 'hazard',
+  //       component: () => import('@/views/aqpt/hazard/index'),
+  //       name: 'aqpt_management_hazard',
+  //       meta: { title: '危险源库', noCache: true, permit: 'aqpt_management_hazard' }
+  //     },
+  //     {
+  //       path: 'checkList',
+  //       component: () => import('@/views/system/checklist/index'),
+  //       name: 'aqpt_management_checkList',
+  //       meta: { title: '检查清单', noCache: true, permit: 'aqpt_management_checklist' }
+  //     }
+  //   ]
+  // },
   /** 采空区*/
   {
     path: '/goaf',
@@ -109,7 +109,7 @@ const aqptRouter = [
       permit: 'aqpt_danger',
       icon: 'icon-common_riskmanagement'
     },
-    groupId: [3],
+    groupId: [0],
     children: [
       {
         path: 'info',
@@ -122,17 +122,6 @@ const aqptRouter = [
         }
       },
       {
-        path: 'sensor',
-        component: () => import('@/views/goaf/sensor/index'),
-        name: 'goaf-sensor',
-        meta: {
-          title: '传感器配置',
-          noCache: true,
-          // icon: 'icon-common_equipment',
-          permit: 'aqpt_danger'
-        }
-      },
-      {
         path: 'map',
         component: () => import('@/views/goaf/map/index'),
         name: 'goaf-map',
@@ -161,7 +150,7 @@ const aqptRouter = [
     component: Layout,
     name: 'AqptScene',
     redirect: '/aqpt/scene/riskPoint',
-    groupId: [3],
+    groupId: [0],
     meta: {
       title: '现场管理',
       icon: 'icon-common_overview',
@@ -201,11 +190,11 @@ const aqptRouter = [
     name: 'AqptCheck',
     redirect: '/aqpt/check/index',
     meta: {
-      title: '隐患排查',
+      title: '人员巡检',
       icon: 'icon-common_task',
       permit: 'aqpt_check_manage'
     },
-    groupId: [3],
+    groupId: [5],
     children: [
       {
         path: 'plan',
@@ -238,7 +227,7 @@ const aqptRouter = [
       title: '隐患管理',
       permit: 'aqpt_danger'
     },
-    groupId: [3],
+    groupId: [5],
     children: [
       {
         path: 'index',
@@ -249,31 +238,31 @@ const aqptRouter = [
     ]
   },
 
-  {
-    path: '/aqpt/report',
-    component: Layout,
-    name: 'AqptLedger',
-    redirect: '/aqpt/report/index',
-    meta: {
-      title: '台帐清单',
-      permit: 'aqpt_report'
-    },
-    groupId: [3],
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/aqpt/report/index'),
-        name: 'aqpt_report_index',
-        meta: { title: '台帐中心', noCache: true, icon: 'icon-common_statistical', permit: 'aqpt_report' }
-      }
-    ]
-  },
+  // {
+  //   path: '/aqpt/report',
+  //   component: Layout,
+  //   name: 'AqptLedger',
+  //   redirect: '/aqpt/report/index',
+  //   meta: {
+  //     title: '台帐清单',
+  //     permit: 'aqpt_report'
+  //   },
+  //   groupId: [3],
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/aqpt/report/index'),
+  //       name: 'aqpt_report_index',
+  //       meta: { title: '台帐中心', noCache: true, icon: 'icon-common_statistical', permit: 'aqpt_report' }
+  //     }
+  //   ]
+  // },
 
   {
     path: '/aqpt/equipment',
     component: Layout,
     name: 'AqptEquipment',
-    redirect: '/aqpt/equipment/index',
+    redirect: '/aqpt/equipment/sensor',
     meta: {
       title: '设备管理',
       icon: 'icon-common_equipment',
@@ -281,77 +270,88 @@ const aqptRouter = [
     },
     groupId: [4],
     children: [
+      // {
+      //   path: 'index',
+      //   component: () => import('@/views/aqpt/equipment/index'),
+      //   name: 'aqpt_equipment_index',
+      //   meta: { title: '设备管理', noCache: true, permit: 'aqpt_equipment' }
+      // },
       {
-        path: 'index',
-        component: () => import('@/views/aqpt/equipment/index'),
-        name: 'aqpt_equipment_index',
-        meta: { title: '设备管理', noCache: true, permit: 'aqpt_equipment' }
+        path: 'sensor',
+        component: () => import('@/views/goaf/sensor/index'),
+        name: 'goaf-sensor',
+        meta: {
+          title: '传感器配置',
+          noCache: true,
+          // icon: 'icon-common_equipment',
+          permit: 'aqpt_danger'
+        }
       }
     ]
   },
 
-  {
-    path: '/aqpt/ticket',
-    component: Layout,
-    name: 'AqptTicket',
-    meta: {
-      title: '危险作业',
-      icon: 'icon-common_satisfaction',
-      permit: 'aqpt_ticket'
-    },
-    groupId: [5],
-    redirect: '/aqpt/ticket/dz',
-    children: [
-      {
-        path: 'dz',
-        component: () => import('@/views/aqpt/ticket/dz/index'),
-        name: 'aqpt_ticket_dz',
-        meta: { title: '吊装作业', affix: true, permit: 'aqpt_ticket_dz' }
-      },
-      {
-        path: 'dh',
-        component: () => import('@/views/aqpt/ticket/dh/index'),
-        name: 'aqpt_ticket_dh',
-        meta: { title: '动火作业', affix: true, permit: 'aqpt_ticket_dh' }
-      },
-      {
-        path: 'dt',
-        component: () => import('@/views/aqpt/ticket/dt/index'),
-        name: 'aqpt_ticket_dt',
-        meta: { title: '动土作业', affix: true, permit: 'aqpt_ticket_dt' }
-      },
-      {
-        path: 'dl',
-        component: () => import('@/views/aqpt/ticket/dl/index'),
-        name: 'aqpt_ticket_dl',
-        meta: { title: '断路作业', affix: true, permit: 'aqpt_ticket_dl' }
-      },
-      {
-        path: 'gk',
-        component: () => import('@/views/aqpt/ticket/gk/index'),
-        name: 'aqpt_ticket_gk',
-        meta: { title: '高处作业', affix: true, permit: 'aqpt_ticket_gk' }
-      },
-      {
-        path: 'sbjx',
-        component: () => import('@/views/aqpt/ticket/sbjx/index'),
-        name: 'aqpt_ticket_sbjx',
-        meta: { title: '设备检修作业', affix: true, permit: 'aqpt_ticket_sbjx' }
-      },
-      {
-        path: 'mbcd',
-        component: () => import('@/views/aqpt/ticket/mbcd/index'),
-        name: 'aqpt_ticket_mbcd',
-        meta: { title: '盲板抽堵作业', affix: true, permit: 'aqpt_ticket_mbcd' }
-      },
-      {
-        path: 'sxkj',
-        component: () => import('@/views/aqpt/ticket/sxkj/index'),
-        name: 'aqpt_ticket_sxkj',
-        meta: { title: '受限空间作业', affix: true, permit: 'aqpt_ticket_sxkj' }
-      }
-    ]
-  },
+  // {
+  //   path: '/aqpt/ticket',
+  //   component: Layout,
+  //   name: 'AqptTicket',
+  //   meta: {
+  //     title: '危险作业',
+  //     icon: 'icon-common_satisfaction',
+  //     permit: 'aqpt_ticket'
+  //   },
+  //   groupId: [5],
+  //   redirect: '/aqpt/ticket/dz',
+  //   children: [
+  //     {
+  //       path: 'dz',
+  //       component: () => import('@/views/aqpt/ticket/dz/index'),
+  //       name: 'aqpt_ticket_dz',
+  //       meta: { title: '吊装作业', affix: true, permit: 'aqpt_ticket_dz' }
+  //     },
+  //     {
+  //       path: 'dh',
+  //       component: () => import('@/views/aqpt/ticket/dh/index'),
+  //       name: 'aqpt_ticket_dh',
+  //       meta: { title: '动火作业', affix: true, permit: 'aqpt_ticket_dh' }
+  //     },
+  //     {
+  //       path: 'dt',
+  //       component: () => import('@/views/aqpt/ticket/dt/index'),
+  //       name: 'aqpt_ticket_dt',
+  //       meta: { title: '动土作业', affix: true, permit: 'aqpt_ticket_dt' }
+  //     },
+  //     {
+  //       path: 'dl',
+  //       component: () => import('@/views/aqpt/ticket/dl/index'),
+  //       name: 'aqpt_ticket_dl',
+  //       meta: { title: '断路作业', affix: true, permit: 'aqpt_ticket_dl' }
+  //     },
+  //     {
+  //       path: 'gk',
+  //       component: () => import('@/views/aqpt/ticket/gk/index'),
+  //       name: 'aqpt_ticket_gk',
+  //       meta: { title: '高处作业', affix: true, permit: 'aqpt_ticket_gk' }
+  //     },
+  //     {
+  //       path: 'sbjx',
+  //       component: () => import('@/views/aqpt/ticket/sbjx/index'),
+  //       name: 'aqpt_ticket_sbjx',
+  //       meta: { title: '设备检修作业', affix: true, permit: 'aqpt_ticket_sbjx' }
+  //     },
+  //     {
+  //       path: 'mbcd',
+  //       component: () => import('@/views/aqpt/ticket/mbcd/index'),
+  //       name: 'aqpt_ticket_mbcd',
+  //       meta: { title: '盲板抽堵作业', affix: true, permit: 'aqpt_ticket_mbcd' }
+  //     },
+  //     {
+  //       path: 'sxkj',
+  //       component: () => import('@/views/aqpt/ticket/sxkj/index'),
+  //       name: 'aqpt_ticket_sxkj',
+  //       meta: { title: '受限空间作业', affix: true, permit: 'aqpt_ticket_sxkj' }
+  //     }
+  //   ]
+  // },
 
   {
     path: '/aqpt/training',

+ 1 - 3
src/views/goaf/map/components/VisualEditor.vue

@@ -445,12 +445,10 @@ export default {
         this.dragstartMarker = undefined
         return
       }
-      if (this.type === 2 && !this.layer) {
-        this.type = 1
-      }
       if (this.layer && this.layer._leaflet_id && this.map._layers[this.layer._leaflet_id]) {
         this.map.removeLayer(this.map._layers[this.layer._leaflet_id])
         this.layer = undefined
+        this.type = 1
       }
     },
     delMarker() {