From 9b5bed11d3b746a2cb6b16d1c7db3eb477c90743 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期三, 21 十一月 2018 12:35:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/dischargetest/bts.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index a8eb593..4f3f62c 100644
--- a/gx_tieta/WebRoot/js/dischargetest/bts.js
+++ b/gx_tieta/WebRoot/js/dischargetest/bts.js
@@ -90,7 +90,7 @@
pattern: /^[0-9]+(\.[0-9]*)?$/,
regVal: true,
min: 0,
- max: 20,
+ max: 60,
msg: '鍙栧�艰寖鍥�0~60V'
});
@@ -218,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){
@@ -247,6 +247,7 @@
msg: '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A'
});
+ // 璁剧疆鏂囨湰鍊�
$('#ChargeCurrSetLabel').text('鍏呯數鐢垫祦锛�0~'+list[0].binf.charge_curr_max+'A锛�');
}
--
Gitblit v1.9.1