diff --git a/src/config/staticMenu.ts b/src/config/staticMenu.ts index 72bcde1..7dede72 100644 --- a/src/config/staticMenu.ts +++ b/src/config/staticMenu.ts @@ -1895,12 +1895,8 @@ export const WHZTMenu: Array = [ export const ZTSYJMenu: Array = [ { moduleName: "综合管理", - modulePath: "/gridStaff", + modulePath: "/projectOverview", menuList: [ - { - menuName: "网格人员", - companyPath: "/gridStaff" - }, { menuName: "工程概览", companyPath: "/projectOverview" @@ -1933,17 +1929,21 @@ export const ZTSYJMenu: Array = [ moduleName: "人员管理", modulePath: "/laborManagement", menuList: [ + { + menuName: "网格管理", + companyPath: "/gridStaff" + }, { menuName: "劳务管理", - companyPath: "/laborManagement" + companyPath: "/staffAttendance" + }, + { + menuName: "班前教育", + companyPath: "/griddingstatic" }, { menuName: "人员定位", companyPath: "/smartSafeHater" - }, - { - menuName: "人员考勤", - companyPath: "/staffAttendance" } ] }, @@ -1968,17 +1968,21 @@ export const ZTSYJMenu: Array = [ { moduleName: "AI预警", modulePath: "/aIEarlyWarning" - }, - { - moduleName: "新页面", - modulePath: "/griddingstatic", - menuList: [ - { - menuName: "网格员统计", - companyPath: "/griddingstatic" - } - ] } + // { + // moduleName: "新页面", + // modulePath: "/griddingstatic", + // menuList: [ + // { + // menuName: "班前教育", + // companyPath: "/griddingstatic" + // }, + // { + // menuName: "网格人员", + // companyPath: "/gridStaff" + // } + // ] + // } ]; // 中铁十一局 export const XNYZHJJMenu: Array = [ { diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue index 26fb806..89dc177 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue @@ -4,18 +4,20 @@
- 项目总人数 + 管理员总人数
- {{ workerOverviewdata.在册人数 || 0 }} + + 1024
- 在场出勤人数 + 第二网格在场人数
- {{ workerOverviewdata.今日出勤 || 0 }} + + 1024
@@ -38,39 +40,42 @@
- 电工 + 网格长
- {{ workerType.电工 || 0 }} + + 3 人
- 钢筋工 + 网格员
- {{ workerType.钢筋工 || 0 }} + + 3 人
- 木工 + 班组网格员
- {{ workerType.木工 || 0 }} + + 3 人
-
+
-
+
@@ -268,15 +273,16 @@ onMounted(async () => { .numData { // position: absolute; - width: 25%; + width: 33%; display: flex; // background: skyblue; flex-direction: column; align-items: center; + margin-top: 30px; border-top: 15px solid #1a408a; .text { - margin-top: -35%; + margin-top: -30%; font-size: 16px; i { @@ -285,7 +291,7 @@ onMounted(async () => { } .num { font-size: 20px; - margin-top: 32%; + margin-top: 28%; // margin-left: 10%; } } diff --git a/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-top.vue b/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-top.vue index c4f2732..1fb9624 100644 --- a/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-top.vue +++ b/src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-top.vue @@ -4,15 +4,18 @@
设备总数 - {{ smokeAlarmEquipTotal?.total || 0 }} + + 235
在线 - {{ smokeAlarmEquipTotal?.onlineNum || 0 }} + + 230
离线 - {{ smokeAlarmEquipTotal?.offLineNum || 0 }} + + 5