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/battData.js | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 158 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/js/dischargetest/battData.js b/gx_tieta/WebRoot/js/dischargetest/battData.js
index 28bfd63..3630984 100644
--- a/gx_tieta/WebRoot/js/dischargetest/battData.js
+++ b/gx_tieta/WebRoot/js/dischargetest/battData.js
@@ -4,6 +4,117 @@
gl.namespace('battInfoPopup');
// 妯″潡渚濊禆GLOBAL.CMD.batt妯″潡
var cmd = GLOBAL.CMD.batt;
+
+ // 鏁版嵁鏍￠獙
+ function testVal() {
+ // 鐢垫睜鏍囩О瀹归噺
+ $('#battInfo_nom_cap').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 1,
+ max: 6000,
+ msg: '鍙栧�艰寖鍥�1~6000.0'
+ });
+
+ // 鐢垫睜鏍囩О鍐呴樆
+ $('#battInfo_nom_res').testVal({
+ pattern: /^[0-9]{1,4}$/,
+ regVal: true,
+ min: 1,
+ max: 60000,
+ msg: '鍙栧�艰寖鍥�1~60000'
+ });
+
+ // 鐢垫睜缁勬暟
+ $('#battInfo_batt_num').testVal({
+ pattern: /^[0-9]{1,4}$/,
+ regVal: true,
+ min: 1,
+ max: 2,
+ msg: '鍙栧�艰寖鍥�1~2'
+ });
+
+ // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ $('#battInfo_batt_mon_num').testVal({
+ pattern: /^[0-9]{1,4}$/,
+ regVal: true,
+ min: 1,
+ max: 300,
+ msg: '鍙栧�艰寖鍥�1~300'
+ });
+
+ // 鍗曚綋鏍囩О鐢靛帇
+ $('#battInfo_batt_nom_vol').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 20,
+ msg: '鍙栧�艰寖鍥�0.1~20.0'
+ });
+
+ // 鐢垫睜缁勭鏍囩О鐢靛帇
+ $('#battInfo_group_nom_vol').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 600,
+ msg: '鍙栧�艰寖鍥�0.1~600.0'
+ });
+
+ // 鐢垫睜鏍囩О娓╁害
+ $('#battInfo_batt_nom_temp').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 60,
+ msg: '鍙栧�艰寖鍥�0.1~60.0'
+ });
+
+ // 鐢垫睜娴厖鐢靛帇闃�鍊�
+ $('#battInfo_batt_float_vol').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 60,
+ msg: '鍙栧�艰寖鍥�0.1~60.0'
+ });
+
+ // 鐢垫睜娴厖鐢垫祦闃�鍊�
+ $('#battInfo_batt_float_curr').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 30,
+ msg: '鍙栧�艰寖鍥�0.1~30.0'
+ });
+
+ // 鍦ㄧ嚎鐢靛帇浣庨榾鍊�
+ $('#battInfo_online_low_vol').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 60,
+ msg: '鍙栧�艰寖鍥�0.1~60.0'
+ });
+
+ // 鐢垫睜缁勮繛鎺ョ被鍨�
+ $('#battInfo_batt_link_type').testVal({
+ pattern: /^[0-9]{1,4}$/,
+ regVal: true,
+ min: 0,
+ max: 1,
+ msg: '鍙栧�艰寖鍥�0~1'
+ });
+
+ // 鍐呭鏀瑰彉璁剧疆鍊�
+ $('#battInfo_popup input[type=text]').on('input propertychange focus', function() {
+ setEnStatus();
+ });
+ }
+
+ // 灏唗estVal娣诲姞鍒癰attInfoPopup鍛藉悕绌洪棿涓�
+ gl.battInfoPopup.testVal = testVal;
+
// 鏌ヨ鏈烘埧鐨勪俊鎭�
function search(temp, binf, callback) {
// 鏌ヨ鐢垫睜鍙傛暟
@@ -15,7 +126,7 @@
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
-
+ init();
// 璁剧疆闈㈡澘淇℃伅
setParam(rs, binf);
if(isFunction(callback)) {
@@ -30,10 +141,23 @@
// 璇诲彇淇℃伅
function read(callback) {
- var param = getParam();
+ var param = {
+ dev_ip: $('#battInfo_ip').val() // 璁惧鐨刬p
+ ,dev_id: $('#battInfo_dev_id').val() // 璁惧鐨刬d
+ ,num: cmd.get // 鑾峰彇鐨勫懡浠�
+ ,STD_CAP: 0 // 鐢垫睜鏍囩О瀹归噺(AH)
+ ,STD_RES: 0 // 鐢垫睜鏍囩О鍐呴樆(u惟)
+ ,BattGroupCount: 0 // 鐢垫睜缁勬暟
+ ,EachGroupBattCount: 0 // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ ,MonomerVol: 0 // 鍗曚綋鏍囩О鐢靛帇锛圴锛�
+ ,GroupVol: 0 // 鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�
+ ,BattTemp: 0 // 鐢垫睜鏍囩О娓╁害锛堚剝锛�
+ ,FloatChargeVol: 0 // 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
+ ,FloatChargeCurr: 0 // 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
+ ,OnlineVolLow: 0 // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ ,GroupConnType: 0 // 鐢垫睜缁勮繛鎺ョ被鍨�
+ };
param.num = cmd.get;
- //console.log(param);
- //return;
// 璇诲彇鐢垫睜鍙傛暟
$.ajax({
@@ -44,9 +168,8 @@
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
- // console.log(rs);
// 鏍规嵁璇诲彇鍒扮殑淇℃伅璁剧疆闈㈡澘鐨勪俊鎭�
- //setParam(rs);
+ // setParam(rs);
// 鍥炶皟鍐呭
if(isFunction(callback)) {
@@ -129,7 +252,7 @@
var rs = {};
rs.dev_ip = $('#battInfo_ip').val(); // 璁惧鐨刬p
rs.dev_id = $('#battInfo_dev_id').val(); // 璁惧鐨刬d
- rs.num = cmd.set; // 璁剧疆鐨勫懡鍚�
+ rs.num = cmd.set; // 璁剧疆鐨勫懡浠�
rs.STD_CAP = $('#battInfo_nom_cap').val(); // 鐢垫睜鏍囩О瀹归噺(AH)
rs.STD_RES = $('#battInfo_nom_res').val(); // 鐢垫睜鏍囩О鍐呴樆(u惟)
rs.BattGroupCount = $('#battInfo_batt_num').val(); // 鐢垫睜缁勬暟
@@ -143,4 +266,32 @@
rs.GroupConnType = $('#battInfo_batt_link_type').val(); // 鐢垫睜缁勮繛鎺ョ被鍨�
return rs;
}
+
+ // 鍒濆鍖栬〃鏍煎唴瀹�
+ function init(data) {
+ //console.log(battInfo_popup);
+ var _popup = battInfo_popup.popup;
+ _popup.find('input[type=text]').removeClass('error-data');
+ _popup.find('.status-change-set').removeClass('whyc-btn-disabled');
+ _popup.data = data;
+ }
+
+ // 璁剧疆闈㈡澘鐨勮缃寜閽殑鐘舵��
+ function setEnStatus() {
+ var _popup = battInfo_popup.popup;
+ var iptList = _popup.find('input[type=text]');
+ var setEn = _popup.find('.status-change-set');
+ var isError = false;
+ iptList.each(function() {
+ if($(this).hasClass('error-data')) {
+ isError = true;
+ }
+ });
+
+ if(isError) {
+ _popup.find('.status-change-set').addClass('whyc-btn-disabled');
+ }else {
+ _popup.find('.status-change-set').removeClass('whyc-btn-disabled');
+ }
+ }
})(jQuery, window, document, GLOBAL);
\ No newline at end of file
--
Gitblit v1.9.1