From 1f5d96b654079484dd03de0c6d38559075e88bdb Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 14 Nov 2018 15:52:16 +0800
Subject: [PATCH] update

---
 src/main/webapp/js/moralmap.js |  107 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 91 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 2223c7f..fefd52a 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -656,7 +656,52 @@
 		var moralMarker = new moralMap.MoralMarker(option);
 		//	    var mark =new BMap.Marker(pointObj,{icon:iconObj});
 		//==================infoWindow-start============================
+
 		var infoWindow = (function() {
+			//���������������
+			var winOpts = {
+				width: 110, // ������������������
+				height: 80, // ������������������
+				title: getTitleOutHtml(), // ������������������
+				offset: new BMap.Size(-8,-5) //���������������������
+			}
+
+			function getTitleOutHtml() {
+				//title���������������...
+				var title = (option["name"] == null) ? "" : option["name"];
+				if(title.length > 13) {
+					title = title.slice(0, 13) + "...";
+				}
+				var titleOutHtml = "";
+				titleOutHtml += "<p style='width:210px;font:bold 14px/16px arial,sans-serif;margin:0;color:#cc5522;white-space:nowrap;overflow:hidden'"
+				titleOutHtml += "title='" + option["name"] + "'>";
+				titleOutHtml += title + "</p>";
+				return titleOutHtml;
+			}
+
+			function getAdressOutHtml() {
+				var address = (option["address"] == null) ? "" : option["address"];
+				if(address.length > 18) {
+					address = address.slice(0, 18) + "...";
+				}
+				var adressOutHtml = "";
+				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>";
+                adressOutHtml += "</tbody></table></div>";
+                //$("#searchParam").val(address);
+				return adressOutHtml;
+			}
+			return new BMap.InfoWindow(getAdressOutHtml(), winOpts);
+		})();
+		if (!showEquipmentInfoWindow) {
+			showEquipmentInfoWindow = infoWindow;
+		}
+		
+		/*var infoWindow = (function() {
 			//���������������
 			var winOpts = {
 				width: option["online_width"], // ������������������
@@ -730,14 +775,14 @@
 				}
 				return grade+"00";
 			}
-		};
+		};*/
 
 		if(moralMarker["infoWindow"] == undefined) {
 			moralMarker["infoWindow"] = infoWindow;
 		}
         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);
@@ -763,14 +808,20 @@
 			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);
 		var _super_refreshState = moralMarker.refreshState;
-		if (!showEquipmentInfoWindow) {
-			showEquipmentInfoWindow = infoWindow;
-		}
+		//$("#searchParam").val(option['mac']);
 		return $.extend(moralMarker, {
 			refreshState: function(data) {
 				if(data != null && data!="") {
@@ -778,7 +829,7 @@
 					    this.setData(data); //������������
 						_super_refreshState.call(this, data["state"]);
 						//������������������������������,������������������������
-							   if(infoWindow.isOpen()) {
+							   /*if(infoWindow.isOpen()) {
 									if(data["state"]==4){
 										if(state!=4){
 				                         infoWindow.setHeight(option["offline_height"]);
@@ -807,7 +858,7 @@
 											$(itme_data_mac_key).text(dataValue);
 										}
 									}
-							}
+							}*/
 				}
 			},
 			setData:function(data){
@@ -917,17 +968,41 @@
 		var new_point = new BMap.Point(condition.longitude, condition.latitude);
 		baiduMap.panTo(new_point);
 		baiduMap.setCenter(new_point);
-		if (condition.type == "mpoint") {
-			baiduMap.setZoom(17);
-			new moralMap.Monitorpoint(condition);
-			moralMap.openInfoWindow(showMonitorpointInfoWindow, new_point);
-			showMonitorpointInfoWindow = null;
+		var parma={};
+        parma["areaCode"] = moralMap['params']["areaCode"];
+        parma["orgId"] = moralMap['params']["orgId"];
+        if (condition.type == "mpoint") {
+			parma["layer"] = "monitorpoints";
+			parma["markerKeys"] = [condition.id];
 		} else if (condition.type == "device") {
-			baiduMap.setZoom(18);
-			new moralMap.Equipment(condition);
-			moralMap.openInfoWindow(showEquipmentInfoWindow, new_point);
-			showEquipmentInfoWindow = null;
+			parma["layer"] = "equipments";
+			parma["markerKeys"] = [condition.mac];
 		}
+        //$("#searchParam").val(JSON.stringify(parma));
+		$.ajax({
+			type : "post",
+			url : "get-real-state-data",
+			data : JSON.stringify(parma),
+			dataType : "json",
+			contentType : "application/json;charset=utf-8",
+			cache : false,
+			async : true,
+			success : function(data) {
+				condition.state = data["extData"]["markers"][0]["state"];
+				if (condition.type == "mpoint") {
+					baiduMap.setZoom(17);
+					new moralMap.Monitorpoint(condition);
+					moralMap.openInfoWindow(showMonitorpointInfoWindow, new_point);
+					showMonitorpointInfoWindow = null;
+				} else if (condition.type == "device") {
+					baiduMap.setZoom(18);
+					new moralMap.Equipment(condition);
+					moralMap.openInfoWindow(showEquipmentInfoWindow, new_point);
+					showEquipmentInfoWindow = null;
+				}
+			}
+		});
+
 	}
 
 

--
Gitblit v1.8.0