From 788489c7e95352a11cf5ec40a7a9c7277e5cc0f3 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 09:19:53 +0800
Subject: [PATCH] 安全跨域设置
---
src/main/webapp/view/map.jsp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 77896b8..6473019 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 = 'equipment/findAllEqu?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
+ var url = 'get-devices?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
listView.load(url);
moralMap.showPopupbox("#popup_box");
}
@@ -371,7 +371,7 @@
// if(endZoom>=moralMap.getZooMConfine()){//������������������������
// loadOverlays("getequipments",addOverEquipments);
// }else{
-// loadOverlays("getmonitorpoints",addOverMpoints);
+// loadOverlays("get-monitorpoints",addOverMpoints);
// }
// moralMap.closePopupbox("#popup_box");
});
@@ -383,7 +383,7 @@
if(endZoom>=moralMap.getZooMConfine()){//������������������������
loadOverlays("getequipments",addOverEquipments);
}else{
- loadOverlays("getmonitorpoints",addOverMpoints);
+ loadOverlays("get-monitorpoints",addOverMpoints);
}
moralMap.closePopupbox("#popup_box");
});
@@ -392,7 +392,7 @@
if(endZoom>=moralMap.getZooMConfine()){//������������������������
loadOverlays("getequipments",addOverEquipments);
}else{
- loadOverlays("getmonitorpoints",addOverMpoints);
+ loadOverlays("get-monitorpoints",addOverMpoints);
}
moralMap.closePopupbox("#popup_box");
});
@@ -401,7 +401,7 @@
function(e) {
var param = encodeURI($("#searchParam").val());
moralMap.showPopupbox("#popup_box");
- var url = 'equipment/findAllEqu?name=' + param + "&orgId=" + params['orgId'];
+ var url = 'get-devices-for-popup?name=' + param + "&orgId=" + params['orgId'];
listView.load(url);
}
)
--
Gitblit v1.8.0