From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/dischargetest/bts.js | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index bcc2597..4f3f62c 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,7 +240,14 @@
$('#TempUpHighLimit').val(list[0].fsparam.MonomerTmp_High);
// 鍏呯數鐢垫祦
- $('#ChargeCurrSet').testVal('option', 'msg', '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A');
+ $('#ChargeCurrSet').testVal('option', 'allOpts', {
+ regVal: true,
+ min: 0,
+ max: list[0].binf.charge_curr_max,
+ msg: '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A'
+ });
+
+ // 璁剧疆鏂囨湰鍊�
$('#ChargeCurrSetLabel').text('鍏呯數鐢垫祦锛�0~'+list[0].binf.charge_curr_max+'A锛�');
}
--
Gitblit v1.9.1