BUGFIX-173

沈斌

2018-02-08 24d721e5b0299a0a12faf217f2cd1b21f711e547

 src/main/webapp/view/map.jsp

@@ -264,7 +264,7 @@
   function showEqus(obj) {
      var params = moralMap['params'];
      var mpoint = obj.currentTarget.getOption();
      var url = 'get-devices?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,18 +310,28 @@
   }
   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){
                    obj['mouseover'] = function (type) {
                        if(type.target.getData()==null){
                            //当前设备数据为空时，设备悬停事件中 刷新一下数据
                            refreshAllState();
                        }
                    }
               obj['click'] = function(){
                           var _obj = this.getOption();
                                       var _obj = this.getOption();
                                       if(_obj['mac']==null){
                                           alert("mac项未配置，请联系管理员设置");
                                           return;
                                       }
                                  var equ = {
                              name: _obj['name'],
                              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 +377,6 @@
   });
   //地图加载完成后 加载监控点,速度慢
   moralMap.addEventListener("tilesloaded", function(type, target) {
//        var endZoom = this.getZoom();
//        if(endZoom>=moralMap.getZooMConfine()){//超过界限加载设备
//              loadOverlays("getequipments",addOverEquipments);
//        }else{
//            loadOverlays("get-monitorpoints",addOverMpoints);
//        }
//        moralMap.closePopupbox("#popup_box");
   });
   //地图放大缩小事件时，关闭弹窗
   moralMap.addEventListener('zoomstart', function(type) {});
@@ -381,7 +384,7 @@
   moralMap.addEventListener('zoomend', function(type) {
        var endZoom = this.getZoom();
        if(endZoom>=moralMap.getZooMConfine()){//超过界限加载设备
              loadOverlays("getequipments",addOverEquipments);
              loadOverlays("get-devices",addOverEquipments);
        }else{
            loadOverlays("get-monitorpoints",addOverMpoints);
        }
@@ -390,7 +393,7 @@
   moralMap.addEventListener('moveend', function(type) {
        var endZoom = this.getZoom();
        if(endZoom>=moralMap.getZooMConfine()){//超过界限加载设备
              loadOverlays("getequipments",addOverEquipments);
              loadOverlays("get-devices",addOverEquipments);
        }else{
            loadOverlays("get-monitorpoints",addOverMpoints);
        }
@@ -417,7 +420,7 @@
         }
         setTimeout(function(){
            refreshAllState();
         },2000);
         },5000);
    }
    function stopRefreshPage(){
        window.clearInterval(_intervalNum);
@@ -449,7 +452,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",