From 4e9b0e6b045536b1361946978ed49efcfeffb180 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 09 一月 2019 16:50:59 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/charge-test.jsp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 2f55d26..6dd72f4 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -3058,7 +3058,8 @@
//console.info(title);
}else{
if("Voltage"==units){
- Titleobj.setAvg((sum/array.length).toFixed(3));
+ Titleobj.setAvg((sum/array.length).toFixed(3));
+ Titleobj.setSum(sum);
var low=getLow(1,1);
if(low.low_method==0){
//鏍规嵁鏍囩О鍊艰绠�
@@ -4171,7 +4172,7 @@
function getBattStr() {
var battInfo = getBattinfById();
//console.info(battInfo);
- var battStr = battInfo.StationName+'-'+battInfo.BattGroupName;
+ var battStr = battInfo.StationName+'-'+battInfo.BattGroupName+'-鏍囩О瀹归噺'+battInfo.MonCapStd+'AH';
$('#address_infor').text(battStr);
}
--
Gitblit v1.9.1