From 0723049b7785749898fede88452055a66c49770e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 11:50:51 +0800
Subject: [PATCH] 地图相关资源
---
src/main/webapp/view/map.jsp | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 6473019..11ede8b 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -264,7 +264,7 @@
function showEqus(obj) {
var params = moralMap['params'];
var mpoint = obj.currentTarget.getOption();
- var url = 'get-devices?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
+ var url = 'get-devices-by-mid-oid?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
listView.load(url);
moralMap.showPopupbox("#popup_box");
}
@@ -310,7 +310,7 @@
}
function addOverEquipments(jsonData){
if(moralMap.layer()=="equipments"){
- var objs = jsonData["rows"]==null?[]:jsonData["rows"];
+ var objs = jsonData = null?[]:jsonData;
for(var i in objs) {
var obj = objs[i];
if(moralMap.getEquipment(obj["mac"])==null){
@@ -321,7 +321,7 @@
mac: (_obj['mac']).toLowerCase(),
longitude: _obj['longitude'],
latitude: _obj['latitude'],
- version:moralMap.getVersion(_obj['mac'])
+ version:_obj['deviceVersion']['version']
}
var equStr = JSON.stringify(equ);
if(window["console"]!=undefined){
@@ -367,13 +367,6 @@
});
//��������������������� ���������������,���������
moralMap.addEventListener("tilesloaded", function(type, target) {
-// var endZoom = this.getZoom();
-// if(endZoom>=moralMap.getZooMConfine()){//������������������������
-// loadOverlays("getequipments",addOverEquipments);
-// }else{
-// loadOverlays("get-monitorpoints",addOverMpoints);
-// }
-// moralMap.closePopupbox("#popup_box");
});
//������������������������������������������
moralMap.addEventListener('zoomstart', function(type) {});
@@ -381,7 +374,7 @@
moralMap.addEventListener('zoomend', function(type) {
var endZoom = this.getZoom();
if(endZoom>=moralMap.getZooMConfine()){//������������������������
- loadOverlays("getequipments",addOverEquipments);
+ loadOverlays("get-devices",addOverEquipments);
}else{
loadOverlays("get-monitorpoints",addOverMpoints);
}
@@ -390,7 +383,7 @@
moralMap.addEventListener('moveend', function(type) {
var endZoom = this.getZoom();
if(endZoom>=moralMap.getZooMConfine()){//������������������������
- loadOverlays("getequipments",addOverEquipments);
+ loadOverlays("get-devices",addOverEquipments);
}else{
loadOverlays("get-monitorpoints",addOverMpoints);
}
@@ -449,7 +442,7 @@
parma["orgId"] = moralMap['params']["orgId"];
$.ajax({
type: "post",
- url: "getstatesformap",
+ url: "get-real-state-data",
data:JSON.stringify(parma),
dataType:"json",
contentType:"application/json;charset=utf-8",
--
Gitblit v1.8.0