Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-10-26 e458320cba7664a484d3a763e288047edb74d55f

 gx_tieta/WebRoot/index.jsp

@@ -83,6 +83,12 @@
         overflow-y: auto; 

         overflow-x: hidden;

       }

       .BMapLib_bubble_content a {

          color: #2A3AF0;

       }

       .BMapLib_bubble_content a:hover {

          text-decoration: underline;

       }

       body .layui-layer-dialog {

          min-width:400px;

       }

@@ -364,6 +370,7 @@
   var search;

   var warnOpts;

   //console.info(BMap);

   var mapDefults = new Image().src = 'image/mapDefault.gif';

   var mapImages = getMapImageUrl();

   // 定义省-市资源内容

   var area = [

@@ -1763,7 +1770,7 @@
   

   function showMapPanel(target, warnList) {

      var point = target.point;

      console.log(target.getLabel());

      //console.log(target.getLabel());

      var searchInforWin = null;

      for(var i = 0; i < warnList.length; i++) {

         if(warnList[i].lng == point.lng && warnList[i].lat == point.lat) {

@@ -2108,7 +2115,7 @@
   

   var allStation = [];

   var mapPages = {

      pageSize:100,             // 每页的行数

      pageSize:50,             // 每页的行数

      pageCurr:1,              // 当前页码数

      pageAll:1,               // 数目

      pageNum: 0,

@@ -2197,6 +2204,7 @@
           data: "json="+JSON.stringify(mapPages),

           success: function(result) {

              var data = JSON.parse(result.result);

              console.log(data);

              for(var i=0; i<data.length; i++) {

                 var _data = data[i];

                 var _list =  formatUpdateStation(_data);

@@ -2208,6 +2216,7 @@
                 }

              }

              

              console.log(updateStationData);

              createMapDot(map, updateStationData);

              

              // 更新分页信息

@@ -2246,7 +2255,6 @@
         alert('面板信息查询失败！');

         return;

      }

		
      var temp = {

         StationId: stationInfo.sId

      };

@@ -2859,6 +2867,7 @@
      rs.devalarm = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_dev_alarm}";   // 设备告警

      rs.precharge = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_pre_charge}";   // 预充电

      rs.float = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_online_charge}";   // 浮充

      rs.defaults = mapDefults;

      return rs;

   }

   /* $(function(){

@@ -3137,6 +3146,9 @@
    function getMapStateImg(imgs, cla) {

       var rs = imgs.normal;

       switch(cla) {

          case 'item-normal':

             rs = imgs.normal;

             break

          case 'item-warn':   // 告警

             rs = imgs.warn;

             break;

@@ -3158,6 +3170,9 @@
          case 'item-pre_charge':   // 61850预充电

             rs = imgs.precharge;

             break;

          default:

             rs = imgs.defaults;

             break;

       }

       

       return rs;