From bfb1606a202ecfb1523c1ac13ee5ae78dbf14528 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sun, 25 Apr 2021 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js b/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
index 97222bb..673f596 100644
--- a/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
+++ b/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
@@ -196,7 +196,7 @@
// console.log(und)
if (und == '控制端') {//控制端弹窗关闭
parent[0].layer.close(indexControl);
- parent[0].layer.close(+indexControl + 1);
+ // parent[0].layer.close(+indexControl + 1);
}
if (eour == undefined) {
@@ -313,7 +313,7 @@
clickD = document.onclick = () => {
if (isclickD) {
parent[0].layer.close(index);
- parent[0].layer.close(+index + 1);
+ // parent[0].layer.close(+index + 1);
// parent[0].layer.closeAll();
// console.log(111111111111)
clickD = document.onclick = null;
@@ -321,11 +321,11 @@
}
var mouseWheel = that.map.on("mouse-wheel", myMouseWheelHandler);
-
+ //鼠标滚轮事件
function myMouseWheelHandler(event) {
// console.log("Mouse wheel value = " + event.value);
parent[0].layer.close(index);
- parent[0].layer.close(+index + 1);
+ // parent[0].layer.close(+index + 1);
mouseWheel.remove();
}
@@ -396,7 +396,7 @@
var offsetMy = [+evt.screenY - 310 + 'px', +evt.screenX - 168 + 'px'];
if (und == '控制端') {//控制端弹窗关闭
var offsetMy = [+window.innerHeight / 2 - 115 + 'px', (+window.innerWidth - 360) / 2 + 257 + 'px'];
- console.log('控制端中浮',offsetMy)
+ // console.log('控制端中浮',offsetMy)
}
// console.log(evt.screenY);
var winSize = [+window.innerHeight / 2 - 242 + 'px', +window.innerWidth - 380 + 'px']
@@ -421,7 +421,7 @@
this._map.centerAndZoom(position, this.map.getZoom() + 1);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
parent[0].layer.close(this.indexs)
- parent[0].layer.close(+this.indexs + 1)
+ // parent[0].layer.close(+this.indexs + 1)
// console.log('111:', this.map.zoomToFullExtent(), '222:', evt, evt.graphic._extent, 'zoom');
}
--
Gitblit v1.9.3