From f55be3227bfe7dfa13c45d014d6fc8cfc16dff42 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 10:08:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/dischargetest/bts.js | 71 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index d7439b0..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) {
@@ -39,8 +45,10 @@
// 鏀剧數鐢垫祦
$('#discurr').testVal({
pattern: /^[0-9]+(\.[0-9]*)?$/,
- regVal: false,
- msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ regVal: true,
+ min: 0,
+ max: 1000,
+ msg: '鍙栧�艰寖鍥�0~1000A'
});
// 鏀剧數灏忔椂鐜�
@@ -53,29 +61,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'
});
// 鍗曚綋涓嬮檺鏁伴噺
@@ -118,8 +134,8 @@
});
//鑾峰彇BTS璁惧鐨勬祴璇曞弬鏁扮瓑
-function searchBTSTestParam(temp){
- var is_showAlert = (arguments.length==1);
+function searchBTSTestParam(temp, acStart){
+ var is_showAlert = (acStart == undefined);
loading.showLoading();
$.ajax({
type: "post",
@@ -134,9 +150,13 @@
if(model.code == 1 && model.data != undefined && model.data.length>0){
setBTSParam(model.data, false);
if(is_showAlert){
- noContent.showNoContent("鑾峰彇娴嬭瘯鍙傛暟鎴愬姛");
+ noContent.showNoContent("鑾峰彇娴嬭瘯鍙傛暟鎴愬姛", true);
}
initPopup(BTS_popup);
+ if(!acStart) {
+ BTSBtn.startTest(false);
+ }
+
}else{
if(model.data != undefined && model.data.length>0){
setBTSParam(model.data, true);
@@ -199,7 +219,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){
@@ -218,6 +238,16 @@
$('#DCVolHighLimit').val(list[0].fsparam.DCVolHighLimit);
$('#ChargeCurrSet').val(list[0].fsparam.ChargeCurrSet);
$('#TempUpHighLimit').val(list[0].fsparam.MonomerTmp_High);
+
+ // 鍏呯數鐢垫祦
+ $('#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锛�');
}
// 鏇存柊BTS璁惧娴嬭瘯淇℃伅
@@ -236,10 +266,11 @@
var model = eval('('+data.result+')');
//console.info(model);
if(model.code == 1){
- noContent.showNoContent("淇敼娴嬭瘯鍙傛暟鎴愬姛");
+ noContent.showNoContent("淇敼娴嬭瘯鍙傛暟鎴愬姛", true);
var temp = {
num:CMD_61850_GETPARAM,
- dev_id:param.dev_id
+ dev_id:param.dev_id,
+ TestCmd: 0
};
searchBTSTestParam(temp,true); //閲嶆柊璇诲彇涓�娆℃祴璇曞弬鏁�
@@ -312,13 +343,13 @@
function showBTSContent(cmd, issuccess) {
if(cmd == CMD_BTS_Start){
if(issuccess){
- noContent.showNoContent("鍚姩娴嬭瘯鎴愬姛");
+ noContent.showNoContent("鍚姩娴嬭瘯鎴愬姛", true);
}else{
noContent.showNoContent("鍚姩娴嬭瘯澶辫触");
}
}else if(cmd == CMD_BTS_Stop){
if(issuccess){
- noContent.showNoContent("鍋滄娴嬭瘯鎴愬姛");
+ noContent.showNoContent("鍋滄娴嬭瘯鎴愬姛", true);
}else{
noContent.showNoContent("鍋滄娴嬭瘯澶辫触");
}
--
Gitblit v1.9.1