From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突
---
src/components/mobileWindow/index.vue | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index a6c91b2..a453868 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -97,6 +97,7 @@
"query",
"MobileWindowChangeData",
"audioState",
+ "areaLayerSelect",
]),
},
watch: {
@@ -252,28 +253,35 @@
let query = this.query.query;
// console.log(query);
if (val == "去这") {
+ // 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: [+query.lntLat[0], +query.lntLat[1], 360],
- 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) => {
+ 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);
+ 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);
this.$store.commit("MSET_OPENMOBILEPANORAMA", this.panoramaurl);
@@ -325,7 +333,16 @@
},
closeWindow() {
if (!this.MobileWindowsHide) {
+ let that = this;
this.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
+ if (that.areaLayerSelect.overlay != undefined) {
+ that.areaLayerSelect.overlay.setStyle({
+ material: that.areaLayerSelect.color,
+ outline: false,
+ });
+
+ that.$store.commit("mset_changeSelect", [undefined, undefined]);
+ }
}
},
openAudio() {
--
Gitblit v1.9.3