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 | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/views/dataCenter/components/dataCenterMap.vue b/src/views/dataCenter/components/dataCenterMap.vue
index 0b470f1..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>
@@ -25,7 +24,6 @@
const isShow = defineModel('show');
const viewerRef = shallowRef(null);
let viewer = null;
-
const store = useStore();
const currentAreaPosition = ref({ height: 1987280, latitude: 27.636112, longitude: 115.732975 });
let handler = null;
@@ -36,7 +34,6 @@
const isMapInitialized = ref(false); //地图加载
const dataPointList = ref([]);
const activeEntity = ref(null); // 当前激活的点
-
// 获取弹框box
const detailId = ref('');
const createLabelDom = data => {
@@ -51,7 +48,6 @@
render(vNode, tooltipContainer);
return tooltipContainer;
};
-
// 弹框位置刷新
const labelBoxUpdate = () => {
if (!currentClickEntity) return;
@@ -84,18 +80,17 @@
const detailClick = () => {
removeLabel();
// 给父组件传值
- emit('update:show', false);
+ // emit('update:show', false); //关闭地图弹框
emit('lookDetail', detailId.value);
};
// 恢复所有点的默认图标
const restoreAllIcons = () => {
dataPointEntities.value.forEach(entity => {
- // console.log('entity.billboard.image', entity.billboard.image);
-
if (entity.billboard) {
+ const status = entity?.properties?._customData?._value?.data.status;
entity.billboard.image =
- props.dotData.resultType === 2 ? getEventImage(entity.status) : defaultIcon;
+ status === 1 || status === null ? defaultIcon : getEventImage(status);
}
});
activeEntity.value = null;
@@ -115,8 +110,10 @@
// 恢复所有点的默认图标
restoreAllIcons();
if (currentClickEntity.billboard) {
+ const status = currentClickEntity?.properties?._customData?._value?.data.status;
+ console.log('stayus', currentClickEntity?.properties?._customData?._value?.data);
currentClickEntity.billboard.image =
- props.dotData.resultType === 2 ? getEventImage(currentClickEntity.status) : activeIcon;
+ status === 1 || status === null ? activeIcon : getEventActiveImage(status);
currentClickEntity.billboard.scale = 1; // 可选缩放效果
activeEntity.value = currentClickEntity;
}
@@ -173,7 +170,7 @@
pixelOffset: new Cesium.Cartesian2(0, 55),
},
billboard: {
- image: props.dotData.resultType === 2 ? getEventImage(item.status) : defaultIcon, // 初始为默认图标
+ image: item.status == null || item.status === 1 ? defaultIcon : getEventImage(item.status), // 初始为默认图标
width: 40,
height: 40,
pixelOffset: new Cesium.Cartesian2(0, -15),
@@ -246,6 +243,8 @@
try {
const res = await getMapInfoAPI(ids);
dataPointList.value = res.data.data || [];
+ console.log('dataPointList.value', dataPointList.value);
+
// 确保地图已初始化后再渲染
if (isMapInitialized.value && viewer) {
renderDataPoint(dataPointList.value);
@@ -261,6 +260,8 @@
* @param data 数据
*/
const initEntityOrPopup = data => {
+ console.log('data', data);
+
//地图点在范围内
watch(
() => isMapInitialized.value,
@@ -301,16 +302,13 @@
}
});
-onMounted(() => {
-
-});
+onMounted(() => {});
onBeforeUnmount(() => {
if (viewer) {
viewer.destroy();
}
removeHandler();
clearDataPoints();
-
});
// 暴露方法给父组件
--
Gitblit v1.9.3