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

81041

2018-11-06 b4b9c8587e72bc27804551b406f2e4f6ffc2cbb0

 gx_tieta/WebRoot/batt-life-manage.jsp

@@ -445,11 +445,9 @@
      function createSearchParam(){

         //alert($('#endu_type').val());

         //Page.pageCurr = $('#number').val();

         console.info(Page);

         var temp = {                     

            page:{

               pageSize:$('#number').val(),

               pageCurr:Page.pageCurr,

            },

            page:Page,

            stationName:$('#station_name').val(),               //机房名

            stationName5:$('#county').val(),

            stationName2:$('#city').val(),                     //市

@@ -457,7 +455,7 @@
            is_out_stand:$('#is_stand').val(),                           //是否掉站

            endurance_actual_timelong:$('#actual_timelong').val(),                  //实际

         };

         //console.info(temp);

         console.info(temp);

         return temp;

      }

      

@@ -465,7 +463,7 @@
      function searchBattLife(isLoad){

         var temp = createSearchParam();

         var json = JSON.stringify(temp);

         var arrTd = new Array();

         arrTd = new Array();

         var load;

         if(isLoad) {

            load = layer.load(1);

@@ -501,14 +499,16 @@
                     //arrTd[index++]=data[i].is_out_stand;

                  } 

                  Page.pageAll = data[data.length-1].page.pageAll;

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

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

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

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

               }

               

            }

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

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

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

               $('#page_num').val(Page.pageCurr);	
               createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);			
            }	
         });

			
      }

      //首页

      $('#home').click(function(){