From b4b9c8587e72bc27804551b406f2e4f6ffc2cbb0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期二, 06 十一月 2018 11:24:07 +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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 8b93c25..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;
}
@@ -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(){
--
Gitblit v1.9.1