|
@@ -81,10 +81,6 @@ export default new Router({
|
|
|
title: '主题管理'
|
|
title: '主题管理'
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- //------------------测报管理--------------------------
|
|
|
|
|
- //------------------测报灯--------------------------
|
|
|
|
|
-=======
|
|
|
|
|
{
|
|
{
|
|
|
path: 'harmfulBiology',
|
|
path: 'harmfulBiology',
|
|
|
component: harmfulBiology,
|
|
component: harmfulBiology,
|
|
@@ -116,7 +112,6 @@ export default new Router({
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
//------------------指挥中心--------------------------
|
|
//------------------指挥中心--------------------------
|
|
|
->>>>>>> 6b029a9bf25447ffb3ff9e74308c406e23d98ec7
|
|
|
|
|
{
|
|
{
|
|
|
path: 'cbd',
|
|
path: 'cbd',
|
|
|
component: cbd
|
|
component: cbd
|
