From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 579c089..6e69e0d 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -2289,6 +2289,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;			//璁剧疆鐢靛帇鍛婅楂樺��			

--
Gitblit v1.9.1