From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.28> Date: 星期五, 19 十月 2018 14:15:51 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/batt-life-manage.jsp | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp index 78f0651..9730d20 100644 --- a/gx_tieta/WebRoot/batt-life-manage.jsp +++ b/gx_tieta/WebRoot/batt-life-manage.jsp @@ -393,21 +393,26 @@ //鏋勯�犳煡璇㈡潯浠� function createSearchParam(){ //alert($('#endu_type').val()); + //Page.pageCurr = $('#number').val(); var temp = { + page:{ + pageSize:$('#number').val(), + pageCurr:Page.pageCurr, + }, stationName:$('#station_name').val(), //鏈烘埧鍚� stationName2:$('#city').val(), //甯� stationName1:$('#station_name1').val(), //鐪� is_out_stand:$('#is_stand').val(), //鏄惁鎺夌珯 endurance_actual_timelong:$('#actual_timelong').val(), //瀹為檯 }; - console.info(temp); + //console.info(temp); return temp; } function searchBattLife(){ var temp = createSearchParam(); var json = JSON.stringify(temp); - var arr = new Array(); + var arrTd = new Array(); $.ajax({ type:"post", url:"Batt_enduranceAction!serchByCondition", @@ -417,7 +422,7 @@ success:function(data){ //console.info(data); var data = JSON.parse(data.result); - console.info(data); + //console.info(data); if(data.code==1&&data.data.length>0){ data=data.data; var index = 0; @@ -438,6 +443,10 @@ } //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); } -- Gitblit v1.9.1