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 | 112 ++++++++++++++++++++++++-------------------------------
1 files changed, 49 insertions(+), 63 deletions(-)
diff --git a/src/views/dataCenter/components/dataCenterMap.vue b/src/views/dataCenter/components/dataCenterMap.vue
index 0d80134..39930fd 100644
--- a/src/views/dataCenter/components/dataCenterMap.vue
+++ b/src/views/dataCenter/components/dataCenterMap.vue
@@ -7,6 +7,8 @@
</template>
<script setup>
+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';
@@ -14,13 +16,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 defaultIcon from '@/assets/images/dataCenter/datamap/eventCompleted.png'; //默认图标
import activeIcon from '@/assets/images/dataCenter/datamap/activeevent.png'; // 激活图标
+import { getEventActiveImage, getEventImage } from '@/utils/stateToImageMap/event'; //点
const emit = defineEmits(['lookDetail']);
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;
@@ -31,20 +34,6 @@
const isMapInitialized = ref(false); //地图加载
const dataPointList = ref([]);
const activeEntity = ref(null); // 当前激活的点
-watch(
- () => props.dotData,
- newVal => {
- if (newVal) {
- // console.log(newVal, 999);
- // currentClickEntity = newVal;
- // activeEntity.value = newVal;
- // singleMachineEvent(newVal);
- // // createLabelDom(newVal);
- // console.log('cccc', activeEntity.value);
- }
- },
- { immediate: true }
-);
// 获取弹框box
const detailId = ref('');
const createLabelDom = data => {
@@ -55,11 +44,10 @@
tooltipContainer.style.position = 'absolute';
tooltipContainer.style.transform = 'translate(-50%,-125%)';
tooltipContainer.style.pointerEvents = 'none';
- document.querySelector('#dataCenterMap').append(tooltipContainer);
+ document.querySelector('#dataCenterMap')?.append(tooltipContainer);
render(vNode, tooltipContainer);
return tooltipContainer;
};
-
// 弹框位置刷新
const labelBoxUpdate = () => {
if (!currentClickEntity) return;
@@ -92,7 +80,7 @@
const detailClick = () => {
removeLabel();
// 给父组件传值
- emit('update:show', false);
+ // emit('update:show', false); //关闭地图弹框
emit('lookDetail', detailId.value);
};
@@ -100,7 +88,9 @@
const restoreAllIcons = () => {
dataPointEntities.value.forEach(entity => {
if (entity.billboard) {
- entity.billboard.image = defaultIcon;
+ const status = entity?.properties?._customData?._value?.data.status;
+ entity.billboard.image =
+ status === 1 || status === null ? defaultIcon : getEventImage(status);
}
});
activeEntity.value = null;
@@ -116,16 +106,15 @@
removeLabel();
return;
}
-
currentClickEntity = clickedEntities[0];
- console.log(currentClickEntity);
-
// 恢复所有点的默认图标
restoreAllIcons();
-
- // 设置当前点击点为激活状态
if (currentClickEntity.billboard) {
- currentClickEntity.billboard.image = activeIcon;
+ const status = currentClickEntity?.properties?._customData?._value?.data.status;
+ console.log('stayus', currentClickEntity?.properties?._customData?._value?.data);
+ currentClickEntity.billboard.image =
+ status === 1 || status === null ? activeIcon : getEventActiveImage(status);
+ currentClickEntity.billboard.scale = 1; // 可选缩放效果
activeEntity.value = currentClickEntity;
}
@@ -164,7 +153,7 @@
// 添加新实体
mapList.forEach((item, index) => {
- const entity = viewer.entities.add({
+ const entity = viewer?.entities.add({
id: `dataCenter-point-${index}-${Date.now()}`,
position: Cesium.Cartesian3.fromDegrees(
Number(item.metadata.shootPosition.lng),
@@ -181,7 +170,7 @@
pixelOffset: new Cesium.Cartesian2(0, 55),
},
billboard: {
- image: defaultIcon, // 初始为默认图标
+ image: item.status == null || item.status === 1 ? defaultIcon : getEventImage(item.status), // 初始为默认图标
width: 40,
height: 40,
pixelOffset: new Cesium.Cartesian2(0, -15),
@@ -202,42 +191,6 @@
dataPointEntities.value.push(entity);
});
};
-
-const flyToEntity = position => {
- const longitude = Number(position.lng);
- const latitude = Number(position.lat);
-
- console.log(longitude, viewer, 1);
- viewer?.camera.flyTo({
- destination: Cesium.Cartesian3.fromDegrees(longitude, latitude, 1000),
- duration: 1,
- orientation: {
- heading: Cesium.Math.toRadians(0.0),
- pitch: Cesium.Math.toRadians(-90.0),
- roll: 0.0,
- },
- });
-};
-
-const isViewerReady = ref(false);
-
-/**
- * 初始化标注添加
- * @param data 数据
- */
-const initEntityOrPopup = data => { //地图点在范围内
- watch(
- () => isViewerReady.value,
- ready => {
- if (ready) {
- flyToEntity(data.metadata.shootPosition);
- labelBoxUpdate();
- }
- },
- { deep: true, immediate: true } // 初始化时立即执行
- );
-};
-
const initMap = () => {
if (viewer || isMapInitialized.value) return;
@@ -270,6 +223,19 @@
console.error('地图初始化失败:', error);
}
};
+const flyToEntity = position => {
+ const longitude = Number(position.lng);
+ const latitude = Number(position.lat);
+ viewer?.camera.flyTo({
+ destination: Cesium.Cartesian3.fromDegrees(longitude, latitude, 1000),
+ duration: 1,
+ orientation: {
+ heading: Cesium.Math.toRadians(0.0),
+ pitch: Cesium.Math.toRadians(-90.0),
+ roll: 0.0,
+ },
+ });
+};
// 地图接口
const loading = ref(false);
@@ -287,7 +253,27 @@
console.error('获取地图数据失败:', error);
}
};
+const isViewerReady = ref(false);
+/**
+ * 初始化标注添加
+ * @param data 数据
+ */
+const initEntityOrPopup = data => {
+ console.log('data', data);
+
+ //地图点在范围内
+ watch(
+ () => isMapInitialized.value,
+ ready => {
+ if (ready) {
+ flyToEntity(data.metadata.shootPosition);
+ labelBoxUpdate();
+ }
+ },
+ { deep: true, immediate: true } // 初始化时立即执行
+ );
+};
watch(
() => props.jobId,
newVal => {
--
Gitblit v1.9.3