From fbeabf181d160ee8a84c129456e5beb88c567847 Mon Sep 17 00:00:00 2001
From: cjj <Administrator@192.168.10.42>
Date: 星期二, 16 十月 2018 09:43:14 +0800
Subject: [PATCH] bug

---
 gx_tieta/WebRoot/batt-state-statistical.jsp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index c1df1cf..0e9aa18 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -285,14 +285,14 @@
 						$('#current').text(Page.pageCurr+"/"+pageNum);
 						var currentStartdata=Math.ceil((Page.pageCurr-1)*Page.pageSize);
 						var currenEnddata = 0;
-						if(Math.ceil(Page.pageAll-(Page.pageCurr-1)*Page.pageSize)<Page.pageSize){
-							currenEnddata = Math.ceil((Page.pageAll-(Page.pageCurr-1)*Page.pageSize)+(Page.pageCurr-1)*Page.pageSize);
+						if(Page.pageAll-(Page.pageCurr-1)*Page.pageSize<Page.pageSize){
+							currenEnddata =(Page.pageAll-(Page.pageCurr-1)*Page.pageSize)+(Page.pageCurr-1)*Page.pageSize;
 						}else{
-							currenEnddata = Math.ceil((Page.pageCurr)*Page.pageSize);
+							currenEnddata = (Page.pageCurr)*Page.pageSize;
 						}
-						console.info(currenEnddata);
+						//console.info(currenEnddata);
 						for(i=currentStartdata;i<currenEnddata;i++){
-						console.info(data);
+						//console.info(data);
 							ArrWarnTb[index++]=data[i].dev_ip;        //鍛婅鏃堕棿娈�
 							ArrWarnTb[index++]=data[i].stationName;   //鏈烘埧鍚嶇О 
 							ArrWarnTb[index++]=data[i].num;        		//鍋滅數

--
Gitblit v1.9.1