From 3807d5af98a271678464766cd4d19dbe1e3e07c6 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 31 Mar 2022 15:19:46 +0800
Subject: [PATCH] 冲突
---
src/components/mobileActivity/index.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/components/mobileActivity/index.vue b/src/components/mobileActivity/index.vue
index 074476d..636f627 100644
--- a/src/components/mobileActivity/index.vue
+++ b/src/components/mobileActivity/index.vue
@@ -156,6 +156,7 @@
// this.height = this.useHeight;
// }
// },
+ //当弹窗显示时，开始操作数据
showActivity() {
if (this.showActivity) {
this.inToInit(); // 初始化
@@ -223,6 +224,7 @@
// }
// }
// }
+ //处理底图
window.serviceMapSee = {};
getdetail(this.showActivityData.opendata.id).then((res) => {
let name = res.data.data.mapname.split(",");
@@ -239,7 +241,7 @@
url: url[k],
to: "serviceMap",
};
- this.serviceMap.push(d);
+ this.serviceMap.push(d); //数据层
// console.log(d, "see");
window.onceServiceMap =
@@ -250,8 +252,8 @@
flag: true,
layer: global.viewer.imageryLayers.addImageryProvider(
window.onceServiceMap
- ),
- source: window.onceServiceMap,
+ ), //渲染层
+ source: window.onceServiceMap, //渲染源
};
window.onceServiceMap = null;
}
@@ -266,7 +268,7 @@
global.viewer.imageryLayers.remove(window.serviceMapSee[k].layer);
}
}
- window.serviceMapSee == {};
+ window.serviceMapSee = {};
}
}
},
@@ -349,6 +351,7 @@
item.img = item.normal;
}
if (item.to == "serviceMap") {
+ //再次判断是否是底图的加载
console.log(window.serviceMapSee[item.layer]);
//清除
if (!item.flag && window.serviceMapSee[item.layer].flag) {
--
Gitblit v1.9.3