From c976fedb4d58a23aff930188d4031adac54a3037 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 17:18:37 +0800
Subject: [PATCH] 获取报警 阀值

---
 src/main/webapp/js/moralmap.js |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 83dadce..e603e0a 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -208,11 +208,23 @@
 		}
 		return moralMarker;
 	}
+	moralMap.clearCloseInfoWindow = function () {
+        if(!!moralMap["_closeInfoWinTimer"]){
+            clearTimeout(moralMap["_closeInfoWinTimer"]);
+            moralMap["_closeInfoWinTimer"] = null;
+        }
+    }
 	moralMap.openInfoWindow = function() {
-		baiduMap.openInfoWindow.apply(baiduMap, arguments);
+        moralMap.clearCloseInfoWindow();
+        baiduMap.openInfoWindow.apply(baiduMap, arguments);; //������������������
 	}
 	moralMap.closeInfoWindow = function() {
-		baiduMap.closeInfoWindow.apply(baiduMap, arguments);
+        var timer = setTimeout(function () {
+            baiduMap.closeInfoWindow.apply(baiduMap, arguments);
+            moralMap["_closeInfoWinTimer"] = null;
+        },1200);
+        moralMap["_closeInfoWinTimer"] = timer;
+
 	}
 	moralMap.clearOverlays = function() {
 		baiduMap.clearOverlays();
@@ -245,10 +257,12 @@
 	}
 	//������������
 	moralMap.showPopupbox = function(id) {
-		$(id).css('display', 'block');
+		setTimeout(function () {
+            $(id).css('display', 'block');
+        },1);
 	}
 	moralMap.closePopupbox = function(id) {
-		$(id).css('display', 'none');
+		   $(id).css('display', 'none');
 	}
 	moralMap.isPopupBoxShow = function(id) {
 		return $(id).css('display') == 'block';
@@ -264,6 +278,7 @@
 			mac: (row['mac']).toLowerCase(),
 			longitude: row['longitude'],
 			latitude: row['latitude'],
+            monitorPointId: row['monitorPointId'],
             version:row['deviceVersion']['version']
 		};
 		!!select?equ['monitorPointId'] = row["monitorPointId"]:null;
@@ -537,7 +552,9 @@
 					address = address.slice(0, 18) + "...";
 				}
 				var adressOutHtml = "";
-				adressOutHtml += "<div style='font:12px arial,sans-serif;margin-top:12px'><table cellspacing='0' style='overflow:hidden;table-layout:fixed;width:100%;font:12px arial,sans-serif'>";
+				adressOutHtml += "<div onmouseover='moralMap.clearCloseInfoWindow()'"
+                adressOutHtml +=	"onmouseout='moralMap.closeInfoWindow()'"
+                adressOutHtml	+=" style='font:12px arial,sans-serif;margin-top:12px'><table cellspacing='0' style='overflow:hidden;table-layout:fixed;width:100%;font:12px arial,sans-serif'>";
 				adressOutHtml += "<tbody><tr><td style='vertical-align:top;width:38px;white-space:nowrap;word-break:keep-all'>���������&nbsp;</td><td style='line-height:16px'>";
 				adressOutHtml += address + "&nbsp;";
 				adressOutHtml += "</td></tr></tbody></table></div>";
@@ -545,16 +562,15 @@
 			}
 			return new BMap.InfoWindow(getAdressOutHtml(), winOpts);
 		})();
-
 		if(moralMask["infoWindow"] == undefined) {
 			moralMask["infoWindow"] = infoWindow;
 		}
 		//���������������������
 		moralMask.addEventListener("mouseover", function() {
-			baiduMap.openInfoWindow(infoWindow, this._point); //������������������
+			moralMap.openInfoWindow(infoWindow, this._point); //������������������
 		});
 		moralMask.addEventListener("mouseout", function() {
-			baiduMap.closeInfoWindow();
+            moralMap.closeInfoWindow();
 		});
 		//==================infoWindow-end============================
 		//���������������

--
Gitblit v1.8.0