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-fault-manage.jsp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index f26e2a1..e764ea4 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -329,11 +329,12 @@
 						tmp.question = data.error_descript;
 						tOptions.data.push(tmp);
     				}
+    				//tOptions.data.length = data.length;
     			}else {
 					layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
 				}
 				console.info(tOptions);
-				var pageNum = data.length;
+				var pageNum = tOptions.data.length;
 				console.info(pageNum);
 				tOptions.limit = pageNum;
 				// 璁剧疆鍒嗛〉淇℃伅

--
Gitblit v1.9.1