From 74f3a7dcedba7e9aeac99287c3daf666a726d1d6 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 14 Jun 2025 13:53:29 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v2.0.0/后台管理数据中心'
---
src/views/dataCenter/components/dataCenterMap.vue | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/src/views/dataCenter/components/dataCenterMap.vue b/src/views/dataCenter/components/dataCenterMap.vue
index 7a089c7..80203e1 100644
--- a/src/views/dataCenter/components/dataCenterMap.vue
+++ b/src/views/dataCenter/components/dataCenterMap.vue
@@ -3,17 +3,13 @@
<div class="mapBox">
<div v-if="isShow" id="dataCenterMap" class="ztzf-cesium"></div>
</div>
- <!-- 全景360 -->
- <PanoramaPopup
- v-if="props.dotData.resultType === 5"
- v-model:panoramaParamsShow="panoramaParamsShow"
- v-model:panoramaParamsUrl="panoramaParamsUrl"
- />
+
</el-dialog>
</template>
<script setup>
-import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue'
+import EventBus from '@/utils/eventBus';
+import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue';
import { getMapInfoAPI } from '@/api/dataCenter/dataCenter';
import { useStore } from 'vuex';
import { PublicCesium } from '@/utils/cesium/publicCesium';
@@ -21,17 +17,14 @@
import * as Cesium from 'cesium';
import EventPopUpBox from '@/hooks/components/EventPopUpBox.vue';
import { render, nextTick, watch, onMounted, onBeforeUnmount, shallowRef, ref, h } from 'vue';
-import panoramaPoint from '@/assets/images/panorama/panorama-point.png' //全景图标
+import panoramaPoint from '@/assets/images/panorama/panorama-point.png'; //全景图标
import defaultIcon from '@/assets/images/dataCenter/datamap/eventCompleted.png'; //默认图标
import activeIcon from '@/assets/images/dataCenter/datamap/activeevent.png'; // 激活图标
-import { getEventActiveImage, getEventImage } from '@/utils/stateToImageMap/event' //点
+import { getEventActiveImage, getEventImage } from '@/utils/stateToImageMap/event'; //点
const emit = defineEmits(['lookDetail']);
const isShow = defineModel('show');
const viewerRef = shallowRef(null);
let viewer = null;
-// 全景
-const panoramaParamsShow = ref(false)
-const panoramaParamsUrl = ref(null)
const store = useStore();
const currentAreaPosition = ref({ height: 1987280, latitude: 27.636112, longitude: 115.732975 });
let handler = null;
@@ -42,7 +35,6 @@
const isMapInitialized = ref(false); //地图加载
const dataPointList = ref([]);
const activeEntity = ref(null); // 当前激活的点
-
// 获取弹框box
const detailId = ref('');
const createLabelDom = data => {
@@ -57,7 +49,6 @@
render(vNode, tooltipContainer);
return tooltipContainer;
};
-
// 弹框位置刷新
const labelBoxUpdate = () => {
if (!currentClickEntity) return;
@@ -90,19 +81,16 @@
const detailClick = () => {
removeLabel();
// 给父组件传值
- emit('update:show', false);
+ // emit('update:show', false); //关闭地图弹框
emit('lookDetail', detailId.value);
};
// 恢复所有点的默认图标
const restoreAllIcons = () => {
dataPointEntities.value.forEach(entity => {
- console.log('entity',entity);
-
if (entity.billboard) {
- entity.billboard.image = props.dotData.resultType === 2
- ? getEventImage(entity.status)
- : defaultIcon;
+ entity.billboard.image =
+ props.dotData.resultType === 2 ? getEventImage(entity.status) : defaultIcon;
}
});
activeEntity.value = null;
@@ -118,18 +106,13 @@
removeLabel();
return;
}
-
currentClickEntity = clickedEntities[0];
-
// 恢复所有点的默认图标
restoreAllIcons();
-
- // 设置当前点击点为激活状态
if (currentClickEntity.billboard) {
- currentClickEntity.billboard.image = props.dotData.resultType === 2
- ? getEventImage(currentClickEntity.status)
- : activeIcon;
- currentClickEntity.billboard.scale = 1 // 可选缩放效果
+ currentClickEntity.billboard.image =
+ props.dotData.resultType === 2 ? getEventImage(currentClickEntity.status) : activeIcon;
+ currentClickEntity.billboard.scale = 1; // 可选缩放效果
activeEntity.value = currentClickEntity;
}
@@ -185,9 +168,7 @@
pixelOffset: new Cesium.Cartesian2(0, 55),
},
billboard: {
- image: props.dotData.resultType === 2
- ? getEventImage(item.status)
- : defaultIcon, // 初始为默认图标
+ image: props.dotData.resultType === 2 ? getEventImage(item.status) : defaultIcon, // 初始为默认图标
width: 40,
height: 40,
pixelOffset: new Cesium.Cartesian2(0, -15),
@@ -260,6 +241,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);
@@ -279,7 +262,6 @@
watch(
() => isMapInitialized.value,
ready => {
-
if (ready) {
flyToEntity(data.metadata.shootPosition);
labelBoxUpdate();
@@ -316,13 +298,16 @@
}
});
-onMounted(() => {});
+onMounted(() => {
+
+});
onBeforeUnmount(() => {
if (viewer) {
viewer.destroy();
}
removeHandler();
clearDataPoints();
+
});
// 暴露方法给父组件
--
Gitblit v1.9.3