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

ZhuDongming

2019-08-12 a332264920c9cd9226d566c19e36e5d5b5549c1b

 src/main/webapp/view/map.jsp

@@ -278,14 +278,14 @@
         <div class="charts_btn">
         </div>
      </div>
       <div class="search_box">
       <!-- <div class="search_box">
      <button id="searchBtn" type="button">搜索</button>
      <input id="searchParam"/>
      </div>
     <div id="popup_box">
      </div> -->
     <!-- <div id="popup_box">
         <div id="equ_list" class="listview">
         </div>
     </div>
     </div> -->
     <div id="mapCanvas"></div>
     <div id="mapParams" style="display: none;">
        ${requestScope.mapParams}
@@ -316,7 +316,7 @@

      var params = moralMap['params'];
      var mpoint = obj.currentTarget.getOption();
        $("#searchParam").val(mpoint['name']);
        //$("#searchParam").val(mpoint['name']);
      var url = 'get-devices-by-mid-oid?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
      listView.load(url); 
      moralMap.showPopupbox("#popup_box");
@@ -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();
   });
   //地图加载完成后 加载监控点,速度慢
@@ -508,7 +509,7 @@
    }
   // 点击事件关闭 弹窗列表
    moralMap.addEventListener("click", function(type, target) {
        moralMap.closePopupbox("#popup_box");
        //moralMap.closePopupbox("#popup_box");
    });
   //地图放大缩小事件时，关闭弹窗
   moralMap.addEventListener('zoomstart', function(type) {});
@@ -520,7 +521,7 @@
        }else{
            loadOverlays("get-monitorpoints",addOverMpoints);
        }
        moralMap.closePopupbox("#popup_box");
        //moralMap.closePopupbox("#popup_box");
   });
   moralMap.addEventListener('moveend', function(type) {
        var endZoom = this.getZoom();
@@ -529,13 +530,13 @@
        }else{
            loadOverlays("get-monitorpoints",addOverMpoints);
        }
        moralMap.closePopupbox("#popup_box");
        //moralMap.closePopupbox("#popup_box");
   });
   //搜索框单击事件
   $("#searchBtn").click(
      function(e) {
         var param = encodeURI($("#searchParam").val());
         moralMap.showPopupbox("#popup_box");
         //moralMap.showPopupbox("#popup_box");
         var url = 'get-devices-for-popup?name=' + param + "&orgId=" + params['orgId'];
         listView.load(url); 
      }
@@ -582,12 +583,12 @@
   //刷新页面
   function refreshAllState() {
      var parma={};
      if(moralMap.isPopupBoxShow("#popup_box")) {
      /* if(moralMap.isPopupBoxShow("#popup_box")) {
         var popupEquMacs = moralMap.getPopupEquMacs();
         if(popupEquMacs!=null&&popupEquMacs.length>0){
            parma["popupEquMacs"] = popupEquMacs;
         }
      }
      } */
      //从缓存取
       var oldMarkerList = moralMap.getHorizonMarkers(true);
       var markerKeys = [];
@@ -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"]);
@@ -651,4 +664,16 @@
            });
      }
   }
	
   function 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;
         moralMap.refreshState(states);
      }
   }
</script>