From 2b2f80d07c341860e149bc6be8127c70e4d2e15e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 10:09:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/control.jsp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 771ee6c..8ccb32c 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1933,11 +1933,13 @@
 		//鏌ヨ鐢垫睜缁勭殑瀹炴椂鐘舵�佷俊鎭�
 		function showtable(){
 			//searbattrealInfomation();
-			searchDevStatusByDev_id();
 			findrtstate();
 			findrtdata();
 			//鏌ヨ璁惧鐨刣cdc鐘舵��
 			searchDevDcDcState();
+			
+			// 鏇存柊鎷撴墤鍥剧姸鎬�
+			searchDevStatusByDev_id();
 		}
 		
 		//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -2289,6 +2291,7 @@
 					table_index = 0;
 					createAllTbl(tbHd, tbBd, thVol, mon_vol_table_list);
 					title.setAvg(parseFloat(sum/array.length).toFixed(3));
+					title.setSum(sum);
 					getBattAlarmTitle(batt,"Voltage",title);
 					//title.alow = temp.alow;				//璁剧疆鐢靛帇鍛婅浣庡��	
 					//title.ahight = temp.ahight;			//璁剧疆鐢靛帇鍛婅楂樺��			
@@ -4606,6 +4609,7 @@
 			// 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
 			var menuItems = [
 				{txt: '鍩虹珯鏈哄巻鍗�', cla: 'home-info-card'},
+				{txt: '鏈烘埧闂璁板綍', cla: 'target', data:{target: 'batt-fault-manage.jsp'}},
 				{txt: '鏈烘埧瀹炴椂鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
 				{txt: '璁惧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
 				{txt: '鏈烘埧缁埅鑳藉姏鏌ヨ', cla: 'target', data: {target: 'batt-life-manage.jsp'}},

--
Gitblit v1.9.1