From 7e424b1482b9d8971b8b738e7a165f3b09cb29e0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 15 Nov 2018 10:18:22 +0800
Subject: [PATCH] update
---
src/main/webapp/view/map.jsp | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 6ccc96b..fcf948d 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -278,14 +278,14 @@
<div class="charts_btn">
</div>
</div>
- <div class="search_box">
+ <!-- <div class="search_box">
<button id="searchBtn" type="button">������</button>
<input id="searchParam"/>
- </div>
- <div id="popup_box">
+ </div> -->
+ <!-- <div id="popup_box">
<div id="equ_list" class="listview">
</div>
- </div>
+ </div> -->
<div id="mapCanvas"></div>
<div id="mapParams" style="display: none;">
${requestScope.mapParams}
@@ -316,7 +316,7 @@
var params = moralMap['params'];
var mpoint = obj.currentTarget.getOption();
- $("#searchParam").val(mpoint['name']);
+ //$("#searchParam").val(mpoint['name']);
var url = 'get-devices-by-mid-oid?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
listView.load(url);
moralMap.showPopupbox("#popup_box");
@@ -391,7 +391,7 @@
longitude: _obj['longitude'],
latitude: _obj['latitude'],
monitorPointId: _obj['monitorPointId'],
- version:_obj['deviceVersion']['vers\t\t\t\t\t\t\t\t\t\tconsole.log(equStr);\nion']
+ version:_obj['deviceVersion']['version']
}
var equStr = JSON.stringify(equ);
if(window["console"]!=undefined){
@@ -508,7 +508,7 @@
}
// ������������������ ������������
moralMap.addEventListener("click", function(type, target) {
- moralMap.closePopupbox("#popup_box");
+ //moralMap.closePopupbox("#popup_box");
});
//������������������������������������������
moralMap.addEventListener('zoomstart', function(type) {});
@@ -520,7 +520,7 @@
}else{
loadOverlays("get-monitorpoints",addOverMpoints);
}
- moralMap.closePopupbox("#popup_box");
+ //moralMap.closePopupbox("#popup_box");
});
moralMap.addEventListener('moveend', function(type) {
var endZoom = this.getZoom();
@@ -529,13 +529,13 @@
}else{
loadOverlays("get-monitorpoints",addOverMpoints);
}
- moralMap.closePopupbox("#popup_box");
+ //moralMap.closePopupbox("#popup_box");
});
//���������������������
$("#searchBtn").click(
function(e) {
var param = encodeURI($("#searchParam").val());
- moralMap.showPopupbox("#popup_box");
+ //moralMap.showPopupbox("#popup_box");
var url = 'get-devices-for-popup?name=' + param + "&orgId=" + params['orgId'];
listView.load(url);
}
@@ -582,12 +582,12 @@
//������������
function refreshAllState() {
var parma={};
- if(moralMap.isPopupBoxShow("#popup_box")) {
+ /* if(moralMap.isPopupBoxShow("#popup_box")) {
var popupEquMacs = moralMap.getPopupEquMacs();
if(popupEquMacs!=null&&popupEquMacs.length>0){
parma["popupEquMacs"] = popupEquMacs;
}
- }
+ } */
//������������
var oldMarkerList = moralMap.getHorizonMarkers(true);
var markerKeys = [];
@@ -642,6 +642,18 @@
}
}
}
+
+ var equ = {
+ methodName : 'refreshState',
+ markers : markers,
+ layer : layer
+ }
+ var equStr = JSON.stringify(equ);
+ if(window["console"]!=undefined){
+ }
+ if(!!window['external']&&!!window['external']['callWin']){
+ window['external'].callWin(equStr);
+ }
}
if(resultMap["popupEquStates"]!=null){
listView.refreshState(resultMap["popupEquStates"]);
@@ -651,4 +663,8 @@
});
}
}
+
+ function callJS(jsonData){
+ moralMap.callJS(jsonData);
+ }
</script>
--
Gitblit v1.8.0