From 47db9192bde48886951c07ef96af80300c2e601b Mon Sep 17 00:00:00 2001
From: jiayu <zheng_jiayu1@163.com>
Date: Mon, 16 Jun 2025 16:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=B0=B4=E5=8C=97=E6=96=B9=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 src/api/modules/labor.ts                      |  10 +
 src/assets/images/larborManagement/xd-bg.png  | Bin 0 -> 1883 bytes
 src/assets/images/larborManagement/xd-ic.png  | Bin 0 -> 263 bytes
 src/views/sevenLargeScreen/indexL.vue         |   7 +-
 .../laborManagement/data-dialog.vue           |   2 +-
 .../laborManagement/leftTop.vue               | 199 ++++++++++++++++--
 .../laborManagement/member-count-list.vue     |   5 +-
 8 files changed, 200 insertions(+), 27 deletions(-)
 create mode 100644 src/assets/images/larborManagement/xd-bg.png
 create mode 100644 src/assets/images/larborManagement/xd-ic.png

diff --git a/.env.development b/.env.development
index 45d96cc..ab62747 100644
--- a/.env.development
+++ b/.env.development
@@ -4,9 +4,9 @@ NODE_ENV = 'development'
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
 # VITE_API_URL = 'http://192.168.34.155:28890'  #彭杰鞍钢本地
-VITE_API_URL = 'http://192.168.34.155:19111'
+# VITE_API_URL = 'http://192.168.34.155:19111'
 # VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
-# VITE_API_URL = 'http://192.168.34.221:19112' #雄哥本地
+VITE_API_URL = 'http://192.168.34.221:19112' #雄哥本地
 # VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地
 # VITE_API_URL = 'http://182.90.224.237:51234'  #雄哥远程
 # VITE_API_URL = 'http://192.168.34.221:28889'
diff --git a/src/api/modules/labor.ts b/src/api/modules/labor.ts
index 8786bf7..2ad2897 100644
--- a/src/api/modules/labor.ts
+++ b/src/api/modules/labor.ts
@@ -68,3 +68,13 @@ export const getComapnyWorkTotalListApi = (params: {}) => {
 export const getUfaceDevListApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/ufaceDev/list`, params, { headers: { noLoading: true } });
 };
+
+// 获取闸机分组列表
+export const getUfaceDevGroupListApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/ufaceDevGroup/list`, params, { headers: { noLoading: true } });
+};
+
+// 获取人员分布
+export const getPresentByRegionApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/workerAttendance/getPresentByRegion`, params, { headers: { noLoading: true } });
+};
diff --git a/src/assets/images/larborManagement/xd-bg.png b/src/assets/images/larborManagement/xd-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d935676fd55f613e1170171edaf2e9bfeb65cbfc
GIT binary patch
literal 1883
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
I$}d^*FWXd<6#xJL

literal 0
HcmV?d00001

diff --git a/src/assets/images/larborManagement/xd-ic.png b/src/assets/images/larborManagement/xd-ic.png
new file mode 100644
index 0000000000000000000000000000000000000000..88a61898e6e1f9499ac5f2fd03e89842888113da
GIT binary patch
literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3dpunnLn;{GOgH2^WWeM4c!db3
z*$fLN?d10dbQer_dL%N3vG2mv&b7u$oV<l>VW;Kp9G$pNMDthW$J>wmonJifC{H!*
zu9<)D<FbiQJ}p*=W%XYuyT1Lax3b)&AMB6atV@$}H9qn5h=n+<vg4nx!}+yJ$R}38
z)_lVinceBDZk}4g8mw!2{N2o~ZAO`mA+<O49fe*ws?6BsP?eXk(y}Z+?rOaFw!g;j
zO)i<O=6$tNnAsuxpRarG5(#UT|3K&e|8JEW=L}@9f&9VDu=~~KvURWSeFTayc)I$z
JtaD0e0syQJXE*==

literal 0
HcmV?d00001

diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index 0062f7c..e44ef92 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -85,14 +85,15 @@
 							:index="item.modulePath"
 							:class="{
 								subMenu: true,
-								active: activeTab === item.modulePath,
-								zsbf: COMPANY === 'zsbf'
+								active: activeTab === item.modulePath
 							}"
 						>
+						<!-- zsbf: COMPANY === 'zsbf' -->
 							<span @click="navigateTo(item, 1)">{{ item.moduleName }}</span>
 						</div>
 					</div>
-					<div :class="{ subMenuList: true, zsbf: COMPANY === 'zsbf' }" v-if="itemList != null && itemList.length >= 1">
+					<div :class="{ subMenuList: true }" v-if="itemList != null && itemList.length >= 1">
+						<!-- , zsbf: COMPANY === 'zsbf'  -->
 						<el-scrollbar class="scrollItem">
 							<div class="subMenuItem">
 								<div
diff --git a/src/views/sevenLargeScreen/laborManagement/data-dialog.vue b/src/views/sevenLargeScreen/laborManagement/data-dialog.vue
index 509e532..6fe9869 100644
--- a/src/views/sevenLargeScreen/laborManagement/data-dialog.vue
+++ b/src/views/sevenLargeScreen/laborManagement/data-dialog.vue
@@ -8,7 +8,7 @@
 				</div>
 			</div>
 			<div class="political-outlook" v-if="postData.type == 1">
-				<memberCountList ref="historyAlarmList" :tip="postData.tip"></memberCountList>
+				<memberCountList ref="historyAlarmList" :tip="postData.tip" :regionIdForUface="postData.regionIdForUface"></memberCountList>
 			</div>
 			<div class="political-outlook" v-if="postData.type == 2">
 				<MemberAllShow ref="memberAllShow" :tip="postData.tip"></MemberAllShow>
diff --git a/src/views/sevenLargeScreen/laborManagement/leftTop.vue b/src/views/sevenLargeScreen/laborManagement/leftTop.vue
index 1d8a00f..a70cb4f 100644
--- a/src/views/sevenLargeScreen/laborManagement/leftTop.vue
+++ b/src/views/sevenLargeScreen/laborManagement/leftTop.vue
@@ -1,26 +1,88 @@
 <template>
 	<div class="LeftTopBox">
 		<div class="leftData">
-			<div class="numberPeople" @click="openDialogData('实时')">
-				<div class="text">
-					<i>实时人数</i>
+			<template v-if="COMPANY !== 'zsbf'">
+				<div class="numberPeople" @click="openDialogData('实时')">
+					<div class="text">
+						<i>实时人数</i>
+					</div>
+					<div class="num">
+						<i>{{ presencePerson }}</i>
+					</div>
 				</div>
-				<div class="num">
-					<i>{{ presencePerson }}</i>
+				<div class="numberPeople" @click="openDialogData('日累积')">
+					<div class="text"><i>日累积人数</i></div>
+					<div class="num">
+						<i>{{ attendancePerson }}</i>
+					</div>
 				</div>
-			</div>
-			<div class="numberPeople" @click="openDialogData('日累积')">
-				<div class="text"><i>日累积人数</i></div>
-				<div class="num">
-					<i>{{ attendancePerson }}</i>
-				</div>
-			</div>
+			</template>
 			<div class="numberPeople" @click="openDialogData('总')">
 				<div class="text"><i>总人数</i></div>
 				<div class="num">
 					<i>{{ toaltPerson }}</i>
 				</div>
 			</div>
+			<template v-if="COMPANY === 'zsbf'">
+				<el-scrollbar style="height: 60%">
+					<div
+						class="sd-item"
+						:class="index == 0 ? 'mt' : ''"
+						@click="openDialogData('实时', item.id)"
+						v-for="(item, index) in regionList"
+						:key="item.id"
+					>
+						<div class="sd-item-top">
+							<img src="@/assets/images/larborManagement/xd-ic.png" alt="" />
+							<span>{{ item.regionName }}</span>
+						</div>
+						<div class="sd-item-bottom">
+							<span class="title">洞内实时人数:</span>
+							<span class="num">{{ item.present }}</span>
+						</div>
+					</div>
+					<!-- <div class="sd-item mt" @click="openDialogData('实时')">
+						<div class="sd-item-top">
+							<img src="@/assets/images/larborManagement/xd-ic.png" alt="" />
+							<span>拉林隧道进口</span>
+						</div>
+						<div class="sd-item-bottom">
+							<span class="title">洞内实时人数:</span>
+							<span class="num">100</span>
+						</div>
+					</div>
+					<div class="sd-item" @click="openDialogData('实时')">
+						<div class="sd-item-top">
+							<img src="@/assets/images/larborManagement/xd-ic.png" alt="" />
+							<span>拉林隧洞出口</span>
+						</div>
+						<div class="sd-item-bottom">
+							<span class="title">洞内实时人数:</span>
+							<span class="num">100</span>
+						</div>
+					</div>
+					<div class="sd-item" @click="openDialogData('实时')">
+						<div class="sd-item-top">
+							<img src="@/assets/images/larborManagement/xd-ic.png" alt="" />
+							<span>纳金隧洞进口</span>
+						</div>
+						<div class="sd-item-bottom">
+							<span class="title">洞内实时人数:</span>
+							<span class="num">100</span>
+						</div>
+					</div>
+					<div class="sd-item" @click="openDialogData('实时')">
+						<div class="sd-item-top">
+							<img src="@/assets/images/larborManagement/xd-ic.png" alt="" />
+							<span>纳金隧洞出口</span>
+						</div>
+						<div class="sd-item-bottom">
+							<span class="title">洞内实时人数:</span>
+							<span class="num">100</span>
+						</div>
+					</div> -->
+				</el-scrollbar>
+			</template>
 		</div>
 		<div class="rightEcharts">
 			<!-- 今日作业人员趋势 -->
@@ -75,6 +137,17 @@
 								></el-option>
 							</el-select>
 						</div>
+						<div class="search-item">
+							<el-select
+								v-model="searchForm.groupId"
+								placeholder="请选择闸机分组"
+								size="small"
+								clearable
+								@change="handleChangeUfaceDevGroup"
+							>
+								<el-option v-for="item in ufaceDevGroupList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+							</el-select>
+						</div>
 						<div class="search-item">
 							<el-select v-model="searchForm.devSn" placeholder="请选择闸机" size="small" clearable>
 								<el-option v-for="item in ufaceDevList" :key="item.devSn" :label="item.devName" :value="item.devSn"></el-option>
@@ -192,7 +265,7 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-
+import { COMPANY } from "@/config/config";
 import * as echarts from "echarts";
 import { onMounted, reactive, ref, nextTick } from "vue";
 import noDataImage from "@/assets/images/vehicleManagement/car.png";
@@ -203,7 +276,9 @@ import {
 	getDepartDataList,
 	getTeamDataList,
 	getCompanyDataList,
-	getUfaceDevListApi
+	getUfaceDevListApi,
+	getUfaceDevGroupListApi,
+	getPresentByRegionApi
 } from "@/api/modules/labor";
 import { GlobalStore } from "@/stores";
 const BASEURL = import.meta.env.VITE_API_URL;
@@ -229,6 +304,9 @@ const searchForm = reactive({
 });
 const rangeTime = ref([]);
 const ufaceDevList = ref([]);
+const allUfaceDevList = ref([]);
+const ufaceDevGroupList = ref([]);
+const regionList = ref([]);
 
 let xData = ref([]);
 let yData = ref([]);
@@ -412,17 +490,48 @@ const option = reactive({
 });
 
 // 打开弹窗
-const openDialogData = (tip: any) => {
-	emits("openDialog", { type: 1, tip });
+const openDialogData = (tip: any, regionIdForUface = "") => {
+	emits("openDialog", { type: 1, tip, regionIdForUface });
 };
 const openDialogHistoryData = (tip: any) => {
 	emits("openDialog", { type: 2, tip });
 };
 
+// 获取区域人员分布
+const getPresentByRegion = async () => {
+	const res = await getPresentByRegionApi({ projectSn: store.sn });
+	if (res.code == 200) {
+		regionList.value = res.result || [];
+	}
+	console.log("人员分布", res);
+};
+
+// 获取闸机分组列表
+const getUfaceDevGroupList = async () => {
+	const res = await getUfaceDevGroupListApi({ projectSn: store.sn });
+	if (res.code == 200) {
+		console.log("闸机分组列表", res);
+		ufaceDevGroupList.value = res.result;
+	}
+};
+
+// 获取闸机分组列表
+const handleChangeUfaceDevGroup = () => {
+	searchForm.devSn = "";
+	const list = ufaceDevGroupList.value.find(item => item.id == searchForm.groupId)?.ufaceDevList;
+	console.log("list", list);
+	ufaceDevList.value = list || [];
+	if (searchForm.groupId == "") {
+		ufaceDevList.value = allUfaceDevList.value;
+	}
+	// getUfaceDevList();
+};
+
 // 获取闸机列表
 const getUfaceDevList = async () => {
 	const res = await getUfaceDevListApi({ projectSn: store.sn });
 	if (res.code == 200) {
+		allUfaceDevList.value = res.result;
 		ufaceDevList.value = res.result;
 	}
 };
@@ -561,6 +670,7 @@ const reset = () => {
 	searchForm.startTime = null;
 	searchForm.endTime = null;
 	searchForm.devSn = "";
+	searchForm.groupId = "";
 	rangeTime.value = [];
 	getCrewRealTimeData();
 };
@@ -575,6 +685,8 @@ defineExpose({
 });
 onMounted(async () => {
 	getUfaceDevList();
+	getPresentByRegion();
+	getUfaceDevGroupList();
 	getPersonList();
 	getQueryTodayList();
 	getCrewRealTimeData();
@@ -590,6 +702,7 @@ onMounted(async () => {
 	.leftData {
 		float: left;
 		width: 15%;
+		height: 100%;
 		.numberPeople {
 			margin: auto;
 			width: 100%;
@@ -681,14 +794,14 @@ onMounted(async () => {
 }
 .selBox {
 	width: 100%;
-	height: 10%;
+	height: 13%;
 	display: flex;
 	flex-wrap: wrap;
 	padding: 0 24px;
 	gap: 4px;
 	.search-item {
 		@include flex;
-		max-width: 14%;
+		max-width: 20%;
 		// margin-right: 20px;
 		span {
 			color: white;
@@ -697,7 +810,7 @@ onMounted(async () => {
 	}
 }
 .listBox {
-	height: 78%;
+	height: 75%;
 	margin-bottom: 16px;
 	.listStyle {
 		display: flex;
@@ -874,4 +987,52 @@ onMounted(async () => {
 		}
 	}
 }
+.sd-item {
+	width: 210px;
+	height: 65px;
+	margin-bottom: 18px;
+	background: url("@/assets/images/larborManagement/xd-bg.png") no-repeat;
+	background-size: 100% 100%;
+	padding: 6px 18px;
+	box-sizing: border-box;
+	&.mt {
+		margin-top: 24px;
+	}
+	// background: rgba(39, 88, 192, 0.06);
+	.sd-item-top {
+		display: flex;
+		align-items: center;
+		img {
+			width: 16px;
+			height: 16px;
+			margin-right: 12px;
+		}
+		span {
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 400;
+			font-size: 14px;
+			color: #ffffff;
+			line-height: 20px;
+		}
+	}
+	.sd-item-bottom {
+		display: flex;
+		align-items: center;
+		margin-top: 8px;
+		margin-left: 28px;
+		.title {
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 400;
+			font-size: 12px;
+			color: #a8abb2;
+			margin-right: 30px;
+		}
+		.num {
+			font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+			font-weight: 400;
+			font-size: 20px;
+			color: #65d7f9;
+		}
+	}
+}
 </style>
diff --git a/src/views/sevenLargeScreen/laborManagement/member-count-list.vue b/src/views/sevenLargeScreen/laborManagement/member-count-list.vue
index cffefbb..d946f7e 100644
--- a/src/views/sevenLargeScreen/laborManagement/member-count-list.vue
+++ b/src/views/sevenLargeScreen/laborManagement/member-count-list.vue
@@ -100,7 +100,7 @@ import { ref, onMounted } from "vue";
 import { GlobalStore } from "@/stores";
 import { getCompanyDataList, getMemberInfoList } from "@/api/modules/labor";
 const store = GlobalStore();
-const props = defineProps(["tip"]);
+const props = defineProps(["tip", "regionIdForUface"]);
 const BASEURL = import.meta.env.VITE_API_URL;
 const onlineWorkList = ref([
 	{ name: "在职", value: 1 },
@@ -148,7 +148,8 @@ const getMemberCountList = async (tip:any) => {
         idCard: searchForm.value.idCard, //身份证号
         workerName: searchForm.value.name, //姓名
 		pageNo: tip == 'search'?1:pageNo.value,
-		pageSize: 100
+		pageSize: 100,
+		regionIdForUface: props.regionIdForUface
 	}
 	if(props.tip == '实时'){
 		requestData.presence = 1;