From 9834e917769dbdfa2b634f174e0ee8c32ddf539a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期六, 19 一月 2019 11:34:36 +0800
Subject: [PATCH] bug
---
gx_tieta/WebRoot/eleMonomer.jsp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/eleMonomer.jsp b/gx_tieta/WebRoot/eleMonomer.jsp
index 749f2ae..f2cce9f 100644
--- a/gx_tieta/WebRoot/eleMonomer.jsp
+++ b/gx_tieta/WebRoot/eleMonomer.jsp
@@ -1020,7 +1020,10 @@
arrChargeTd.push(testdata.sdata.test_cap.toFixed(1)); //娴嬭瘯瀹归噺
arrChargeTd.push(testdata.sdata.mon_num); //鍗曚綋缂栧彿
arrChargeTd.push(testdata.sdata.mon_vol.toFixed(3)); //鍗曚綋鐢靛帇
- var realCap=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,testdata.sdata.test_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Real)); //瀹為檯瀹归噺
+ console.info(testdata.sdata.test_curr);
+ var avg_curr = testdata.sdata.test_timelong>0?testdata.sdata.test_cap*3600/testdata.sdata.test_timelong:testdata.sdata.test_curr; //璁＄畻骞冲潎鐨勬斁鐢电數娴�
+ //console.info("avg="+avg_curr);
+ var realCap=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,avg_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Real)); //瀹為檯瀹归噺
//console.info(data[i].data.tdata.max_monvol);
arrChargeTd.push(realCap);
@@ -1029,7 +1032,7 @@
RealCaplist[testdata.sdata.mon_num-1].push(realCap);
- var rest=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,testdata.sdata.test_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Rest)); //鍓╀綑瀹归噺
+ var rest=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,avg_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Rest)); //鍓╀綑瀹归噺
arrChargeTd.push(rest);
arrChargeTd.push((realCap*100/testdata.binf.MonCapStd).toFixed(0)+"%"); //瀹归噺鐧惧垎姣�
if(realCap >= testdata.binf.MonCapStd*lowCA){
--
Gitblit v1.9.1