诱捕器管理更新 1/26

minggao/src/router/index.js

@@ -8,11 +8,9 @@ import Login from '@/page/login/login'
 // *****************首页**********************
 import Index from '@/page/home/index'
 //---------------------------------------系统管理----------------------------------------------------
-<<<<<<< HEAD
 const customsManger = () => import('@/Page/systemmanger/customsManger')
 const role = () => import('@/Page/systemmanger/role')
 const motif = () => import('@/Page/systemmanger/motif')
-=======
 const customsManger = () => import('@/Page/systemmanger/customsManger') //隶属海关
 const role = () => import('@/Page/systemmanger/role') // 角色管理
 const motif = () => import('@/Page/systemmanger/motif') // 主题定制
@@ -22,7 +20,6 @@ const dayRecord = () => import('@/Page/systemmanger/dayRecord') // 用户管理
 
 //---------------------------------------指挥中心----------------------------------------------------
 const realTime = () => import('@/Page/commandCenter/realTime') //实时通信
->>>>>>> 6b029a9bf25447ffb3ff9e74308c406e23d98ec7
 
 // *****************测报系统**********************
 import cbd from '@/page/forecasting/cbd/Cbd'//首页