update

xufenglei

2018-11-22 d0e6f9233235ee68eb74b350f15717173918cc69

 src/main/webapp/js/moralmap.js

@@ -956,16 +956,31 @@
   }

    moralMap.callJS = function(condition) {
      var condition = JSON.parse(condition);
       //$("#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);
          }
      }
   }