From bf58722dfd03ea1513f3acc7331d4d4403fca76e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Mar 2022 11:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileWindow/index.vue | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index a453868..2bd5e62 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -31,14 +31,16 @@
<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" />
+ <!-- <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 +69,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,12 +101,13 @@
"query",
"MobileWindowChangeData",
"audioState",
- "areaLayerSelect",
+ // "areaLayerSelect",
]),
},
watch: {
MobileWindowChangeData() {
this.$store.dispatch("MSET_GETAUDIOBEGIN", "notOpen");
+ this.quzheD = false;
//数据更改
// this.fullscreenLoading = true;
if (!this.MobileWindowsHide) {
@@ -243,6 +248,7 @@
seebut: [],
center: [],
panoramaurl: "",
+ quzheD: false, //是否点击了去这，并不能再按，以及不应用路线导航
};
},
methods: {
@@ -253,11 +259,20 @@
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 doit = (now) => {
+ if (now[0] == "失败") {
+ that.quzheD = false;
+ return;
+ }
let ints = {
start: [+now[0], +now[1]],
end: [+query.lntLat[0], +query.lntLat[1], 360],
@@ -267,6 +282,7 @@
fn: function (datas) {
//获取回调路径
that.routerS.push(datas);
+ that.quzheD = false;
if (once) {
once = false;
//加载第一条线路
@@ -283,7 +299,7 @@
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(
@@ -335,9 +351,9 @@
if (!this.MobileWindowsHide) {
let that = this;
this.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
- if (that.areaLayerSelect.overlay != undefined) {
- that.areaLayerSelect.overlay.setStyle({
- material: that.areaLayerSelect.color,
+ if (window.select.overlay != undefined) {
+ window.select.overlay.setStyle({
+ material: window.select.color,
outline: false,
});
--
Gitblit v1.9.3