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 | 64 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index c0672ed..bddb235 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -25,7 +25,7 @@
<img
@click="closeMapPopupBox"
class="close-box"
- src="/zhxy/img/navicon/close.png"
+ src="/zhjg/img/navicon/close.png"
alt
/>
</div>
@@ -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,9 +168,10 @@
>
<div class="title">
<img
+ v-if="panoramaPopupFlag"
@click="returnDetailsPopup"
class="return-btn"
- src="/zhxy/img/icon/return.png"
+ src="/zhjg/img/icon/return.png"
alt
/>
{{ stateName }}
@@ -180,7 +184,7 @@
<img
@click="closePanoramaPopupBox"
class="close-box"
- src="/zhxy/img/navicon/close.png"
+ src="/zhjg/img/navicon/close.png"
alt
/>
</div>
@@ -204,17 +208,17 @@
<div class="monitor-wrap">
<div class="content-wrap">
<div class="title">
- <img
+ <!-- <img
@click="returnDetailsPopup"
class="return-btn"
- src="/zhxy/img/icon/return.png"
+ src="/zhjg/img/icon/return.png"
alt
- />
+ />-->
{{ stateName }}
<img
@click="closeMonitorPopupBox"
class="close-box"
- src="/zhxy/img/navicon/close.png"
+ src="/zhjg/img/navicon/close.png"
alt
/>
</div>
@@ -248,7 +252,7 @@
<img
@click="closeAddTagBox"
class="close-box"
- src="/zhxy/img/navicon/close.png"
+ src="/zhjg/img/navicon/close.png"
alt
/>
</div>
@@ -287,7 +291,7 @@
<img
@click="closelabelLayerid"
class="close-box"
- src="/zhxy/img/navicon/close.png"
+ src="/zhjg/img/navicon/close.png"
alt
/>
</div>
@@ -335,7 +339,7 @@
<img
@click="closeaddIconsLayerIconPopup"
class="close-box"
- src="/zhxy/img/navicon/close.png"
+ src="/zhjg/img/navicon/close.png"
alt
/>
</div>
@@ -476,14 +480,14 @@
apiUrls: null,
tabBtnFlag: '教学科研行政',
QRCodeFlag: false,
- audioImgUrl: '/zhxy/img/icon/close-video.png',
+ audioImgUrl: '/zhjg/img/icon/close-video.png',
audioSource: '',
audioFlag: false,
audioCourse: false,
audioSynth: null,
audioMsg: null,
fullscreen: false,
- fullScreenUrl: '/zhxy/img/icon/bigScreen.png',
+ fullScreenUrl: '/zhjg/img/icon/bigScreen.png',
addTagName: '',
addIconFromcolumn: [
// 顺序不要随便换
@@ -690,7 +694,8 @@
// },
// span: 10,
// },
- ]
+ ],
+ panoramaPopupFlag: false
}
},
computed: {
@@ -750,7 +755,7 @@
that.audioSynth.cancel()
that.audioFlag = false
that.audioCourse = false
- that.audioImgUrl = '/zhxy/img/icon/close-video.png'
+ that.audioImgUrl = '/zhjg/img/icon/close-video.png'
}
})
},
@@ -791,7 +796,7 @@
this.audioSynth.cancel()
this.audioFlag = false
this.audioCourse = false
- this.audioImgUrl = '/zhxy/img/icon/close-video.png'
+ this.audioImgUrl = '/zhjg/img/icon/close-video.png'
}
}
},
@@ -827,7 +832,7 @@
}
this.audioFlag = false
this.audioCourse = false
- this.audioImgUrl = '/zhxy/img/icon/close-video.png'
+ this.audioImgUrl = '/zhjg/img/icon/close-video.png'
}
}
}
@@ -905,12 +910,12 @@
},
screen () {
if (this.fullscreen) {
- this.fullScreenUrl = '/zhxy/img/icon/bigScreen.png'
+ this.fullScreenUrl = '/zhjg/img/icon/bigScreen.png'
this.fullscreen = !this.fullscreen
document.getElementById('pcElHeader').style.zIndex = 9999
} else {
- this.fullScreenUrl = '/zhxy/img/icon/smallScreen.png'
+ this.fullScreenUrl = '/zhjg/img/icon/smallScreen.png'
this.fullscreen = !this.fullscreen
document.getElementById('pcElHeader').style.zIndex = 9
@@ -950,8 +955,10 @@
this.audioSynth.cancel()
this.audioFlag = false
this.audioCourse = false
- this.audioImgUrl = '/zhxy/img/icon/close-video.png'
+ this.audioImgUrl = '/zhjg/img/icon/close-video.png'
}
+
+ this.panoramaPopupFlag = true
// eslint-disable-next-line new-cap
var positions = global.DC.Transform.transformWGS84ToCartesian(
@@ -975,7 +982,7 @@
this.audioSynth.cancel()
this.audioFlag = false
this.audioCourse = false
- this.audioImgUrl = '/zhxy/img/icon/close-video.png'
+ this.audioImgUrl = '/zhjg/img/icon/close-video.png'
}
// eslint-disable-next-line new-cap
var positions = global.DC.Transform.transformWGS84ToCartesian(
@@ -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)
@@ -1019,7 +1029,7 @@
this.audioSynth.cancel()
this.audioFlag = false
this.audioCourse = false
- this.audioImgUrl = '/zhxy/img/icon/close-video.png'
+ this.audioImgUrl = '/zhjg/img/icon/close-video.png'
}
this.$store.commit('SET_DETAILSPOPUP', false)
},
@@ -1103,16 +1113,16 @@
this.audioSynth.speak(this.audioMsg)
this.audioFlag = true
this.audioCourse = true
- this.audioImgUrl = '/zhxy/img/icon/start-video.png'
+ this.audioImgUrl = '/zhjg/img/icon/start-video.png'
} else {
if (this.audioCourse == true) {
this.audioSynth.pause()
this.audioCourse = false
- this.audioImgUrl = '/zhxy/img/icon/close-video.png'
+ this.audioImgUrl = '/zhjg/img/icon/close-video.png'
} else {
this.audioSynth.resume()
this.audioCourse = true
- this.audioImgUrl = '/zhxy/img/icon/start-video.png'
+ this.audioImgUrl = '/zhjg/img/icon/start-video.png'
}
}
},
--
Gitblit v1.9.3