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

LiJun

2018-11-01 daf105a4c7cfd299d6473939b4d678a3e9f91f23

 gx_tieta/WebRoot/batt-life-manage.jsp

@@ -465,7 +465,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);

@@ -503,12 +503,12 @@
                  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);

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

					
            }

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

			
      }

      //首页

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