Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

 src/main/webapp/view/map.jsp

@@ -13,6 +13,7 @@
    <title></title>
    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=rER1sgBIcQxkfNSlm2wmBGZGgEERrooM"></script>
    <script type="text/javascript" src="/js/jquery.min.js"></script>
    <script type="text/javascript" src="/js/utils.js"></script>
   <script type="text/javascript">
        if(typeof (JSON) == 'undefined'){
           $.getScript("js/json2.js");
@@ -48,7 +49,17 @@
  padding:0;
  list-style:none;
}

a{
    color: #1900c6;
   text-decoration: none;
   cursor: pointer;
   font-size: 14px;
   font-weight: 300;
}
a:hover {
   text-decoration: underline;
   color: #e60012;
}
#popup_box {
   top: 75px;
   left: 20px;
@@ -289,15 +300,22 @@
   var moralMap = window.moralMap;
   var params = $.parseJSON($("#mapParams").html());
   moralMap['params'] = params;
    var mapType = getUrlParam("mapType");
    var mapOption = {};
    if(!!mapType && !!eval(mapType)) {
        mapOption["mapType"] = jieval(mapType);
    }
   //通过地区名称加载地图
   moralMap.mapInit(params["regionName"]);
   moralMap.mapInit(params["regionName"],mapOption);
   //列表对象
     var listView  =moralMap.initListView({id: "#equ_list",pageSize:12});
     window["listView"] = listView;
   //展示设备列表，click事件触发
   function showEqus(obj) {

      var params = moralMap['params'];
      var mpoint = obj.currentTarget.getOption();
        $("#searchParam").val(mpoint['name']);
      var url = 'get-devices-by-mid-oid?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
      listView.load(url); 
      moralMap.showPopupbox("#popup_box");
@@ -338,7 +356,12 @@
          var maxBounds = moralMap.getMaxBounds();
          var paramMap = {};
          paramMap["orgId"]=  params['orgId'];
          $.extend(paramMap,maxBounds);
          // 为了适配旧接口
            paramMap["Fe"]=  maxBounds.northeastLat;//东北角纬度，大一点
            paramMap["Ge"]=  maxBounds.northeastLng;//东北角经度，大一点
            paramMap["Ke"]=  maxBounds.southwestLat;//西北角纬度坐标，小一点
            paramMap["Le"]=  maxBounds.southwestLng;//西北角经度坐标，小一点
          // $.extend(paramMap,maxBounds);
         loadLazy(url,paramMap,callback);
       }
   }
@@ -361,6 +384,7 @@
                                           return;
                                       }
                                  var equ = {
                               methodName : 'showDeviceMonitor',
                              name: _obj['name'],
                              mac: (_obj['mac']).toLowerCase(),
                              longitude: _obj['longitude'],
@@ -372,7 +396,10 @@
                           if(window["console"]!=undefined){
                              console.log(equStr);
                           }
                            if(window['external']&&window['external']['showMonitorInfo']){
                                 if(!!window['external']&&!!window['external']['callWin']){
                                        window['external'].callWin(equStr);
                           }else
                            if(!!window['external']&&!!window['external']['showMonitorInfo']){
                                window['external'].showMonitorInfo(equStr);
                             }else{
                                alert(equStr);
@@ -403,10 +430,11 @@
            var bounds = moralMap.getBounds();
           paramMap["areaCode"]=  params['areaCode'];
           paramMap["orgId"]=  params['orgId'];
           paramMap["Fe"]=  bounds['Fe'];//东北角纬度，大一点
           paramMap["Ge"]=  bounds['Ge'];//东北角经度，大一点
           paramMap["Ke"]=  bounds['Ke'];//西北角纬度坐标，小一点
           paramMap["Le"]=  bounds['Le'];//西北角经度坐标，小一点
           // 为了适配旧接口
           paramMap["Fe"]=  bounds.northeastLat;//东北角纬度，大一点
           paramMap["Ge"]=  bounds.northeastLng;//东北角经度，大一点
           paramMap["Ke"]=  bounds.southwestLat;//西北角纬度坐标，小一点
           paramMap["Le"]=  bounds.southwestLng;//西北角经度坐标，小一点
            loadLazy("getMonitorpointList",paramMap,addOverMpoints);
            startRefreshPage();
   });
@@ -446,14 +474,25 @@
         var url = 'get-devices-for-popup?name=' + param + "&orgId=" + params['orgId'];
         listView.load(url); 
      }
   )
   );
   $("#searchParam").keydown(function (event) {
        if(event.keyCode ==13) {
            $("#searchBtn").trigger("click");
        }
    })
   //跳转表单页面按钮事件
   $(".charts_btn").click(
       function (e) {
            if(window['external']&&window['external']['showChartInfo']){
            var obj = {};
            obj['methodName'] = 'showChart';
            var objStr = JSON.stringify(obj);
            if(!!window['external']&&!!window['external']['callWin']){
                window['external'].callWin(objStr);
            }else
            if(!!window['external']&&!!window['external']['showChartInfo']){
                window['external'].showChartInfo("");
            }else{
                alert("");
                alert(objStr);
            }
        }
   );
@@ -499,49 +538,52 @@
       parma["markerKeys"] = markerKeys;
        parma["areaCode"] = moralMap['params']["areaCode"];
        parma["orgId"] = moralMap['params']["orgId"];
        $.ajax({
         type: "post",
         url: "get-real-state-data",
         data:JSON.stringify(parma),
         dataType:"json",
         contentType:"application/json;charset=utf-8",
         cache: false,
         async: true,
         success: function(data) {
            if(data!=null&&typeof data === 'object') {
                var resultMap = data["extData"];
                if(resultMap==null){
                   return;
                }
                  var markers = resultMap["markers"];
                  var layer = resultMap["layer"];
                  if(markers!=null&&markers.length>0){
                         if(layer=="monitorpoints"){
                             for(var a_i in markers){
                                var marker = markers[a_i];
                                var marker_id = marker["id"];
                                var mpoint = moralMap.getMpoint(marker_id);
                                if(mpoint!=null){
                                   mpoint.refreshState(marker["state"]);
                                }
        if((!!parma["popupEquMacs"]&&!!parma["popupEquMacs"].length)
         ||(!!parma["markerKeys"]&&!!parma["markerKeys"].length)){
            $.ajax({
                type: "post",
                url: "get-real-state-data",
                data:JSON.stringify(parma),
                dataType:"json",
                contentType:"application/json;charset=utf-8",
                cache: false,
                async: true,
                success: function(data) {
                    if(data!=null&&typeof data === 'object') {
                        var resultMap = data["extData"];
                        if(resultMap==null){
                            return;
                        }
                        var markers = resultMap["markers"];
                        var layer = resultMap["layer"];
                        if(markers!=null&&markers.length>0){
                            if(layer=="monitorpoints"){
                                for(var a_i in markers){
                                    var marker = markers[a_i];
                                    var marker_id = marker["id"];
                                    var mpoint = moralMap.getMpoint(marker_id);
                                    if(mpoint!=null){
                                        mpoint.refreshState(marker["state"]);
                                    }
//                           mpoint.refreshState(4);
                             }
                         }else{
                               for(var b_i in markers){
                                var marker = markers[b_i];
                                var marker_mac = marker["mac"];
                                var equipment = moralMap.getEquipment(marker_mac);
                                if(equipment!=null){
                                   equipment.refreshState(marker);
                                }
                               }
                         }
                  }
                  if(resultMap["popupEquStates"]!=null){
                     listView.refreshState(resultMap["popupEquStates"]);
                  }
            }
         }
      });
                                }
                            }else{
                                for(var b_i in markers){
                                    var marker = markers[b_i];
                                    var marker_mac = marker["mac"];
                                    var equipment = moralMap.getEquipment(marker_mac);
                                    if(equipment!=null){
                                        equipment.refreshState(marker);
                                    }
                                }
                            }
                        }
                        if(resultMap["popupEquStates"]!=null){
                            listView.refreshState(resultMap["popupEquStates"]);
                        }
                    }
                }
            });
      }
   }
</script>