fix: 同步代码,并解决冲突
This commit is contained in:
parent
03831e7407
commit
28b05cc0a8
@ -93,6 +93,16 @@ export const staticRouter: RouteRecordRaw[] = [
|
||||
name: "智慧党建",
|
||||
component: () => import("@/views/sevenLargeScreen/comprehensiveManage/smartPartyBuilding/index.vue")
|
||||
},
|
||||
{
|
||||
path: "/digitalConstruction/aIEarlyWarning",
|
||||
name: "AI预警",
|
||||
component: () => import("@/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue")
|
||||
},
|
||||
{
|
||||
path: "/digitalConstruction/loadometerManage",
|
||||
name: "地磅管理",
|
||||
component: () => import("@/views/sevenLargeScreen/digitalConstruction/loadometerManage/index.vue")
|
||||
}
|
||||
],
|
||||
meta: {
|
||||
title: "七参数大屏"
|
||||
|
||||
@ -94,7 +94,21 @@ let menuList = ref([
|
||||
{
|
||||
menuName: "智慧党建",
|
||||
companyPath: "/comprehensiveManage/smartPartyBuilding"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "数字工地",
|
||||
modulePath: "/digitalConstruction/aIEarlyWarning",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "AI预警",
|
||||
companyPath: "/digitalConstruction/aIEarlyWarning"
|
||||
},
|
||||
{
|
||||
menuName: "地磅管理",
|
||||
companyPath: "/digitalConstruction/loadometerManage"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -117,15 +131,15 @@ let menuList = ref([
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "扬尘噪声",
|
||||
modulePath: "/headNoise"
|
||||
},
|
||||
{
|
||||
moduleName: "劳务管理",
|
||||
modulePath: "/laborManagement"
|
||||
},
|
||||
{ moduleName: "视频管理", modulePath: "/videoManagement" },
|
||||
// {
|
||||
// moduleName: "扬尘噪声",
|
||||
// modulePath: "/headNoise"
|
||||
// },
|
||||
// {
|
||||
// moduleName: "劳务管理",
|
||||
// modulePath: "/laborManagement"
|
||||
// },
|
||||
// { moduleName: "视频管理", modulePath: "/videoManagement" },
|
||||
{ moduleName: "配电箱监测", modulePath: "/distributionMonitoring" },
|
||||
{ moduleName: "车辆管理", modulePath: "/vehicleManagement" },
|
||||
{ moduleName: "塔吊监测", modulePath: "/towerCraneMonitoring" },
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user