From 5b73519a2c26fea97b4dfd7f56ee6c4e5ea27dde Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 11 Sep 2025 15:55:37 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into feature/v6.0/6.0.1
---
src/utils/cesium/publicCesium.js | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/utils/cesium/publicCesium.js b/src/utils/cesium/publicCesium.js
index 59b1acf..97b0f8a 100644
--- a/src/utils/cesium/publicCesium.js
+++ b/src/utils/cesium/publicCesium.js
@@ -94,13 +94,13 @@
terrain = false,
layerMode = 0,
contour = true,
- // flyToContour = false,
+ flyToContour = false,
multiple = 1.4,
dockOptions = {},
-
-
+ boundaryColor = '#7FFFD4',
+ boundaryChange,
dockRangeType = 1,
useDockHeight = false
} = options
@@ -135,7 +135,7 @@
this.viewer.clockViewModel.currentTime = Cesium.JulianDate.addHours(utc, 0, new Cesium.JulianDate())
// 边界，机巢
-
+ this.boundary = useBoundary(this.viewer, { multiple, dockOptions, boundaryChange, boundaryColor, dockRangeType, useDockHeight })
this.viewer?.imageryLayers.removeAll()
this.viewer._cesiumWidget._creditContainer.style.display = 'none'
handler = new Cesium.ScreenSpaceEventHandler(this.viewer?.scene.canvas)
@@ -158,8 +158,8 @@
this.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 4500000
this.switchLayers(layerMode)
this.switchFlatMode(flatMode)
- // this.switchContour(contour)
- // flyToContour && this.flyToContour(contour)
+ this.switchContour(contour)
+ flyToContour && this.flyToContour(contour)
}
getViewer () {
@@ -202,21 +202,22 @@
}
setShowDock (sns) {
- // this.boundary?.setShowDock(sns)
+ this.boundary?.setShowDock(sns)
}
// 切换轮廓显示
- // async switchContour (open) {
- // if (open) {
- // await this.boundary?.openContour()
- // } else {
- // this.boundary?.closeContour()
- // }
- // }
+ async switchContour (open) {
+ if (open) {
+ await this.boundary?.openContour()
+
+ } else {
+ this.boundary?.closeContour()
+ }
+ }
// // 飞向轮廓居中
- // flyToContour () {
- // this.boundary?.flyToBoundary()
- // }
+ flyToContour () {
+ this.boundary?.flyToBoundary()
+ }
// 飞行 flyto
flyTo (pointOption, time = 4, height = 3000, orientation = {}, complete = () => { }) {
--
Gitblit v1.9.3