From 3ff8eeda5b5ed0d19f9b04b7c027957be130d5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E5=A4=A7=E8=83=86?= <1101282782@qq.com>
Date: Mon, 15 Dec 2025 11:20:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80?=
=?UTF-8?q?=E9=AB=98=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Global/Contour/index.js | 28 ++++++++++++++++++++++++----
src/In/index.js | 5 +++--
2 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/Global/Contour/index.js b/src/Global/Contour/index.js
index 42bfe42..a352a16 100644
--- a/src/Global/Contour/index.js
+++ b/src/Global/Contour/index.js
@@ -76,7 +76,7 @@ function accordingToCameraHeight() {
}
function startDraw(sdk, showData) {
- if(!sdk || !sdk.viewer) {
+ if (!sdk || !sdk.viewer) {
return
}
if (showData) {
@@ -129,8 +129,28 @@ function reset() {
supplementaryContourShow = false
supplementaryContourWidth = 1.0
supplementaryContourColor = '#d084d1'
-
-
+}
+function setVal(data) {
+ secondaryLinesCount = data['secondaryLinesCount']
+ // show = true
+ equalHeightDistance = data['equalHeightDistance']
+ activeColor = rgbaFromObject(data['activeColor'])
+ indexContourShow = data['indexContourShow']
+ indexContourWidth = data['indexContourWidth']
+ indexContourColor = rgbaFromObject(data['indexContourColor'])
+ intermediateContourShow = data['intermediateContourShow']
+ intermediateContourWidth = data['intermediateContourWidth']
+ intermediateContourColor = rgbaFromObject(data['intermediateContourColor'])
+ halfIntervalContourShow = data['halfIntervalContourShow']
+ halfIntervalContourWidth = data['halfIntervalContourWidth']
+ halfIntervalContourColor = rgbaFromObject(data['halfIntervalContourColor'])
+ supplementaryContourShow = data['supplementaryContourShow']
+ supplementaryContourWidth = data['supplementaryContourWidth']
+ supplementaryContourColor = rgbaFromObject(data['supplementaryContourColor'])
+}
+function rgbaFromObject(colorObj) {
+ const { red, green, blue, alpha = 1 } = colorObj;
+ return `rgba(${red * 255}, ${green * 255}, ${blue * 255}, ${alpha})`;
}
async function dialog(sdk) {
_sdk = sdk
@@ -716,4 +736,4 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
});
}
-export { dialog, startDraw, reset }
+export { dialog, startDraw, reset, setVal }
diff --git a/src/In/index.js b/src/In/index.js
index 2caa374..a8b2f92 100644
--- a/src/In/index.js
+++ b/src/In/index.js
@@ -71,7 +71,7 @@ import {
} from '../Global/MultiViewportMode'
import { MouseCoordinate } from '../Global/MouseCoordinate'
import { MouseRightMenu } from '../Global/mouseRightMenu'
-import { dialog as ContourDialog, startDraw as ContourStartDraw, reset as ContourReset } from '../Global/Contour'
+import { dialog as ContourDialog, startDraw as ContourStartDraw, reset as ContourReset, setVal as ContourSetVal } from '../Global/Contour'
import { on as SplitScreenOn, off as SplitScreenOff, setActiveId as SplitScreenSetActiveId, getSdk } from '../Global/SplitScreen'
import LocateCurrent from '../Obj/Base/LocateCurrent'
@@ -352,7 +352,8 @@ if (!window.YJ) {
},
Contour: ContourDialog,
ContourStartDraw,
- ContourReset
+ ContourReset,
+ ContourSetVal
}, //测量
Measure: {
GetMeasureStatus: () => {
From 50b4501b7a13e9332a37aeb300d1a4e99c81087e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E5=A4=A7=E8=83=86?= <1101282782@qq.com>
Date: Mon, 15 Dec 2025 16:37:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Global/FlyRoam/index.js | 2 ++
src/Global/MouseCoordinate/index.js | 10 +++++-----
src/Global/global.js | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/Global/FlyRoam/index.js b/src/Global/FlyRoam/index.js
index a7c4754..a9f3055 100644
--- a/src/Global/FlyRoam/index.js
+++ b/src/Global/FlyRoam/index.js
@@ -203,6 +203,8 @@ const open = async (sdk, options = {}, _Dialog = {}, func) => {
trList[i].querySelector("input[name='time']").value = time
}
trList[trList.length - 1].querySelector("input[name='time']").value = 0
+
+ totalTimeElm.value = 0//点击应用后默认时间清零
}
})
totalTimeElm.addEventListener('blur', () => {
diff --git a/src/Global/MouseCoordinate/index.js b/src/Global/MouseCoordinate/index.js
index a7cb7f5..88ad038 100644
--- a/src/Global/MouseCoordinate/index.js
+++ b/src/Global/MouseCoordinate/index.js
@@ -181,13 +181,13 @@ const MouseCoordinate = (sdk, status) => {
// contentElm.innerHTML = `经度：${degrees.lng.toFixed(6)}°
维度：${degrees.lat.toFixed(6)}°
海拔：${degrees.alt.toFixed(2)} m
经度：${degrees.lng.toFixed(8)}°
维度：${degrees.lat.toFixed(8)}°
海拔：${degrees.alt.toFixed(2)} m
经度：${degrees.lng.toFixed(8)}°
维度：${degrees.lat.toFixed(8)}°
海拔：${Number(degrees.alt.toFixed(2))} m
经度：${proj.degreesToDMS(degrees.lng, true)}
维度：${proj.degreesToDMS(degrees.lat, true)}
海拔：${degrees.alt.toFixed(2)} m
经度：${proj.degreesToDMS(degrees.lng, true)}
维度：${proj.degreesToDMS(degrees.lat, true)}
海拔：${Number(degrees.alt.toFixed(2))} m
经度：${proj.degreesToDMS(degrees.lng, false)}
维度：${proj.degreesToDMS(degrees.lat, false)}
海拔：${degrees.alt.toFixed(2)} m
经度：${proj.degreesToDMS(degrees.lng, false)}
维度：${proj.degreesToDMS(degrees.lat, false)}
海拔：${Number(degrees.alt.toFixed(2))} m
x：${position.x.toFixed(2)}
y：${position.y.toFixed(2)}
z：${position.z.toFixed(2)}
x：${position.x.toFixed(2)}
y：${position.y.toFixed(2)}
z：${Number(position.z.toFixed(2))}