From c2e29fdee2d0e664961a84e95adf3882efbaf67a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 06 Sep 2025 14:23:52 +0800
Subject: [PATCH] Merge branch 'prod' into feature/v5.0/5.0.5
---
src/components/map-container/mapContainer.vue | 192 ++++++++++++++++++++++++-----------------------
1 files changed, 99 insertions(+), 93 deletions(-)
diff --git a/src/components/map-container/mapContainer.vue b/src/components/map-container/mapContainer.vue
index 297350b..c88c75e 100644
--- a/src/components/map-container/mapContainer.vue
+++ b/src/components/map-container/mapContainer.vue
@@ -9,61 +9,64 @@
* Copyright (c) 2024 by shuishen, All Rights Reserved.
-->
<template>
- <div class="map-container">
- <div class="viewer-container ztzf-cesium" id="viewer-container">
- <div class="content">
- <slot name="content"></slot>
- </div>
+ <div class="map-container">
+ <div class="viewer-container ztzf-cesium" id="viewer-container">
+ <div class="content">
+ <slot name="content"></slot>
+ </div>
- <PlanarRouteLineList :curRouteLineData="curRouteLineData" @routeLineListClick="routeLineListClick" />
- </div>
+ <PlanarRouteLineList
+ :curRouteLineData="curRouteLineData"
+ @routeLineListClick="routeLineListClick"
+ />
</div>
+ </div>
</template>
<script setup>
-import PlanarRouteLineList from '@/components/PlanarRouteLineList/PlanarRouteLineList.vue'
+import PlanarRouteLineList from '@/components/PlanarRouteLineList/PlanarRouteLineList.vue';
-import * as Cesium from 'cesium'
-import { Cartesian3, Terrain, Viewer } from 'cesium'
-import { PublicCesium } from '@/utils/cesium/publicCesium'
-import ImageTrailMaterial from '@/utils/cesium/ImageTrailMaterial'
-import { flyVisual } from '@/utils/cesium/mapUtil'
-import * as turf from '@turf/turf'
+import * as Cesium from 'cesium';
+import { Cartesian3, Terrain, Viewer } from 'cesium';
+import { PublicCesium } from '@/utils/cesium/publicCesium';
+import ImageTrailMaterial from '@/utils/cesium/ImageTrailMaterial';
+import { flyVisual } from '@/utils/cesium/mapUtil';
+import * as turf from '@turf/turf';
-import { nextTick, onBeforeUnmount, onMounted, onUnmounted } from 'vue'
-import { read } from 'xlsx'
+import { nextTick, onBeforeUnmount, onMounted, onUnmounted } from 'vue';
+import { read } from 'xlsx';
-import startPng from '@/assets/map_images/Startingpointicon.png'
-import endPng from '@/assets/map_images/EndPointicon.png'
-import rwqfdImg from '@/assets/images/task/arrow-right-blue.png'
-import newNumPoint from '@/assets/images/task/custom-point.png'
+import startPng from '@/assets/map_images/Startingpointicon.png';
+import endPng from '@/assets/map_images/EndPointicon.png';
+import rwqfdImg from '@/assets/images/task/arrow-right-blue.png';
+import newNumPoint from '@/assets/images/task/custom-point.png';
-import { useRouteLine } from '@/hooks/useRouteLine/useRouteLine.js'
-
+import { useRouteLine } from '@/hooks/useRouteLine/useRouteLine.js';
+const viewInstance = shallowRef(null);
// 加载航线hook
-const { curRouteLineData, routeLineListClick, initViewer, renderPreviewLine } = useRouteLine()
+const { curRouteLineData, routeLineListClick, initViewer, renderPreviewLine } = useRouteLine();
-let publicCesiumInstance = null
-let viewer = null
+let publicCesiumInstance = null;
+let viewer = null;
-const { VITE_APP_BASE } = import.meta.env
+const { VITE_APP_BASE } = import.meta.env;
// import * as Cesium from 'cesium'
// import 'cesium/Build/Cesium/Widgets/widgets.css'
-const isViewerReady = ref(false)
+const isViewerReady = ref(false);
const { rowDetails } = defineProps({
- rowDetails: {
- type: Object,
- default: () => ({}),
- }
-})
+ rowDetails: {
+ type: Object,
+ default: () => ({}),
+ },
+});
-async function initMap () {
- if (viewer) return
- publicCesiumInstance = new PublicCesium({ dom: 'viewer-container',layerMode: 4 })
- viewer = publicCesiumInstance.getViewer()
-
- initViewer(viewer)
- isViewerReady.value = true
+async function initMap() {
+ if (viewer) return;
+ publicCesiumInstance = new PublicCesium({ dom: 'viewer-container', layerMode: 4 });
+ viewer = publicCesiumInstance.getViewer();
+ viewInstance.value = publicCesiumInstance;
+ initViewer(viewer);
+ isViewerReady.value = true;
}
/**
@@ -72,92 +75,95 @@
* @param data 数据
*/
const initAddEntity = (type, data) => {
- watch(() => isViewerReady.value,
- (ready) => {
- if (ready) {
- viewer.entities.removeAll()
-
- type === 'point' ? addPoint(data) : addPolyline(data)
- }
- },
- { deep: true, immediate: true } // 初始化时立即执行
- )
-}
+ watch(
+ () => isViewerReady.value,
+ ready => {
+ if (ready) {
+ viewer.entities.removeAll();
+ if (type === 'initPosition') {
+ viewInstance.value?.flyToContour();
+ } else {
+ type === 'point' ? addPoint(data) : addPolyline(data);
+ }
+ }
+ },
+ { deep: true, immediate: true } // 初始化时立即执行
+ );
+};
/**
* 添加点标注
* @param data 数据 数据格式 [lng, lat]
*/
-function addPoint (data) {
- const [lng, lat] = data
+function addPoint(data) {
+ const [lng, lat] = data;
- if (!lng || !lat) return
+ if (!lng || !lat) return;
- viewer.entities.add({
- position: Cartesian3.fromDegrees(lng, lat),
- point: {
- pixelSize: 10,
- color: Cesium.Color.BLUE,
- outlineColor: Cesium.Color.WHITE,
- outlineWidth: 2
- }
- })
+ viewer.entities.add({
+ position: Cartesian3.fromDegrees(lng, lat),
+ point: {
+ pixelSize: 10,
+ color: Cesium.Color.BLUE,
+ outlineColor: Cesium.Color.WHITE,
+ outlineWidth: 2,
+ },
+ });
- // 定位到点位
- const points = [[lng, lat]] // 确保格式为二维数组
- flyVisual({ positionsData:points, viewer,multiple: 10 })
+ // 定位到点位
+ const points = [[lng, lat]]; // 确保格式为二维数组
+ flyVisual({ positionsData: points, viewer, multiple: 10 });
}
/**
* 添加点标注
* @param data 数据 数据格式 [[lng, lat], [lng, lat], [lng, lat]]
*/
-async function addPolyline (data) {
- await renderPreviewLine(data.url, data.type, data.cb, data.infos)
+async function addPolyline(data) {
+ await renderPreviewLine(data.url, data.type, data.cb, data.infos);
}
onMounted(() => {
- nextTick(() => {
- initMap()
- })
-})
+ nextTick(() => {
+ initMap();
+ });
+});
onBeforeUnmount(() => {
- var cesiumContainer = document.getElementById('viewer-container')
- if (cesiumContainer) {
- cesiumContainer.remove() // 移除与地图相关的DOM元素
- }
+ var cesiumContainer = document.getElementById('viewer-container');
+ if (cesiumContainer) {
+ cesiumContainer.remove(); // 移除与地图相关的DOM元素
+ }
- viewer.entities.removeAll()
- publicCesiumInstance.viewerDestroy()
- viewer = null
-
-})
+ viewer.entities.removeAll();
+ publicCesiumInstance.viewerDestroy();
+ viewer = null;
+});
defineExpose({
- initAddEntity
-})
+ initAddEntity,
+});
</script>
<script>
export default {
- name: 'MapContainer'
-}
+ name: 'MapContainer',
+};
</script>
<style lang="scss" scoped>
.map-container {
- position: relative;
- width: 100% !important;
- height: 100% !important;
- overflow: hidden;
+ position: relative;
+ width: 100% !important;
+ height: 100% !important;
+ overflow: hidden;
}
.viewer-container {
- position: absolute;
- top: 0%;
- left: 0%;
- width: 100%;
- height: 100%;
+ position: absolute;
+ top: 0%;
+ left: 0%;
+ width: 100%;
+ height: 100%;
}
</style>
--
Gitblit v1.9.3