From 9dc2284659816c2a73e8483a44e8977d090f65c1 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期四, 10 一月 2019 14:52:23 +0800
Subject: [PATCH] 批量核容测试中去除单体数量和标称单体电压添加负载电流和在线电压
---
gx_tieta/WebRoot/batch-set-curr.jsp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 582651d..711c159 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -537,13 +537,12 @@
,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
,{field:'BattGroupId', title:'鐢垫睜缁処D', align:'center', width: 160}
,{field:'BattGroupName', title:'鐢垫睜缁勫悕绉�', align:'center', width: 160}
- ,{field:'devStatus', title:'璁惧鐘舵��', templet: '#devStatus', align:'center', width: 600}
+ ,{field:'devStatus', title:'璁惧鐘舵��', templet: '#devStatus', align:'center', width: 700}
,{field:'testTime', title:'宸叉祴鏃堕暱', templet: '#testTime', align:'center', width: 140}
,{field:'signalNum', title:'閫氫俊璁℃暟', templet: '#signalNum', align:'center', width: 140}
,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 160}
- ,{field:'MonCount', title:'鍗曚綋鏁伴噺', align:'center', width: 100}
+ ,{field:'Load_curr', title:'璐熻浇鐢垫祦', align:'center', width: 100}
,{field:'MonCapStd', title:'鏍囩О瀹归噺', align:'center', width: 100}
- ,{field:'MonVolStd', title:'鏍囩О鍗曚綋鐢靛帇', align:'center', width: 140}
,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160}
]]
,data:[]
@@ -855,7 +854,7 @@
// 鏋勯�犳壒閲忚缃斁鐢靛弬鏁扮殑鏂规硶
function getSetCurrParam(data, ratio) {
- //console.log(data);
+ // console.log(data);
var rs = [];
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -1181,12 +1180,14 @@
if(_data.dev_workstate ==0 && _data.dev_res_test_state != 0) {
index = 3;
}
+ var monCap = _data.dev_captest_cap==0?_data.dev_captest_cap:_data.dev_captest_cap.toFixed(1);
// 璁剧疆璁惧鐘舵�佸瓧绗︿覆
str = "鐘舵��:" + workStates[index]+
",鍛婅:"+alarmStates[_data.dev_alarmstate]+
",缁勭鐢靛帇(V):"+_data.dev_captest_groupvol+
+ ",鍦ㄧ嚎鐢靛帇(V):"+_data.dev_captest_onlinevol+
",鐢垫祦(A):"+_data.dev_captest_curr+
- ",瀹归噺(AH):"+_data.dev_captest_cap;
+ ",瀹归噺(AH):"+monCap;
// 璁剧疆璁惧鍐呴樆娴嬭瘯鐨勫瓧绗︿覆
if(index == 3){
str = "鐘舵��:"+workStates[index]+
--
Gitblit v1.9.1