From 47baad903367aab2cc21475ee8b15bb25a90fc97 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 09:55:16 +0800
Subject: [PATCH] 更新实时界面放电测试面板数据
---
gx_tieta/WebRoot/js/whyc-jqueryui.js | 36 ++++++++++++++++-
gx_tieta/WebRoot/control.jsp | 2
gx_tieta/WebRoot/js/dischargetest/bts.js | 36 ++++++++++++-----
3 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 5d1d84f..b972711 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -660,7 +660,7 @@
</tr>
<tr>
<th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 鍗囧帇涓婇檺 -->锛圴锛�</th>
- <th><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
+ <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
</tr>
<tr>
<td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index ae87870..bcc2597 100644
--- a/gx_tieta/WebRoot/js/dischargetest/bts.js
+++ b/gx_tieta/WebRoot/js/dischargetest/bts.js
@@ -39,8 +39,10 @@
// 鏀剧數鐢垫祦
$('#discurr').testVal({
pattern: /^[0-9]+(\.[0-9]*)?$/,
- regVal: false,
- msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ regVal: true,
+ min: 0,
+ max: 1000,
+ msg: '鍙栧�艰寖鍥�0~1000A'
});
// 鏀剧數灏忔椂鐜�
@@ -53,29 +55,37 @@
// 鏀剧數鐢靛
$('#discap').testVal({
pattern: /^[0-9]+$/,
- regVal: false,
- msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ regVal: true,
+ min: 0,
+ max: 90000,
+ msg: '鍙栧�艰寖鍥�0~90000AH'
});
// 鏀剧數鏃堕暱
$('#distime').testVal({
pattern: /^[0-9]+$/,
- regVal: false,
- msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ regVal: true,
+ min: 0,
+ max: 5940,
+ msg: '鍙栧�艰寖鍥�0~5940鍒嗛挓'
});
// 鍗曚綋涓嬮檺闃�鍊�
$('#MonomerVol_low').testVal({
pattern: /^[0-9]+(\.[0-9]*)?$/,
- regVal: false,
- msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ regVal: true,
+ min: 0,
+ max: 20,
+ msg: '鍙栧�艰寖鍥�0~20V'
});
// 缁勭涓嬮檺闃�鍊糋roupVol_low
$('#GroupVol_low').testVal({
pattern: /^[0-9]+(\.[0-9]*)?$/,
- regVal: false,
- msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ regVal: true,
+ min: 0,
+ max: 20,
+ msg: '鍙栧�艰寖鍥�0~60V'
});
// 鍗曚綋涓嬮檺鏁伴噺
@@ -203,7 +213,7 @@
// 璁剧疆鍙傛暟
function setBTSParam(list, errorStatus) {
//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){
@@ -222,6 +232,10 @@
$('#DCVolHighLimit').val(list[0].fsparam.DCVolHighLimit);
$('#ChargeCurrSet').val(list[0].fsparam.ChargeCurrSet);
$('#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锛�');
}
// 鏇存柊BTS璁惧娴嬭瘯淇℃伅
diff --git a/gx_tieta/WebRoot/js/whyc-jqueryui.js b/gx_tieta/WebRoot/js/whyc-jqueryui.js
index 44229af..4c655cf 100644
--- a/gx_tieta/WebRoot/js/whyc-jqueryui.js
+++ b/gx_tieta/WebRoot/js/whyc-jqueryui.js
@@ -490,6 +490,7 @@
// 鏍规嵁鏁版嵁鐨勬纭�т慨鏀规枃鏈鐨勬牱寮�
_proto.changeVal = function() {
var testVal = this;
+ this.ele.off('input propertychange blur focus');
// 鏂囨湰妗嗗唴瀹规敼鍙�
this.ele.on('input propertychange', function() {
@@ -515,9 +516,17 @@
ele.myTooltip('hide');
ele.removeClass('error-data');
- testVal.opts.btn.removeClass('whyc-btn-disabled');
+ // 閬嶅巻testVal.opts.btn鐨勫��
+ testVal.opts.btn.each(function() {
+ if(!$(this).hasClass('error-data')) {
+ $(this).removeClass('whyc-btn-disabled');
+ }
+
+ $(this).removeClass('error-data');
+ });
}else {
ele.next('i').addClass('error-data');
+ //console.log(testVal.opts.msg);
ele.myTooltip({
position: testVal.opts.position,
thing: 'show',
@@ -525,6 +534,15 @@
content: '<span style="color:#FF0000">'+testVal.opts.msg+'</span>'
});
ele.addClass('error-data');
+
+ // 閬嶅巻testVal.opts.btn鐨勫��
+ testVal.opts.btn.each(function() {
+ if(!$(this).hasClass('whyc-btn-disabled') && !$(this).hasClass('error-data')) {
+ $(this).addClass('whyc-btn-disabled');
+ }else {
+ $(this).addClass('whyc-btn-disabled error-data');
+ }
+ });
testVal.opts.btn.addClass('whyc-btn-disabled');
}
@@ -548,10 +566,11 @@
return flag;
};
+
_proto.error = function() {
console.info(this.opts.msg);
};
- $.fn.testVal = function(options) {
+ $.fn.testVal = function(options, attr, val) {
var defaults = {
pattern: "",
event: "changeVal",
@@ -563,13 +582,24 @@
max: 0,
position: 'bottom'
};
- var opts = $.extend(true, {}, defaults, options||{});
+ var opts = {};
+ // 鍒ゆ柇鏄惁涓烘洿鏂伴厤缃」
+ if(isString(options)) {
+ var oldOpts = this.data('testVal');
+ opts = $.extend({}, opts, oldOpts);
+ opts[attr] = val;
+ }else if(isObject(options)){
+ opts = $.extend(true, {}, defaults, options||{});
+ }
+ // console.log(opts);
if(opts.pattern.constructor.name != 'RegExp') {
opts.event = "error";
opts.msg = '璇疯緭鍏ユ纭殑姝ｅ垯琛ㄨ揪寮忔牸寮忥紒锛侊紒'
}
var testVal = new TestVal(this, opts);
+ this.data('testVal', testVal.opts);
+
testVal[opts.event]();
return this;
--
Gitblit v1.9.1