From ba2f8eae0dfd804ca422915981874c0d91965b42 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 14 Apr 2025 19:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/hooks/useMapAggregation/useMapAggregation.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/hooks/useMapAggregation/useMapAggregation.js b/src/hooks/useMapAggregation/useMapAggregation.js
index be08c5d..246ef47 100644
--- a/src/hooks/useMapAggregation/useMapAggregation.js
+++ b/src/hooks/useMapAggregation/useMapAggregation.js
@@ -123,8 +123,8 @@
}
// 获取事件聚合
- function getMapEventCount (areaCode) {
- return getMapEvents({ areaCode }).then(res => {
+ function getMapEventCount (area_code) {
+ return getMapEvents({ area_code,date_enum:'CURRENT_WEEK' }).then(res => {
const resData = res?.data?.data
if (resData?.data) {
eventList = resData?.data
@@ -449,7 +449,8 @@
viewer.scene.postRender.addEventListener(labelBoxRender)
}
if (deviceFind) {
- store.commit('setSingleUavHome', { id: '123' })
+ const device = deviceFind.properties.customData._value.data
+ store.commit('setSingleUavHome', device)
}
}
--
Gitblit v1.9.3