From d0e6f9233235ee68eb74b350f15717173918cc69 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 22 Nov 2018 15:20:58 +0800
Subject: [PATCH] update
---
src/main/webapp/js/moralmap.js | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 5017183..bc42550 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -956,17 +956,32 @@
}
moralMap.callJS = function(condition) {
- var condition = JSON.parse(condition);
- 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);
- moralMap.openInfoWindow(moralMap.getMpoint(condition.id)["infoWindow"], new_point);
- } else if (condition.type == "device") {
- baiduMap.setZoom(18);
- moralMap.openInfoWindow(moralMap.getEquipment(condition.mac)["infoWindow"], new_point);
- }
+ //$("#searchParam").val(condition);
+ //var condition = JSON.parse(condition);
+ 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);
+ if(moralMap.getMpoint(condition.id)){
+ moralMap.openInfoWindow(moralMap.getMpoint(condition.id)["infoWindow"], new_point);
+ }else {
+ //$("#searchParam").val(condition.id);
+ }
+ } else if (condition.type == "device") {
+ //baiduMap.centerAndZoom(new_point, 18);
+ baiduMap.setZoom(18);
+ if(moralMap.getEquipment(condition.mac)){
+ moralMap.openInfoWindow(moralMap.getEquipment(condition.mac)["infoWindow"], new_point);
+ } else {
+ //var equipment = new moralMap.Equipment(condition);
+ //moralMap.openInfoWindow(showInfoWindow, new_point);
+ //moralMap.openInfoWindow(equipment["infoWindow"], new_point);
+ //moralMap.openInfoWindow(moralMap.getEquipment(condition.mac)["infoWindow"], new_point);
+ //moralMap.callJS(condition);
+ }
+ }
}
--
Gitblit v1.8.0