From 417c6db1ab7698f625bcc6452c2936981fade14b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 06 十二月 2018 12:19:34 +0800
Subject: [PATCH] 打开系统设置面板检测数据的正确性
---
gx_tieta/WebRoot/js/whyc-jqueryui.js | 1
gx_tieta/WebRoot/control.jsp | 11 ++++-
gx_tieta/WebRoot/js/dischargetest/sysData.js | 10 +++--
gx_tieta/WebRoot/pages/js/common.js | 58 +++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index bffa62a..cc6607f 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1026,7 +1026,7 @@
</tr>
<tr>
<th>鍗曚綋鏁版嵁鏉ユ簮绫诲瀷</th>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�0~2锛�</th>
+ <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�1~2锛�</th>
</tr>
<tr>
<td>
@@ -4833,10 +4833,10 @@
console.info(rs);
if(rs.code == 1){
var data = rs.data[0];
- setSysSetData(data);
// 绉婚櫎涓嶅彲鐐瑰嚮鐘舵��
initSysDataPopup();
$('#sysSet_en').removeClass('whyc-btn-disabled');
+ setSysSetData(data);
sysSet_popup.showPopup();
if(showSU) {
noContent.showNoContent('璇诲彇鎴愬姛', true);
@@ -4935,12 +4935,19 @@
$('#sysSet_secVol').val(data.MonomerOrder/10); // 浜屾涓嬬數鐢靛帇
$('#sysSet_dcdc').val(data.LoaderCount); // DCDC妯″潡鏁伴噺
$('#sysSet_sourceStyle').val(data.DtCardCount); // 鍗曚綋鏁版嵁鏉ユ簮绫诲瀷
+ //var POF_BG_Boost_Cnt = data.POF_BG_Boost_Cnt?data.POF_BG_Boost_Cnt:1;
$('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
$('#sysSet_stopLimit').val(data.POF_BG_Boost_VolStop); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�
$('#sysSet_startLimit').val(data.POF_BG_Boost_VolStart); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�
+ //var majorBattGroupNum = data.MajorBattGroupNum?data.MajorBattGroupNum:1;
$('#sysSet_groupNum').val(data.MajorBattGroupNum); // 鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�
$('#sysSet_backLightTime').val(data.BackLightTime); // 鑳屽厜鏃堕棿
$('#sysSet_powerBreakChargeCurr').val(data.PowerBreakChargeCurr); // 鍋滅數鍏呯數鐢垫祦
+
+
+ GLOBAL.testVal.check($('#sysSet_bleedNum'), $('#sysSet_bleedNum').data('testVal'), checkSysData);
+ GLOBAL.testVal.check($('#sysSet_groupNum'), $('#sysSet_groupNum').data('testVal'), checkSysData);
+
}
// 鑾峰彇闈㈡澘淇℃伅鐨勫��
diff --git a/gx_tieta/WebRoot/js/dischargetest/sysData.js b/gx_tieta/WebRoot/js/dischargetest/sysData.js
index b403882..caa164e 100644
--- a/gx_tieta/WebRoot/js/dischargetest/sysData.js
+++ b/gx_tieta/WebRoot/js/dischargetest/sysData.js
@@ -113,10 +113,12 @@
$('#sysSet_bleedNum').testVal({
pattern: /^[0-9]{1,4}$/,
regVal: true,
- min: 0,
+ min: 1,
max: 2,
- msg: '鍙栧�艰寖鍥�0~2锛堟暣鏁帮級'
+ msg: '鍙栧�艰寖鍥�1~2锛堟暣鏁帮級'
});
+
+
// 鑾峰彇绯荤粺鍙傛暟闈㈡澘鐨勬墍鏈夋枃鏈
$('#sysSet_popup').on('input propertychange', 'input[type=text]', function() {
checkSysData();
@@ -134,7 +136,7 @@
// 妫�娴嬬郴缁熷弬鏁版槸鍚﹀悎娉�
function checkSysData() {
var textList = sysSet_popup.popup.find('input[type=text]');
-
+ //console.log(123);
// 閬嶅巻妫�娴嬫枃鏈鏄惁鏈夐敊璇殑
var allGood = true;
textList.each(function(i) {
@@ -142,7 +144,7 @@
allGood = false;
}
});
-
+ //console.log(allGood);
// 璁剧疆鎸夐挳鐨勭姸鎬�
if(allGood) {
sysDataBtn.active();
diff --git a/gx_tieta/WebRoot/js/whyc-jqueryui.js b/gx_tieta/WebRoot/js/whyc-jqueryui.js
index c02f58d..10db128 100644
--- a/gx_tieta/WebRoot/js/whyc-jqueryui.js
+++ b/gx_tieta/WebRoot/js/whyc-jqueryui.js
@@ -484,6 +484,7 @@
var TestVal = function(ele, options) {
this.ele = ele;
this.opts = options;
+ this.ele.data('testVal', options);
};
var _proto = TestVal.prototype;
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 6587c43..ff2da15 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -487,6 +487,64 @@
})(jQuery, window, document, GLOBAL);
+// 鏂囨湰妗嗘暟鎹殑楠岃瘉
+;(function($, window, document, gl, undefined) {
+ // 瀹氫箟testVal鐨勫懡鍚嶇┖闂�
+ gl.namespace('testVal');
+ // 楠岃瘉鏁版嵁
+ function check(ele, ptn, callback) {
+ var val = ele.val();
+ var isGood = regVal(val, ptn);
+ setStyle(ele, isGood, ptn, callback);
+ }
+
+ // 灏嗘暟鎹粦瀹氬埌GLOBAL.testVal涓�
+ gl.testVal.check = check;
+
+ // 妫�娴嬫暟鎹殑鏈夋晥鎬�
+ function regVal(val, ptn) {
+ var flag = true;
+ var _val = val;
+
+ // 妫�楠屾暟鎹牸寮忔槸鍚︽湁鏁�
+ if(!ptn.pattern.test(_val)) {
+ flag = false;
+ }
+
+ // 妫�楠屾暟鎹槸鍚﹀湪鍙栧�煎尯闂�(鍓嶆彁鏄暟鎹牸寮忔纭笖鏈夊尯闂�)
+ if(flag && ptn.regVal) {
+ // val鍊间笉鍦ㄥ彇鍊艰寖鍥�
+ if(val<ptn.min || val>ptn.max) {
+ flag = false;
+ }
+ }
+
+ return flag;
+ }
+
+ // 璁剧疆鏂囨湰妗嗙殑鏍峰紡
+ function setStyle(ele, isGood, ptn, callback) {
+ if(isGood) {
+ ele.next('i').removeClass('error-data');
+ ele.myTooltip('hide');
+ ele.removeClass('error-data');
+ }else {
+ ele.next('i').addClass('error-data');
+ ele.myTooltip({
+ position: ptn.position,
+ thing: 'show',
+ update: ptn.update,
+ content: '<span style="color:#FF0000">'+ptn.msg+'</span>'
+ });
+ ele.addClass('error-data');
+ }
+ // 鏄惁鍥炶皟鍑芥暟
+ //console.log(callback);
+ if(isFunction(callback)) {
+ callback();
+ }
+ }
+})(jQuery, window, document, GLOBAL);
// 鐢熸垚闃块噷鍥炬爣鐨勫厓绱�
function create_ali_font(cla, color, data) {
--
Gitblit v1.9.1