From 86a75980d105983e6bf745d263a87611102cb059 Mon Sep 17 00:00:00 2001
From: jiayu <zheng_jiayu1@163.com>
Date: Wed, 9 Oct 2024 14:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=20=E8=8E=B7=E5=8F=96=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=9C=80=E6=96=B0=E4=BD=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/smartSafeHat.ts               |  6 ++-
 .../smartSafeHat/index.vue                    | 41 ++++++++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/api/modules/smartSafeHat.ts b/src/api/modules/smartSafeHat.ts
index 26b439a..812e28d 100644
--- a/src/api/modules/smartSafeHat.ts
+++ b/src/api/modules/smartSafeHat.ts
@@ -75,6 +75,10 @@ export const getRealtimeDataApi = (params: {}) => {
 export const getSafeHatDayRecordApi = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/safetyHatData/list`, params);
 };
+// 获取每个设备最新一条实时数据信息
+export const getSafetyHatNewestApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatData/getNewestList`, params);
+};
 // 智能安全帽--删除围栏
 export const deleteSafehatFence = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/safetyHatFence/deleteBatch`, params);
@@ -82,4 +86,4 @@ export const deleteSafehatFence = (params: {}) => {
 // 智能安全帽--添加围栏
 export const addSafeHatPositionFence = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/safetyHatFence/add`, params);
-};
\ No newline at end of file
+};
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index c181ae7..dbe906d 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -399,6 +399,7 @@ import {
 	getVehiclePositionDayRecord,
 	getWeekAlarmDataApi,
 	getRealtimeDataApi,
+	getSafetyHatNewestApi,
 	getSafeHatDayRecordApi,
 	deleteSafehatFence,
 	addSafeHatPositionFence
@@ -1074,27 +1075,39 @@ function devChange(e) {
 // 获取车辆实时数据
 // 智能安全帽--获取实时数据
 function getRealTimeData(e) {
-	let name = "";
-	let data = {
-		devSn: e.devSn,
-		// devSn: "866652021371993",
-		projectSn: store.sn
-	};
-	getRealtimeDataApi(data).then(res => {
+	// 代码优化，查询最新位置，旧逻辑使用的list，会返回几千个点位数据，响应慢
+	getSafetyHatNewestApi({
+		projectSn: store.sn,
+		devSns: [e.devSn]
+	}).then(res => {
 		if (res.result.length > 0) {
-			// if (res.result.records[0].type === 1) {
-			// 	echoCarMarker(res.result.records[0]);
-			// }
-			// if (res.result.records[0].type === 2) {
-			// 	echoPersonMarker(res.result.records[0]);
-			// }
-			// echoCarMarker(res.result[0]);
 			echoPersonMarker(res.result[0]);
 		} else {
 			console.log("设备暂无数据", res);
 		}
 		console.log("实时数据", res);
 	});
+	// let name = "";
+	// let data = {
+	// 	devSn: e.devSn,
+	// 	// devSn: "866652021371993",
+	// 	projectSn: store.sn
+	// };
+	// getRealtimeDataApi(data).then(res => {
+	// 	if (res.result.length > 0) {
+	// 		// if (res.result.records[0].type === 1) {
+	// 		// 	echoCarMarker(res.result.records[0]);
+	// 		// }
+	// 		// if (res.result.records[0].type === 2) {
+	// 		// 	echoPersonMarker(res.result.records[0]);
+	// 		// }
+	// 		// echoCarMarker(res.result[0]);
+	// 		echoPersonMarker(res.result[0]);
+	// 	} else {
+	// 		console.log("设备暂无数据", res);
+	// 	}
+	// 	console.log("实时数据", res);
+	// });
 }
 
 // 智能安全帽--获取围栏列表数据