From 3ea790ec7b0280a55cc406d2c3dc9fa5411a7471 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 20 Jan 2022 17:32:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/map/components/mapPopup.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 78e94f7..88445b5 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -59,7 +59,7 @@
<i class="popup-icon start-nav deblurring"></i>
出发
</li>
- <li @click="qrCodeClick">
+ <li v-show="false" @click="qrCodeClick">
<i class="popup-icon qr-code-nav deblurring"></i>
二维码
</li>
@@ -72,7 +72,8 @@
<i class="popup-icon live-action-nav deblurring"></i>
实景
</li>
- <li v-show="panoramaUrl != null && panoramaUrl != ''"
+ <!-- v-show="panoramaUrl != null && panoramaUrl != ''" -->
+ <li v-show="false"
@click="monitorClick">
<i class="popup-icon monitor-nav deblurring"></i>
监控
@@ -426,6 +427,7 @@
// eslint-disable-next-line new-cap
var positions = this.DC.Transform.transformWGS84ToCartesian(
+ // eslint-disable-next-line new-cap
new this.DC.Position.fromArray(this.pointPosition)
)
this.viewer.scene.globe.depthTestAgainstTerrain = false
@@ -448,6 +450,7 @@
}
// eslint-disable-next-line new-cap
var positions = this.DC.Transform.transformWGS84ToCartesian(
+ // eslint-disable-next-line new-cap
new this.DC.Position.fromArray(this.pointPosition)
)
this.viewer.scene.globe.depthTestAgainstTerrain = false
--
Gitblit v1.9.3