From 722e827a94213a478e0a4b62d3b590fc78d25737 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 06 Dec 2018 10:57:52 +0800
Subject: [PATCH] update
---
src/main/webapp/view/map.jsp | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 8a27995..4625ff3 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -263,12 +263,12 @@
border: 0;
height: 85px;
width: 85px;
- background:url(/screen_api_v2/img/charts_btn_bg_1.png) left top no-repeat;
+ background:url(/img/charts_btn_bg_1.png) left top no-repeat;
background-size: 70%;
}
.tools_box .charts_btn:hover {
cursor:pointer;
- background:url(/screen_api_v2/img/charts_btn_bg_2.png) left top no-repeat;
+ background:url(/img/charts_btn_bg_2.png) left top no-repeat;
background-size: 70%;
}
</style>
@@ -375,7 +375,7 @@
obj['mouseover'] = function (type) {
if(type.target.getData()==null){
//��������������������������������������������������� ������������������
- refreshAllState();
+ //refreshAllState();
}
}
obj['click'] = function(){
@@ -436,7 +436,7 @@
paramMap["Ke"]= bounds.southwestLat;//���������������������������������
paramMap["Le"]= bounds.southwestLng;//���������������������������������
loadLazy("getMonitorpointList",paramMap,addOverMpoints);
- startRefreshPage();
+ //startRefreshPage();
showGrid();
});
//��������������������� ���������������,���������
@@ -665,6 +665,28 @@
}
function callJS(jsonData){
- moralMap.callJS(jsonData);
+ var jsonData = JSON.parse(jsonData);
+ var methodName = jsonData.methodName;
+ if("JumpBaiduMap" == methodName){
+ moralMap.callJS(jsonData);
+ } else if ("RefreshState" == methodName) {
+ //$("#searchParam").val(JSON.stringify(jsonData));
+ var states = jsonData.states;
+ for(var i in states){
+ var state = states[i];
+ var mpoint = moralMap.getMpoint(state.id);
+ if(mpoint!=null){
+ mpoint.refreshState(state.state);
+ }
+ for(var j in state.devices){
+ var marker = state.devices[j];
+ var marker_mac = marker["mac"];
+ var equipment = moralMap.getEquipment(marker_mac);
+ if(equipment!=null){
+ equipment.refreshState(marker);
+ }
+ }
+ }
+ }
}
</script>
--
Gitblit v1.8.0