合并develop最新代码

src/router/ems.js

@@ -1,23 +1,5 @@
 import Layout from "@/layout/index.vue";
 
-//todo delete 删除动态路由页面的定义 接口会传递进来
-// const ems = [
-//   {
-//     path: '',
-//     component: Layout,
-//     redirect: 'noRedirect',
-//     children: [
-//       {
-//         path: 'zddt',
-//         component: () => import('@/views/ems/zddt/index'),
-//         name: 'zddt',
-//         meta: { title: '站点地图', icon: 'guide' }
-//       }
-//     ]
-//   }
-// ]
-// export default ems
-
 //单站监控
 // todo 本地设置了 hidden:true,不会显示在侧边栏，需要在系统管理、菜单管理中手动添加菜单后才会展示在侧边栏
 export const dzjk=[

src/router/index.js

@@ -1,7 +1,5 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-// todo delete
-import ems from './ems'//EMS管理系统routers引用
 import {dzjk} from '@/router/ems'
 
 Vue.use(Router)
@@ -92,7 +90,6 @@ export const constantRoutes = [
     ]
   },
   // EMS管理系统routers
-  // ...ems
   ...dzjk
 ]