From 22eef3376dbf16f2e05c68b9b264dabaf0dacf91 Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期三, 24 一月 2024 23:15:52 +0800
Subject: [PATCH] Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb
---
static/video/video.html | 3 ++-
src/components/sideMenu/layerMenu/layerPanel.vue | 18 ++++++++++++++++++
src/components/sideMenu/roamPanel/roamPanel.vue | 2 +-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/components/sideMenu/layerMenu/layerPanel.vue b/src/components/sideMenu/layerMenu/layerPanel.vue
index f4adf38..e57c81a 100644
--- a/src/components/sideMenu/layerMenu/layerPanel.vue
+++ b/src/components/sideMenu/layerMenu/layerPanel.vue
@@ -304,6 +304,24 @@
},
// 浜岀淮搴曞浘閫夋嫨
handleEMapClick(result, index) {
+ let p = sgworld.Navigate.getCameraInfo();
+ let pitch ;
+ if (pitch !== -90) {
+ pitch = -90;
+ sgworld.Navigate.flyToPointsInterest({
+ destination: new Cesium.Cartesian3.fromDegrees(
+ p.location.lon,
+ p.location.lat,
+ p.location.height
+ ),
+ orientation: {
+ heading: Cesium.Math.toRadians(0),
+ pitch: Cesium.Math.toRadians(pitch),
+ roll: Cesium.Math.toRadians(0),
+ },
+ });
+ }
+
// 璁剧疆鐩告満
if (result.name == "浜岀淮鍦板浘") {
window.Viewer.scene.globe.maximumScreenSpaceError = 4/3;
diff --git a/src/components/sideMenu/roamPanel/roamPanel.vue b/src/components/sideMenu/roamPanel/roamPanel.vue
index 5f9fc74..a20b53e 100644
--- a/src/components/sideMenu/roamPanel/roamPanel.vue
+++ b/src/components/sideMenu/roamPanel/roamPanel.vue
@@ -150,7 +150,7 @@
type: 2,
title: result.name,
shade: false,
- area: ["100%", 'auto'],
+ area: ["100%", '200px'],
offset: "r",
skin: "other-class",
content: SmartEarthRootUrl + "Workers/path/Path.html",
diff --git a/static/video/video.html b/static/video/video.html
index de0a0a3..54930f2 100644
--- a/static/video/video.html
+++ b/static/video/video.html
@@ -88,10 +88,11 @@
res = data.data.url.replace("ws://10.117.5.46:559/", "wss://skyzt.bda.gov.cn:443/")
} else if (data.data.url.includes("47")) {
res = data.data.url.replace("ws://10.117.5.47:559/", "wss://skyzt.bda.gov.cn:443/")
- } else if (data.data.url.includes("206")) {
+ } else if (data.data.url.includes("28")) {
res = data.data.url.replace("ws://10.117.5.28:559/", "wss://skyzt.bda.gov.cn:443/")//瑙嗛鏈�鏂拌繑鍥炲湴鍧�
}
realplay(res);
+
} catch (e) { }
}
});
--
Gitblit v1.9.3