From c398d5256db186bd280156fa63d62e13a3baa8d1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 14 Nov 2018 15:48:58 +0800
Subject: [PATCH] update
---
src/main/webapp/js/moralmap.js | 81 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 8ed51c0..1e927e5 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -697,6 +697,9 @@
}
return new BMap.InfoWindow(getAdressOutHtml(), winOpts);
})();
+ if (!showEquipmentInfoWindow) {
+ showEquipmentInfoWindow = infoWindow;
+ }
/*var infoWindow = (function() {
//���������������
@@ -779,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);
@@ -787,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){
@@ -799,20 +802,25 @@
}
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);
var _super_refreshState = moralMarker.refreshState;
- if (!showEquipmentInfoWindow) {
- showEquipmentInfoWindow = infoWindow;
- }
//$("#searchParam").val(option['mac']);
return $.extend(moralMarker, {
refreshState: function(data) {
@@ -960,35 +968,42 @@
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") {
- var parma={};
- parma["layer"] = "equipments";
- parma["markerKeys"] = [condition.mac];
- parma["areaCode"] = moralMap['params']["areaCode"];
- parma["orgId"] = moralMap['params']["orgId"];
- baiduMap.setZoom(18);
- //condition.data = {};
- new moralMap.Equipment(condition);
- moralMap.openInfoWindow(showEquipmentInfoWindow, new_point);
- showEquipmentInfoWindow = null;
- /*$.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) {
-
- }
- });*/
+ parma["layer"] = "equipments";
+ parma["markerKeys"] = [condition.mac];
}
+ //$("#searchParam").val(JSON.stringify(parma));
+ return;
+ $.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