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

81041

2018-10-23 cfa12a50f8e6de09a2e57fa8359dbec5e2b07628

 gx_tieta/WebRoot/batt-state-manage.jsp

@@ -447,9 +447,12 @@
            StationId: stationid?stationid:0,

            

         };

         //console.info(temp);

         return temp;

      }



      var myTimeOut;

      //查询机房状态

      function searchstationstate(){

         var temp = createSearchParam();

         arrTd = new Array();

@@ -467,7 +470,7 @@
                  //console.info(data.data);

                  var data = data.data;

                  //console.info(data[0].dev_id);

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

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

                     var _data = data[i];

                     arrTd[index++] = _data.stationName1;  //省

                     arrTd[index++] = _data.stationName2;   //市

@@ -476,7 +479,7 @@
                     // 停电

                     if(_data.station_stat_poff) {

                        arrTd[index++] = create_ali_font('icon-tingdian-', 'red', {msg:'停电异常'});

                        arrTd[index++] = _data.station_poff_start_time //停电开始时间

                        arrTd[index++] = _data.station_poff_start_time; //停电开始时间

                        arrTd[index++] = StringtoData(_data.station_poff_start_time);      //停电时长

                     }else {

                        arrTd[index++] = create_ali_font('icon-tingdian-', 'green', {msg: '正常'});

@@ -530,15 +533,19 @@
                  

                     arrTd[index++] = _data.station_temp; //温度

                     arrTd[index++] = _data.station_damp; //湿度

							
                     Page.pageAll = _data.page.pageAll;

                  }

                  Page.pageAll = data.length;

                  var pageNum=Math.ceil(Page.pageAll/Page.pageSize);

                  $('#total').text(Page.pageAll);

                  $('#current').text(Page.pageCurr+"/"+pageNum);

               }

               createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);

					
               window.clearTimeout(myTimeOut);

               myTimeOut = window.setTimeout(searchstationstate, 8000);

            }

         })	
         });

      }

      function StringtoData(value){

      var date1= value;  //开始时间

@@ -675,9 +682,12 @@
         {

            var _index = (i+1)%eleTh.length;

            var _icon = eleTd.eq(i).find('.icon');

            var _fa = eleTd.eq(i).find('.fa');

            if(_icon.length) {

               ArrTd+=eleTd.eq(i).find('.icon').data('msg')+"&";

            }else {

            }else if(_fa.length){

               ArrTd+=eleTd.eq(i).find('.fa').data('msg')+"&";

            }else{

               ArrTd+=eleTd.eq(i).text()+"&";

            }

         }