Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 48570adc584224ea2ebafc90a58beb76e85dd4be

 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); 
      }
   )