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

hdw

2018-10-22 c0f92d69184f4764559c6d69e6101a2f50003aa8

 gx_tieta/WebRoot/batt-state-manage.jsp

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

            

         };

         console.info(temp);

         //console.info(temp);

         return temp;

      }



      var myTimeOut;

      //查询机房状态

      function searchstationstate(){

         var temp = createSearchParam();

         arrTd = new Array();

@@ -465,10 +467,10 @@
               var index = 0;

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

               if(data.code==1&&data.data!=null){

                  console.info(data.data);

                  //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;   //市

@@ -477,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: '正常'});

@@ -531,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;  //开始时间