From 03736d1a960da50232bcaadd983496785a50500f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 10:07:55 +0800
Subject: [PATCH] 修复显示错误提示的逻辑
---
gx_tieta/WebRoot/js/whyc-jqueryui.js | 7 ++++++-
gx_tieta/WebRoot/control.jsp | 2 +-
gx_tieta/WebRoot/js/dischargetest/bts.js | 18 +++++++++++++++---
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index b972711..6d095b9 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -679,7 +679,7 @@
</div>
</div>
<div class="popup-footer">
- <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 -->
+ <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled no-remove-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 -->
<input type="button" name="" id="btn_flush" value="璇诲彇" > <!-- 璇诲彇 -->
<input type="button" name="" id="btn_ensure" class="status-change-btn whyc-btn-disabled" value="璁惧畾" > <!-- 璁惧畾 -->
<!-- <input type="button" name="" id="bts_graph" value="鎷撴墤鍥�"> -->
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index bcc2597..a8eb593 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) {
@@ -234,7 +240,13 @@
$('#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锛�');
}
diff --git a/gx_tieta/WebRoot/js/whyc-jqueryui.js b/gx_tieta/WebRoot/js/whyc-jqueryui.js
index 4c655cf..040d77c 100644
--- a/gx_tieta/WebRoot/js/whyc-jqueryui.js
+++ b/gx_tieta/WebRoot/js/whyc-jqueryui.js
@@ -587,7 +587,12 @@
if(isString(options)) {
var oldOpts = this.data('testVal');
opts = $.extend({}, opts, oldOpts);
- opts[attr] = val;
+ if(attr == 'allOpts') {
+ opts = $.extend({}, opts, val);
+ }else {
+ opts[attr] = val;
+ }
+
}else if(isObject(options)){
opts = $.extend(true, {}, defaults, options||{});
}
--
Gitblit v1.9.1