From daf105a4c7cfd299d6473939b4d678a3e9f91f23 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 17:37:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-life-manage.jsp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 8b93c25..e3b830e 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/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(){
--
Gitblit v1.9.1