fengxiang
2018-02-07 0723049b7785749898fede88452055a66c49770e
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-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("getmonitorpoints",addOverMpoints);
//        }
//        moralMap.closePopupbox("#popup_box");
   });
   //地图放大缩小事件时,关闭弹窗
   moralMap.addEventListener('zoomstart', function(type) {});
@@ -381,18 +374,18 @@
   moralMap.addEventListener('zoomend', function(type) {
        var endZoom = this.getZoom();
        if(endZoom>=moralMap.getZooMConfine()){//超过界限加载设备
              loadOverlays("getequipments",addOverEquipments);
              loadOverlays("get-devices",addOverEquipments);
        }else{
            loadOverlays("getmonitorpoints",addOverMpoints);
            loadOverlays("get-monitorpoints",addOverMpoints);
        }
        moralMap.closePopupbox("#popup_box");
   });
   moralMap.addEventListener('moveend', function(type) {
        var endZoom = this.getZoom();
        if(endZoom>=moralMap.getZooMConfine()){//超过界限加载设备
              loadOverlays("getequipments",addOverEquipments);
              loadOverlays("get-devices",addOverEquipments);
        }else{
            loadOverlays("getmonitorpoints",addOverMpoints);
            loadOverlays("get-monitorpoints",addOverMpoints);
        }
        moralMap.closePopupbox("#popup_box");
   });
@@ -401,7 +394,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); 
      }
   )
@@ -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",