From acb45c731c3ccd0a67061efb4e7bdf4f56005672 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 12 Jan 2022 08:52:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileWindow/index.vue | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index c35f756..6d2880b 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -6,9 +6,13 @@
>
<div class="mobiletitle">
{{ title }}
- <span class="mobile_audio" @click="openAudio" v-show="introduce">
- <i class="el-icon-video-play icon" v-show="!audioData"></i>
- <i class="el-icon-video-pause icon" v-show="audioData"></i>
+ <span
+ class="mobile_audio"
+ @click="openAudio"
+ v-show="introduce && !video"
+ >
+ <i class="el-icon-video-play icon" v-show="!audioState"></i>
+ <i class="el-icon-video-pause icon" v-show="audioState"></i>
<!-- <div id="bdtts_div_id">
<audio id="tts_autio_id" autoplay="autoplay">
<source
@@ -92,11 +96,12 @@
"MobileWindowsHide",
"query",
"MobileWindowChangeData",
- "audioData",
+ "audioState",
]),
},
watch: {
MobileWindowChangeData() {
+ this.$store.dispatch("MSET_GETAUDIOBEGIN", "notOpen");
//数据更改
// this.fullscreenLoading = true;
if (!this.MobileWindowsHide) {
@@ -155,6 +160,14 @@
}
if (k == "introduce") {
this.introduce = queryData[k];
+ if (this.introduce) {
+ setTimeout(() => {
+ let Str = document.querySelector(
+ ".mobileBig-center-introduce"
+ ).innerText;
+ this.$store.dispatch("MSET_GETAUDIO", Str); //加入语音
+ }, 20);
+ }
}
}
}
@@ -195,9 +208,31 @@
methods: {
openOnce(val) {
let that = this;
+ that.routerS = [];
+ let once = true;
if (val == "去这") {
//定位
console.log(this.query.query);
+ // that.$store.commit("set_endPosition", this.query.query.lntLat);
+ let ints = {
+ // start: [114.039946, 27.628475],
+ // end: that.query.query.lntLat,
+ start: [+that.query.query.lntLat[0], +that.query.query.lntLat[1]],
+ end: [114.031946, 27.621475],
+ type: "driving",
+ fn: function (datas) {
+ //获取回调路径
+ that.routerS.push(datas);
+ if (once) {
+ once = false;
+ //加载第一条线路
+ that.$store.commit("set_choiceRouterS", 0);
+ that.$store.dispatch("MSET_DRAWALINELAYER", datas.Str);
+ that.$store.commit("cameraSetView", ints.start);
+ }
+ },
+ };
+ that.$store.dispatch("MSET_GOTOWHERE", ints);
} else if (val == "实景") {
this.$store.commit(
"MSET_OPENMOBILEPANORAMA",
@@ -223,10 +258,7 @@
},
openAudio() {
if (this.introduce) {
- let Str = document.querySelector(
- ".mobileBig-center-introduce"
- ).innerText;
- this.$store.dispatch("MSET_GETAUDIO", Str);
+ this.$store.dispatch("MSET_GETAUDIOBEGIN");
}
},
},
--
Gitblit v1.9.3