From 35934dc9e317e4a2de655c1f01fc573f69f37234 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 12 Nov 2018 17:10:23 +0800
Subject: [PATCH] update

---
 src/main/webapp/js/moralmap.js |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index f5e33a1..921e354 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -782,7 +782,7 @@
 		}
         var  mouseOverHandle = option['mouseover'];
 		//���������������������
-		moralMarker.addEventListener("mouseover", function() {
+		/*moralMarker.addEventListener("mouseover", function() {
 			if(mouseOverHandle!=null&&mouseOverHandle instanceof  Function){
                 //���arguments���������������
                 var args = Array.prototype.slice.call(arguments);
@@ -790,7 +790,7 @@
 			}
 			moralMap.closeSearchBox();
 			baiduMap.openInfoWindow(infoWindow, this._point); //������������������
-			/*if(infoWindow.getContent() == "") {
+			if(infoWindow.getContent() == "") {
 				var data = this.getData();
 				var option = this.getOption();
 				if(data==null||data["state"]==4){
@@ -802,13 +802,21 @@
 				}
 				infoWindow.setContent(dataHandle._getDataOutHtml(data));
 				infoWindow.redraw();
-			}*/
+			}
 		});
 		moralMarker.addEventListener("mouseout", function() {
 			baiduMap.closeInfoWindow();
 			infoWindow.setContent("");
 			moralMap.openSearchBox();
+		});*/
+		
+		moralMarker.addEventListener("mouseover", function() {
+			moralMap.openInfoWindow(infoWindow, this._point); //������������������
 		});
+		moralMarker.addEventListener("mouseout", function() {
+            moralMap.closeInfoWindow();
+		});
+
 		//==================infoWindow-end============================
 		//���������������
 		moralMap.putEquipment(option['mac'], moralMarker);

--
Gitblit v1.8.0