Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-06-12 9009798abd7abfd726bcda80267c7d53dd3b8da3

 src/main/webapp/view/map.jsp

@@ -357,6 +357,7 @@
          var maxBounds = moralMap.getMaxBounds();
          var paramMap = {};
          paramMap["orgId"]=  params['orgId'];
           paramMap["regionCode"]=  params['regionCode'];
          // 为了适配旧接口
            paramMap["Fe"]=  maxBounds.northeastLat;//东北角纬度，大一点
            paramMap["Ge"]=  maxBounds.northeastLng;//东北角经度，大一点
@@ -375,7 +376,7 @@
                    obj['mouseover'] = function (type) {
                        if(type.target.getData()==null){
                            //当前设备数据为空时，设备悬停事件中 刷新一下数据
                            refreshAllState();
                            //refreshAllState();
                        }
                    }
               obj['click'] = function(){
@@ -436,7 +437,7 @@
           paramMap["Ke"]=  bounds.southwestLat;//西北角纬度坐标，小一点
           paramMap["Le"]=  bounds.southwestLng;//西北角经度坐标，小一点
            loadLazy("getMonitorpointList",paramMap,addOverMpoints);
            startRefreshPage();
            //startRefreshPage();
            showGrid();
   });
   //地图加载完成后 加载监控点,速度慢
@@ -642,6 +643,18 @@
                                    }
                                }
                            }
                            
                            var equ = {
                               methodName : 'refreshState',
                              markers : markers,
                              layer : layer	
                           }
                            var equStr = JSON.stringify(equ);
                     if(window["console"]!=undefined){
                     }
                               if(!!window['external']&&!!window['external']['callWin']){
                                      window['external'].callWin(equStr);
                     }
                        }
                        if(resultMap["popupEquStates"]!=null){
                            listView.refreshState(resultMap["popupEquStates"]);
@@ -653,6 +666,28 @@
   }
   
   function callJS(jsonData){
      moralMap.callJS(jsonData);
      var jsonData = JSON.parse(jsonData);
      var methodName = jsonData.methodName;
      if("JumpBaiduMap" == methodName){
         moralMap.callJS(jsonData);
      } else if ("RefreshState" == methodName) {
         //$("#searchParam").val(JSON.stringify(jsonData));
         var states = jsonData.states;
         for(var i in states){
             var state = states[i];
             var mpoint = moralMap.getMpoint(state.id);
                if(mpoint!=null){
                    mpoint.refreshState(state.state);
                }
             for(var j in state.devices){
               var marker = state.devices[j];
                    var marker_mac = marker["mac"];
                    var equipment = moralMap.getEquipment(marker_mac);
                    if(equipment!=null){
                        equipment.refreshState(marker);
                    }		    
               }
          }
      }
   }
</script>