From eecadc9f4fc4f067dba0221125bacb180ce3b0e2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 14 Jan 2022 17:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileWindow/index.vue | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index 6d2880b..538516c 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -107,11 +107,20 @@
if (!this.MobileWindowsHide) {
this.video = ""; //清除视频
let queryData = this.query.query;
- // console.log(queryData);
+ console.log(queryData, 789);
this.title = queryData.name;
if (queryData.seebut) {
this.seebut = queryData.seebut;
+ if (queryData.from == "活动") {
+ this.seebut = [];
+ this.seebut.push({
+ name: "图集",
+ });
+ this.seebut.push({
+ name: "显示活动",
+ });
+ }
for (let k in this.seebut) {
if (this.seebut[k].name == "定位") {
this.seebut.splice(k, k + 1);
@@ -152,7 +161,12 @@
this.center = [];
for (let k in queryData) {
for (let n in this.getCenter) {
- if (k == this.getCenter[n].name && queryData[k]) {
+ if (
+ k == this.getCenter[n].name &&
+ queryData[k] &&
+ queryData.from != "活动" &&
+ this.getCenter[n].value == "地址"
+ ) {
this.center.push({
name: this.getCenter[n].value,
value: queryData[k] ? queryData[k] : "暂无",
@@ -210,9 +224,10 @@
let that = this;
that.routerS = [];
let once = true;
+ let query = this.query.query;
if (val == "去这") {
//定位
- console.log(this.query.query);
+ // console.log(this.query.query);
// that.$store.commit("set_endPosition", this.query.query.lntLat);
let ints = {
// start: [114.039946, 27.628475],
@@ -227,7 +242,7 @@
once = false;
//加载第一条线路
that.$store.commit("set_choiceRouterS", 0);
- that.$store.dispatch("MSET_DRAWALINELAYER", datas.Str);
+ that.$store.dispatch("MSET_DRAWALINELAYER", [datas.Str, query]);
that.$store.commit("cameraSetView", ints.start);
}
},
@@ -249,8 +264,36 @@
} else if (val == "返回") {
this.seebut[this.seebut.length - 1].name = "视频";
this.video = "";
+ } else if (val == "显示活动") {
+ let addressOur = this.changeData(query, "addressname", "address");
+ let lxOur = this.changeData(query, "lxname", "lx");
+ console.log(addressOur, lxOur);
+ that.$store.dispatch("MSET_DRAWALINELAYERMANY", [
+ lxOur,
+ addressOur,
+ query,
+ ]);
}
},
+ changeData(data, name, value) {
+ let arr = [];
+ for (let k in data[name]) {
+ arr.push({
+ name: data[name][k],
+ value:
+ name == "lxname"
+ ? data[value][k]
+ .split("(")[1]
+ .split(")")[0]
+ .split(",")
+ .join(";")
+ .split(" ")
+ .join(",")
+ : [+data[value][k].split(",")[0], +data[value][k].split(",")[1]],
+ });
+ }
+ return arr;
+ },
closeWindow() {
if (!this.MobileWindowsHide) {
this.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
--
Gitblit v1.9.3