2024-11-18 第一版本

src/config/staticMenu.ts

@@ -1895,12 +1895,8 @@ export const WHZTMenu: Array<any> = [
 export const ZTSYJMenu: Array<any> = [
 	{
 		moduleName: "综合管理",
-		modulePath: "/gridStaff",
+		modulePath: "/projectOverview",
 		menuList: [
-			{
-				menuName: "网格人员",
-				companyPath: "/gridStaff"
-			},
 			{
 				menuName: "工程概览",
 				companyPath: "/projectOverview"
@@ -1933,17 +1929,21 @@ export const ZTSYJMenu: Array<any> = [
 		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<any> = [
 	{
 		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<any> = [
 	{

src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue

@@ -4,18 +4,20 @@
 			<div class="topPeopleNum">
 				<div class="dataTlo">
 					<div class="text">
-						<i>项目总人数</i>
+						<i>管理员总人数</i>
 					</div>
 					<div class="num">
-						<i>{{ workerOverviewdata.在册人数 || 0 }}</i>
+						<!-- <i>{{ workerOverviewdata.在册人数 || 0 }}</i> -->
+						<i>1024</i>
 					</div>
 				</div>
 				<div class="dataTlt">
 					<div class="text">
-						<i>在场出勤人数</i>
+						<i>第二网格在场人数</i>
 					</div>
 					<div class="num">
-						<i>{{ workerOverviewdata.今日出勤 || 0 }}</i>
+						<!-- <i>{{ workerOverviewdata.今日出勤 || 0 }}</i> -->
+						<i>1024</i>
 					</div>
 				</div>
 			</div>
@@ -38,39 +40,42 @@
 							<div class="penN"></div>
 							<div class="numData">
 								<div class="text">
-									<i>电工</i>
+									<i>网格长</i>
 								</div>
 								<div class="num">
-									<i style="color: #eea959">{{ workerType.电工 || 0 }}</i>
+									<!-- <i style="color: #eea959">{{ workerType.电工 || 0 }}</i> -->
+									<i style="color: #eea959">3 人</i>
 								</div>
 							</div>
 							<div class="numData">
 								<div class="text">
-									<i>钢筋工</i>
+									<i>网格员</i>
 								</div>
 								<div class="num">
-									<i style="color: #82fbea">{{ workerType.钢筋工 || 0 }}</i>
+									<!-- <i style="color: #82fbea">{{ workerType.钢筋工 || 0 }}</i> -->
+									<i style="color: #82fbea">3 人</i>
 								</div>
 							</div>
 							<div class="numData">
 								<div class="text">
-									<i>木工</i>
+									<i>班组网格员</i>
 								</div>
 								<div class="num">
-									<i style="color: #7aa0ea">{{ workerType.木工 || 0 }}</i>
+									<!-- <i style="color: #7aa0ea">{{ workerType.木工 || 0 }}</i> -->
+									<i style="color: #7aa0ea">3 人</i>
 								</div>
 							</div>
-							<div class="numData">
+							<!-- <div class="numData">
 								<div class="text">
 									<i>混凝土工</i>
 								</div>
 								<div class="num">
 									<i style="color: #7aa0ea">{{ workerType.混凝土工 || 0 }}</i>
 								</div>
-							</div>
+							</div> -->
 						</div>
 
-						<div class="peoNum">
+						<!-- <div class="peoNum">
 							<div class="penName"></div>
 							<div class="penN"></div>
 							<div class="numData3 numData">
@@ -97,7 +102,7 @@
 									<i style="color: #7aa0ea">{{ workerType.其他 || 0 }}</i>
 								</div>
 							</div>
-						</div>
+						</div> -->
 					</div>
 				</div>
 			</div>
@@ -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%;
 						}
 					}

src/views/sevenLargeScreen/safetyManagement/smokeSensor/smoke-top.vue

@@ -4,15 +4,18 @@
 			<div class="device-count-status">
 				<div class="device-count-content">
 					<span>设备总数</span>
-					<span>{{ smokeAlarmEquipTotal?.total || 0 }}</span>
+					<!-- <span>{{ smokeAlarmEquipTotal?.total || 0 }}</span> -->
+					<span>235</span>
 				</div>
 				<div class="device-count-content">
 					<span>在线</span>
-					<span>{{ smokeAlarmEquipTotal?.onlineNum || 0 }}</span>
+					<!-- <span>{{ smokeAlarmEquipTotal?.onlineNum || 0 }}</span> -->
+					<span>230</span>
 				</div>
 				<div class="device-count-content">
 					<span>离线</span>
-					<span>{{ smokeAlarmEquipTotal?.offLineNum || 0 }}</span>
+					<!-- <span>{{ smokeAlarmEquipTotal?.offLineNum || 0 }}</span> -->
+					<span>5</span>
 				</div>
 			</div>
 			<div class="smoke-center-top">