From 4fa214f38cb5a19599655636a8ea4e25eaf496a3 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 03 十一月 2018 15:10:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-life-manage.jsp | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index e3b830e..ec5da09 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/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;
}
@@ -501,10 +499,12 @@
//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);
}
+
+ 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);
}
});
--
Gitblit v1.9.1