From 974394f7a0496fa8e37dd326b6f9313e14caa708 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 26 Jun 2025 17:35:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/all_setting_styles' into all_setting_styles
---
src/views/dataCenter/components/dataCenterMap.vue | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/views/dataCenter/components/dataCenterMap.vue b/src/views/dataCenter/components/dataCenterMap.vue
index 5bb09ed..39930fd 100644
--- a/src/views/dataCenter/components/dataCenterMap.vue
+++ b/src/views/dataCenter/components/dataCenterMap.vue
@@ -3,7 +3,6 @@
<div class="mapBox">
<div v-if="isShow" id="dataCenterMap" class="ztzf-cesium"></div>
</div>
-
</el-dialog>
</template>
@@ -89,9 +88,9 @@
const restoreAllIcons = () => {
dataPointEntities.value.forEach(entity => {
if (entity.billboard) {
- const status = entity?.properties?._customData?._value?.data.status
+ const status = entity?.properties?._customData?._value?.data.status;
entity.billboard.image =
- status === 1 ? defaultIcon : getEventImage(item.status);
+ status === 1 || status === null ? defaultIcon : getEventImage(status);
}
});
activeEntity.value = null;
@@ -111,10 +110,10 @@
// 恢复所有点的默认图标
restoreAllIcons();
if (currentClickEntity.billboard) {
- const status = currentClickEntity?.properties?._customData?._value?.data.status
- console.log('stayus',status);
+ const status = currentClickEntity?.properties?._customData?._value?.data.status;
+ console.log('stayus', currentClickEntity?.properties?._customData?._value?.data);
currentClickEntity.billboard.image =
- status === 1 ?activeIcon : getEventActiveImage(status);
+ status === 1 || status === null ? activeIcon : getEventActiveImage(status);
currentClickEntity.billboard.scale = 1; // 可选缩放效果
activeEntity.value = currentClickEntity;
}
@@ -171,7 +170,7 @@
pixelOffset: new Cesium.Cartesian2(0, 55),
},
billboard: {
- image: item.status === 1 ?defaultIcon : getEventImage(item.status), // 初始为默认图标
+ image: item.status == null || item.status === 1 ? defaultIcon : getEventImage(item.status), // 初始为默认图标
width: 40,
height: 40,
pixelOffset: new Cesium.Cartesian2(0, -15),
@@ -244,8 +243,8 @@
try {
const res = await getMapInfoAPI(ids);
dataPointList.value = res.data.data || [];
- console.log('dataPointList.value',dataPointList.value);
-
+ console.log('dataPointList.value', dataPointList.value);
+
// 确保地图已初始化后再渲染
if (isMapInitialized.value && viewer) {
renderDataPoint(dataPointList.value);
@@ -261,7 +260,7 @@
* @param data 数据
*/
const initEntityOrPopup = data => {
-console.log('data',data);
+ console.log('data', data);
//地图点在范围内
watch(
@@ -303,16 +302,13 @@
}
});
-onMounted(() => {
-
-});
+onMounted(() => {});
onBeforeUnmount(() => {
if (viewer) {
viewer.destroy();
}
removeHandler();
clearDataPoints();
-
});
// 暴露方法给父组件
--
Gitblit v1.9.3