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/mobileWindow/index.vue | 119 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 92 insertions(+), 27 deletions(-)
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index 992339d..f3ab628 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -1,4 +1,5 @@
<template>
+ <!-- 浮动弹窗 mobileWindow-->
<div
ref="mobile-mapContentContent"
v-show="!MobileWindowsHide"
@@ -11,8 +12,20 @@
@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>
+ <!-- <i class="el-icon-video-play icon" v-show="!audioState"></i>
+ <i class="el-icon-video-pause icon" v-show="audioState"></i> -->
+ <img
+ src="/img/icon/start-video.png"
+ class="icon"
+ alt=""
+ v-show="!audioState"
+ />
+ <img
+ src="/img/icon/close-video.png"
+ class="icon"
+ alt=""
+ v-show="audioState"
+ />
<!-- <div id="bdtts_div_id">
<audio id="tts_autio_id" autoplay="autoplay">
<source
@@ -30,15 +43,23 @@
<div class="mobile-popup-imgs-h-close">
<i class="el-icon-close icon" @click="closeWindow"></i>
</div>
- <video :src="video" controls="controls" autoplay v-if="video"></video>
- <img :src="url" alt="" v-show="url && !video" />
+ <!-- <video :src="video" controls="controls" autoplay v-if="video"></video> -->
+ <playVideo
+ :src="video"
+ controls="controls"
+ autoplay
+ v-if="video"
+ ></playVideo>
+ <!-- <img :src="url" alt="" v-show="url && !video" /> -->
+ <!-- style="width: 100px; height: 100px" -->
<el-image
- style="width: 100px; height: 100px"
+ class="imgs"
:src="url"
id="mobileBigImgs"
- v-show="false"
+ v-show="url && !video"
:preview-src-list="srcList"
>
+ <!-- v-show="false" -->
</el-image>
<!-- <div>{{ query.query }}</div> -->
<div class="mobileBig-center-our" v-show="!video">
@@ -67,7 +88,9 @@
: item.name == '图集'
? 'el-icon-data-board'
: item.name == '去这'
- ? 'el-icon-finished'
+ ? quzheD
+ ? 'el-icon-loading'
+ : 'el-icon-finished'
: item.name == '视频' || item.name == '返回'
? 'el-icon-video-camera-solid'
: ''
@@ -97,11 +120,13 @@
"query",
"MobileWindowChangeData",
"audioState",
+ // "areaLayerSelect",
]),
},
watch: {
MobileWindowChangeData() {
this.$store.dispatch("MSET_GETAUDIOBEGIN", "notOpen");
+ this.quzheD = false;
//数据更改
// this.fullscreenLoading = true;
if (!this.MobileWindowsHide) {
@@ -110,7 +135,7 @@
let queryData = this.query.query;
// console.log(queryData, 789);
this.title = queryData.name;
-
+ //判断是否显示操作按钮
if (queryData.seebut) {
this.seebut = queryData.seebut;
if (queryData.from == "活动") {
@@ -121,6 +146,11 @@
this.seebut.push({
name: "显示活动",
});
+ if (queryData.notAddGoOn == "notAddGoOn") {
+ this.seebut.push({
+ name: "去这",
+ });
+ }
}
for (let k in this.seebut) {
if (this.seebut[k].name == "定位") {
@@ -237,39 +267,59 @@
seebut: [],
center: [],
panoramaurl: "",
+ quzheD: false, //是否点击了去这，并不能再按，以及不应用路线导航
};
},
methods: {
+ //按钮点击事件
openOnce(val) {
let that = this;
that.routerS = [];
let once = true;
let query = this.query.query;
+ // console.log(query);
if (val == "去这") {
+ if (that.quzheD) {
+ console.log("不可点击");
+ return;
+ }
+ that.quzheD = true;
+ // return;
//定位
// 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, query]);
- that.$store.commit("cameraSetView", ints.start);
- }
- },
+ let doit = (now) => {
+ if (now[0] == "失败") {
+ that.quzheD = false;
+ return;
+ }
+ let ints = {
+ start: [+now[0], +now[1]],
+ end: [+query.lntLat[0], +query.lntLat[1], 360],
+ // start: [+query.lntLat[0], +query.lntLat[1], 360],
+ // end: [114.031946, 27.621475],
+ type: "driving",
+ fn: function (datas) {
+ //获取回调路径
+ that.routerS.push(datas);
+ that.quzheD = false;
+ if (once) {
+ once = false;
+ //加载第一条线路
+ that.$store.commit("set_choiceRouterS", 0);
+ that.$store.dispatch("MSET_DRAWALINELAYER", [datas.Str, query]);
+ that.$store.commit("cameraSetView", ints.start);
+ }
+ },
+ };
+ that.$store.dispatch("MSET_GOTOWHERE", ints);
};
- that.$store.dispatch("MSET_GOTOWHERE", ints);
+ that.$store.commit("GET_NOWPOSITION", (res) => {
+ console.log(res);
+ doit(res);
+ });
} else if (val == "实景") {
- // console.log(this.panoramaurl, query);
+ console.log(this.panoramaurl, query);
this.$store.commit("MSET_OPENMOBILEPANORAMA", this.panoramaurl);
return;
this.$store.commit(
@@ -298,6 +348,7 @@
]);
}
},
+ //修改数据
changeData(data, name, value) {
let arr = [];
for (let k in data[name]) {
@@ -319,7 +370,16 @@
},
closeWindow() {
if (!this.MobileWindowsHide) {
+ let that = this;
this.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
+ if (window.select.overlay != undefined) {
+ window.select.overlay.setStyle({
+ material: window.select.color,
+ outline: false,
+ });
+
+ that.$store.commit("mset_changeSelect", [undefined, undefined]);
+ }
}
},
openAudio() {
@@ -336,6 +396,11 @@
margin-left: 3px;
.icon {
font-size: 20px;
+ width: 20px;
+ height: 20px;
+ float: right;
+ position: relative;
+ right: 8px;
}
}
#bdtts_div_id {
--
Gitblit v1.9.3