From 0bd6f98d8c1c6cdaf767a0d60a49bd87ad3abc49 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@192.168.10.3>
Date: 星期四, 27 十二月 2018 16:50:24 +0800
Subject: [PATCH] 连接实时数据bug
---
gx_tieta/WebRoot/js/dischargetest/bts.js | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index bcc2597..719bef8 100644
--- a/gx_tieta/WebRoot/js/dischargetest/bts.js
+++ b/gx_tieta/WebRoot/js/dischargetest/bts.js
@@ -14,8 +14,14 @@
$('#btn_ensure').addClass('whyc-btn-disabled'); // 璁惧畾鍙傛暟鏃犳晥
},
active:function() {
- $('#btn_start_test').removeClass('whyc-btn-disabled'); // 鍚姩娴嬭瘯鍙互鐐瑰嚮
- $('#btn_ensure').removeClass('whyc-btn-disabled'); // 璁剧疆鍙傛暟鍙互鐐瑰嚮
+ if(!$('#btn_start_test').hasClass('no-remove-disabled')) {
+ $('#btn_start_test').removeClass('whyc-btn-disabled'); // 鍚姩娴嬭瘯鍙互鐐瑰嚮
+ }
+
+ if(!$('#btn_ensure').hasClass('no-remove-disabled')) {
+ $('#btn_ensure').removeClass('whyc-btn-disabled'); // 璁剧疆鍙傛暟鍙互鐐瑰嚮
+ }
+
},
startTest:function(param) {
if(param) {
@@ -84,7 +90,7 @@
pattern: /^[0-9]+(\.[0-9]*)?$/,
regVal: true,
min: 0,
- max: 20,
+ max: 60,
msg: '鍙栧�艰寖鍥�0~60V'
});
@@ -212,8 +218,8 @@
// 璁剧疆鍙傛暟
function setBTSParam(list, errorStatus) {
- //setDischageBattinfo(list[0].fsparam.BattGroupNum); //璁剧疆琚祴鐢垫睜缁勪俊鎭�
- console.log(list);
+ // setDischageBattinfo(list[0].fsparam.BattGroupNum); //璁剧疆琚祴鐢垫睜缁勪俊鎭�
+ // console.log(list);
if(list[0].fsparam.TestCmd == CMD_BTS_StartDischarge){
$('#discharge_type').val(CMD_BTS_StartDischarge);
}else if(list[0].fsparam.TestCmd == CMD_BTS_StartRESTest){
@@ -234,8 +240,16 @@
$('#TempUpHighLimit').val(list[0].fsparam.MonomerTmp_High);
// 鍏呯數鐢垫祦
- $('#ChargeCurrSet').testVal('option', 'msg', '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A');
- $('#ChargeCurrSetLabel').text('鍏呯數鐢垫祦锛�0~'+list[0].binf.charge_curr_max+'A锛�');
+ $('#ChargeCurrSet').testVal('option', 'allOpts', {
+ regVal: true
+ ,update: true
+ ,min: 0
+ ,max: list[0].binf.charge_curr_max
+ ,msg: '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A'
+ });
+
+ // 璁剧疆鏂囨湰鍊�
+ $('#ChargeCurrSetLabel .val-range').text('0~'+list[0].binf.charge_curr_max);
}
// 鏇存柊BTS璁惧娴嬭瘯淇℃伅
--
Gitblit v1.9.1