From 954517b2ba6192ec535238edd4de1150d83941c1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期四, 06 十二月 2018 15:54:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/batt-state-manage.jsp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 3510401..052a8a7 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -708,7 +708,7 @@
 						$('#current').text(Page.pageCurr+"/"+pageNum);
 					}
 					layer.close(load);
-					createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+					createFullTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
 					
 					// 缁欐瘡涓�琛屾坊鍔犳暟鎹�
 					var trList = tblBd.find('tbody tr');
@@ -723,6 +723,11 @@
 			});
 		}
 		
+		// 椤甸潰瀹瑰櫒澶у皬鏀瑰彉瑙﹀彂
+		$(window).resize(function() {
+			setTblWidth(tblHd, tblBd);
+		});
+		
 		// 鑾峰彇缁埅鏃堕暱
 		function StringtoData(value){
 			var date1= value;  //寮�濮嬫椂闂�

--
Gitblit v1.9.1