From e06e7cbc4a44fcab46561cda11caa4e98921bc99 Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Sat, 29 Jul 2023 18:49:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elevatorMonitoring/leftCenter.vue         | 19 +++++++++++--
 .../elevatorMonitoring/right.vue              | 28 +++++++++----------
 .../towerCraneMonitoring/right.vue            | 27 ++++++++++--------
 3 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue b/src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue
index cd91dfc..2b70b29 100644
--- a/src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue
+++ b/src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue
@@ -33,20 +33,22 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import Card from "@/components/card.vue";
 import { getAlarmTypeApi } from "@/api/modules/elevator";
 import { GlobalStore } from "@/stores";
-
+import mitts from "@/utils/bus"; //兄弟组件传值
 const store = GlobalStore();
 let rangeTime = ref([new Date(new Date().getFullYear(), new Date().getMonth(), 1), new Date()] as any);
 let listData = ref([] as any);
 let alarmTotal = ref("" as any);
 // let startTime = ref("" as any);
 // let endTime = ref("" as any);
+let devId = ref("" as any);
 //获取报警分析数据
 const getAlarmTypeList = async () => {
 	const res = await getAlarmTypeApi({
+		// devSn: devId.value,
 		projectSn: store.sn,
 		queryStartTime: rangeTime.value[0],
 		queryEndTime: rangeTime.value[1]
@@ -69,6 +71,19 @@ function timeChange(e: any) {
 }
 onMounted(() => {
 	getAlarmTypeList();
+	// mitts.on("elevaTorSelectId", e => {
+	// 	devId.value = e;
+	// 	console.log("收到设备ID", e);
+	// 	getAlarmTypeList();
+	// 	// gerUserVideo();
+	// 	// setTimeout(() => {
+	// 	// 	gerUserVideo();
+	// 	// }, 500);
+	// });
+});
+
+onBeforeUnmount(async () => {
+	// mitts.off("elevaTorSelectId");
 });
 </script>
 
diff --git a/src/views/sevenLargeScreen/elevatorMonitoring/right.vue b/src/views/sevenLargeScreen/elevatorMonitoring/right.vue
index dff5f04..610adc9 100644
--- a/src/views/sevenLargeScreen/elevatorMonitoring/right.vue
+++ b/src/views/sevenLargeScreen/elevatorMonitoring/right.vue
@@ -54,7 +54,7 @@
 									<div><span class="textColor"> 今日违章次数：</span>{{ lifeList.violationNum || 0 }}次</div>
 								</div>
 							</div>
-							<div class="rightInfo" v-for="(item, index) in driverInfo" :key="index">
+							<div class="rightInfo">
 								<div class="titleStatus">
 									司机信息
 									<span
@@ -64,33 +64,33 @@
 								</div>
 								<div class="infoBox">
 									<!-- <div><span class="textColor">认证状态：</span>-</div> -->
-									<div><span class="textColor"> 姓名：</span>{{ item.workerName || "未知" }}</div>
-									<div><span class="textColor"> 性别：</span>{{ item.sex == 1 ? "男" : item.sex == 2 ? "女" : "未知" }}</div>
-									<div><span class="textColor"> 年龄：</span>{{ item.age || "未知" }}</div>
-									<div><span class="textColor"> 本次连续工作时长：</span>{{ item.continuousWorkingTime || "未知" }}</div>
+									<div><span class="textColor"> 姓名：</span>{{ driverInfo.workerName || "未知" }}</div>
+									<div><span class="textColor"> 性别：</span>{{ driverInfo.sex == 1 ? "男" : driverInfo.sex == 2 ? "女" : "未知" }}</div>
+									<div><span class="textColor"> 年龄：</span>{{ driverInfo.age || "未知" }}</div>
+									<div><span class="textColor"> 本次连续工作时长：</span>{{ driverInfo.continuousWorkingTime || "未知" }}</div>
 									<div>
 										<span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
 											身份证号:</span
-										>{{ item.idCard || "未知" }}
+										>{{ driverInfo.idCard || "未知" }}
 									</div>
 									<div>
 										<span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
 											特种资格证书编号:</span
-										>{{ item.specialCertificateNumber || "未知" }}
+										>{{ driverInfo.specialCertificateNumber || "未知" }}
 									</div>
 									<div>
 										<span class="textColor"> 资格证书：</span> <a style="color: #64d6f8; cursor: pointer;" @click="driverDetail">{{ "查看详情" }}</a>
 									</div>
 								</div>
-								<div class="driverPhoto"><img :src="item.imageUrl" alt="" /></div>
+								<div class="driverPhoto"><img :src="driverInfo.imageUrl" alt="" /></div>
 							</div>
 						</div>
 					</div>
 				</div>
 				<div class="bottom">
 					<div class="bottomList">
-						<p>上限位</p>
-						<p class="number">正常</p>
+						<p>防冲顶</p>
+						<p class="number">{{ elevatorList.topAlarm == 1 ? "报警" : "正常" }}</p>
 						<div class="bg"></div>
 					</div>
 					<div class="bottomList">
@@ -120,12 +120,12 @@
 					</div>
 					<div class="bottomList">
 						<p>前门锁</p>
-						<p class="number">正常</p>
+						<p class="number">{{ elevatorList.frontDoorState == 1 ? "关" : "开" }}</p>
 						<div class="bg"></div>
 					</div>
 					<div class="bottomList">
 						<p>后门锁</p>
-						<p class="number">正常</p>
+						<p class="number">{{ elevatorList.backDoorState == 1 ? "关" : "开" }}</p>
 						<div class="bg"></div>
 					</div>
 				</div>
@@ -192,7 +192,7 @@ let lifeList = ref({} as any);
 const getSelectTower = async () => {
 	const res = await getQueryTodayOperatingApi({
 		projectSn: store.sn,
-		devSn: lifeValue.value
+		devSn: lifterDevSn.value
 	});
 	if (res.result) {
 		console.log("获取运行状态", res);
@@ -207,7 +207,7 @@ const getDriverInfoList = async () => {
 		devSn: lifterDevSn.value
 	});
 	if (res.result) {
-		driverInfo.value = res.result.devWorker.workerList;
+		driverInfo.value = res.result.devWorker.currentWorker;
 		console.log("获取司机信息", res);
 		// 全部数据获取完后异步发放设备ID给摄像头，实现进入页面播放摄像头
 		setTimeout(() => {
diff --git a/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue b/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue
index e77b42b..333a762 100644
--- a/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue
+++ b/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue
@@ -88,7 +88,7 @@
 									<div><span class="textColor"> 今日报警：</span>{{ item.alarmNum || 0 }}次</div>
 								</div>
 							</div>
-							<div class="rightInfo" v-for="(item, index) in driverInfo" :key="index">
+							<div class="rightInfo">
 								<div class="titleStatus">
 									司机信息
 									<span
@@ -98,25 +98,28 @@
 								</div>
 
 								<div class="infoBox">
-									<div><span class="textColor"> 姓名：</span>{{ item.workerName || "未知" }}</div>
-									<div><span class="textColor"> 性别：</span>{{ item.sex == 1 ? "男" : item.sex == 2 ? "女" : "未知" }}</div>
-									<div><span class="textColor"> 年龄：</span>{{ item.age || "未知" }}</div>
-									<div><span class="textColor"> 本次连续工作时长：</span>{{ item.continuousWorkingTime || "未知" }}</div>
+									<div><span class="textColor"> 姓名：</span>{{ driverInfo.workerName || "未知" }}</div>
+									<div>
+										<span class="textColor"> 性别：</span>{{ driverInfo.sex == 1 ? "男" : driverInfo.sex == 2 ? "女" : "未知" }}
+									</div>
+									<div><span class="textColor"> 年龄：</span>{{ driverInfo.age || "未知" }}</div>
+									<div><span class="textColor"> 本次连续工作时长：</span>{{ driverInfo.continuousWorkingTime || "未知" }}</div>
 									<div>
 										<span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
 											身份证号:</span
-										>{{ item.idCard || "未知" }}
+										>{{ driverInfo.idCard || "未知" }}
 									</div>
 									<div>
 										<span class="textColor" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
 											特种资格证书编号:</span
-										>{{ item.specialCertificateNumber || "未知" }}
+										>{{ driverInfo.specialCertificateNumber || "未知" }}
 									</div>
 									<div>
-										<span class="textColor"> 资格证书：</span> <a style="color: #64d6f8; cursor: pointer;" @click="driverDetail">{{ "查看详情" }}</a>
+										<span class="textColor"> 资格证书：</span>
+										<a style="color: #64d6f8; cursor: pointer" @click="driverDetail">{{ "查看详情" }}</a>
 									</div>
 								</div>
-								<div class="driverPhoto"><img :src="item.imageUrl" alt="" /></div>
+								<div class="driverPhoto"><img :src="driverInfo.imageUrl" alt="" /></div>
 							</div>
 						</div>
 					</div>
@@ -294,12 +297,12 @@ const getTowerNumAndAlarmList = async () => {
 //获取运行状态
 let towerList = ref([] as any);
 const getSelectTower = async () => {
-	towerList.value.length = 0
+	towerList.value.length = 0;
 	const res = await getTowerCurrentCountApi({
 		projectSn: store.sn
 	});
 	if (res.result) {
-		console.log("运行状态",res.result);
+		console.log("运行状态", res.result);
 		res.result.forEach((item: any) => {
 			if (item.devSn == towerDevSn.value) {
 				towerList.value.push(item);
@@ -315,7 +318,7 @@ const getDriverInfoList = async () => {
 		devSn: towerDevSn.value
 	});
 	if (res.result) {
-		driverInfo.value = res.result.devWorker.workerList.slice(0,1);
+		driverInfo.value = res.result.devWorker.currentWorker;
 	}
 };