From 513e1bdf4b2703409d9e4dbb776e67ffa0c134a6 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期三, 13 九月 2023 09:52:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web
---
src/assets/js/Map/menuTool.js | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/assets/js/Map/menuTool.js b/src/assets/js/Map/menuTool.js
index 6bd167c..fa94d83 100644
--- a/src/assets/js/Map/menuTool.js
+++ b/src/assets/js/Map/menuTool.js
@@ -104,24 +104,40 @@
if (this.localPoint) {
this.setLocalPositionClose();
}
- var position = {
- X: parseFloat(res.lon),
- Y: parseFloat(res.lat),
- Altitude: parseFloat(res.alt),
- };
- this.localPoint = window.sgworld.Creator.CreateImageLabel(
- position,
- config.StaticFileBaseUrl + "/Workers/image/mark.png",
- {},
- 0,
- "鏍囩鐐�"
- );
- var id = this.localPoint.item.id;
- window.sgworld.Navigate.flyToObj(this.localPoint.item);
+ // var position = {
+ // X: parseFloat(res.lon),
+ // Y: parseFloat(res.lat),
+ // Altitude: parseFloat(res.alt),
+ // };
+ // this.localPoint = window.sgworld.Creator.CreateImageLabel(
+ // position,
+ // config.StaticFileBaseUrl + "/Workers/image/mark.png",
+ // {},
+ // 0,
+ // "鏍囩鐐�"
+ // );
+ // var id = this.localPoint.item.id;
+ // window.sgworld.Navigate.flyToObj(this.localPoint.item);
+ this.localPoint = window.Viewer.entities.add({
+ name: '鍧愭爣瀹氫綅',
+ position: Cesium.Cartesian3.fromDegrees(parseFloat(res.lon), parseFloat(res.lat), res.alt == null ? parseFloat(res.alt) : 0),
+ billboard: {
+ image: config.StaticFileBaseUrl + '/Workers/image/location.png',
+ // 璁剧疆璐村湴
+ heightReference: Cesium.Color.CORNFLOWERBLUE.withAlpha(0.4),
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ scale: 1.0,
+ },
+ });
+ this.setViewerFlyTo(this.localPoint)
},
setLocalPositionClose() {
- this.localPoint.deleteObject();
- this.localPoint = null;
+ if (this.localPoint) {
+ // this.localPoint.deleteObject();
+ window.Viewer.entities.remove(this.localPoint)
+ this.localPoint = null;
+ }
+
},
//鍧″害鍒嗘瀽
setSlopeMap() {
@@ -615,13 +631,14 @@
// 璁剧疆璐村湴
heightReference: Cesium.Color.CORNFLOWERBLUE.withAlpha(0.4),
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
- scale: 5.0,
+ scale: 1.0,
},
});
this.setViewerFlyTo(position)
},
setViewerFlyTo(entity) {
+
window.Viewer.flyTo(entity, {
offset: {
heading: Cesium.Math.toRadians(0.0),
--
Gitblit v1.9.3