From 81f54040c2cb65537c6c6e1db8358a39a57dea0d Mon Sep 17 00:00:00 2001
From: mayisheng <admin>
Date: Mon, 15 Aug 2022 16:14:01 +0800
Subject: [PATCH] 1
---
src/components/map/components/mapPopup.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index f9ae8a9..94c2391 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -745,15 +745,14 @@
this.audioSynth = window.speechSynthesis
this.audioMsg = new window.SpeechSynthesisUtterance()
- this.audioMsg.onend = function () {
- that.audioSynth.cancel()
- that.audioFlag = false
- that.audioCourse = false
- that.audioImgUrl = '/img/icon/close-video.png'
- }
- },
- mounted () {
- global.viewer.scene.globe.depthTestAgainstTerrain = false
+ this.$nextTick(() => {
+ this.audioMsg.onend = function () {
+ that.audioSynth.cancel()
+ that.audioFlag = false
+ that.audioCourse = false
+ that.audioImgUrl = '/img/icon/close-video.png'
+ }
+ })
},
watch: {
addIconsLayerIconPopup () {
@@ -816,12 +815,16 @@
immediate: true,
handler (newCode, oldCode) {
if (newCode == false) {
- this.audioSynth.cancel()
+ if (this.audioSynth != null) {
+ this.audioSynth.cancel()
+ }
this.audioFlag = false
this.audioCourse = false
} else {
if (this.audioFlag == true) {
- this.audioSynth.cancel()
+ if (this.audioSynth != null) {
+ this.audioSynth.cancel()
+ }
this.audioFlag = false
this.audioCourse = false
this.audioImgUrl = '/img/icon/close-video.png'
@@ -1214,4 +1217,9 @@
padding: 0 10px;
}
}
+.introduce p {
+ padding: 0px;
+ height: 300px;
+ overflow-y: scroll;
+}
</style>
--
Gitblit v1.9.3