From 37a4a03e1ddef4f66904dccee54b684e73e9a3b2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Nov 2022 17:32:27 +0800
Subject: [PATCH] 1
---
src/components/map/components/mapPopup.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index c1970e5..bddb235 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -33,13 +33,13 @@
<div class="arc-bcg">
<img :src="popupBgUrl" alt />
</div>
- <div
+ <!-- <div
v-show="siteName != null && siteName != ''"
class="site"
>
<strong>地址：</strong>
{{ siteName }}
- </div>
+ </div>-->
<div
v-show="telephone != null && telephone != ''"
class="phone"
@@ -155,7 +155,10 @@
:class="{ 'change-full': fullscreen }"
id="PanoramaBox"
>
- <div style="width: 100%; height: 100%; transform: translate(0, 50%);">
+ <div
+ style="width: 100%; height: 100%; "
+ :style="{transform: !this.fullscreen ? 'translate(0, 50%)' : 'translate(0, 0)'}"
+ >
<div class="panorama-container">
<div class="panorama-wrap">
<div
@@ -165,6 +168,7 @@
>
<div class="title">
<img
+ v-if="panoramaPopupFlag"
@click="returnDetailsPopup"
class="return-btn"
src="/zhjg/img/icon/return.png"
@@ -204,12 +208,12 @@
<div class="monitor-wrap">
<div class="content-wrap">
<div class="title">
- <img
+ <!-- <img
@click="returnDetailsPopup"
class="return-btn"
src="/zhjg/img/icon/return.png"
alt
- />
+ />-->
{{ stateName }}
<img
@click="closeMonitorPopupBox"
@@ -690,7 +694,8 @@
// },
// span: 10,
// },
- ]
+ ],
+ panoramaPopupFlag: false
}
},
computed: {
@@ -953,6 +958,8 @@
this.audioImgUrl = '/zhjg/img/icon/close-video.png'
}
+ this.panoramaPopupFlag = true
+
// eslint-disable-next-line new-cap
var positions = global.DC.Transform.transformWGS84ToCartesian(
// eslint-disable-next-line new-cap
@@ -993,6 +1000,9 @@
},
returnDetailsPopup () {
+ debugger
+ this.panoramaPopupFlag = false
+
var positions = global.DC.Transform.transformWGS84ToCartesian(
// eslint-disable-next-line new-cap
new global.DC.Position.fromArray(this.pointPosition)
--
Gitblit v1.9.3