From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 95 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 75 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 423c39b..4a45041 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1046,7 +1046,7 @@
<td><input type="text" id="sysSet_startLimit" value=""></td>
</tr>
<tr>
- <th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙1~2锛�</th>
+ <th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙0~2锛�</th>
<th>鑳屽厜鏃堕暱锛�0~999鍒嗛挓锛�</th>
</tr>
<tr>
@@ -1087,47 +1087,47 @@
<td><input type="text" id="battInfo_home_name" readonly="readonly" value=""></td>
</tr>
<tr>
- <th>鐢垫睜鏍囩О瀹归噺(AH)</th>
- <th>鐢垫睜鏍囩О鍐呴樆(u惟)</th>
+ <th>鐢垫睜鏍囩О瀹归噺锛�1~6000.0AH锛�</th>
+ <th>鐢垫睜鏍囩О鍐呴樆锛�1~60000u惟锛�</th>
</tr>
<tr>
<td><input type="text" id="battInfo_nom_cap" value=""></td>
<td><input type="text" id="battInfo_nom_res" value=""></td>
</tr>
<tr>
- <th>鐢垫睜缁勬暟</th>
- <th>姣忕粍鐢垫睜鍗曚綋鏁伴噺</th>
+ <th>鐢垫睜缁勬暟锛�1~2锛�</th>
+ <th>姣忕粍鐢垫睜鍗曚綋鏁伴噺锛�1~300 锛�</th>
</tr>
<tr>
<td><input type="text" id="battInfo_batt_num" value=""></td>
<td><input type="text" id="battInfo_batt_mon_num" value=""></td>
</tr>
<tr>
- <th>鍗曚綋鏍囩О鐢靛帇锛圴锛�</th>
- <th>鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�</th>
+ <th>鍗曚綋鏍囩О鐢靛帇锛�0.1~20.0V锛�</th>
+ <th>鐢垫睜缁勭鏍囩О鐢靛帇锛�0.1~600.0V锛�</th>
</tr>
<tr>
<td><input type="text" id="battInfo_batt_nom_vol" value=""></td>
<td><input type="text" id="battInfo_group_nom_vol" value=""></td>
</tr>
<tr>
- <th>鐢垫睜鏍囩О娓╁害锛堚剝锛�</th>
- <th>鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�</th>
+ <th>鐢垫睜鏍囩О娓╁害锛�0.1~60.0鈩冿級</th>
+ <th>鐢垫睜娴厖鐢靛帇闃�鍊硷紙0.1~60.0V锛�</th>
</tr>
<tr>
<td><input type="text" id="battInfo_batt_nom_temp" value=""></td>
<td><input type="text" id="battInfo_batt_float_vol" value=""></td>
</tr>
<tr>
- <th>鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�</th>
- <th>鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�</th>
+ <th>鐢垫睜娴厖鐢垫祦闃�鍊硷紙0.1~30.0A锛�</th>
+ <th>鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙0.1~60.0V锛�</th>
</tr>
<tr>
<td><input type="text" id="battInfo_batt_float_curr" value=""></td>
<td><input type="text" id="battInfo_online_low_vol" value=""></td>
</tr>
<tr>
- <th>鐢垫睜缁勮繛鎺ョ被鍨�</th>
+ <th>鐢垫睜缁勮繛鎺ョ被鍨�(0~1)</th>
</tr>
<tr>
<td><input type="text" id="battInfo_batt_link_type" value=""></td>
@@ -1138,7 +1138,7 @@
</div>
<div class="popup-footer">
<input type="button" name="" id="battInfo_read" value="璇诲彇" >
- <input type="button" name="" id="battInfo_en" class="status-change-set " value="璁剧疆" >
+ <input type="button" name="" id="battInfo_en" class="status-change-set whyc-btn-disabled" value="璁剧疆" >
</div>
</div>
@@ -1811,7 +1811,6 @@
$('.fir:first').next().children().eq(i).children().eq(0).css('display','none');
}
}
-
//alert(BattGroupId);
clearInterval(time);
searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
@@ -4563,6 +4562,7 @@
getBattStr();
searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
+ searchDevSDState();
clearInterval(time);
mygraph.graphtype = 4;
showtable();
@@ -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);
+
}
// 鑾峰彇闈㈡澘淇℃伅鐨勫��
@@ -5151,9 +5158,10 @@
// 鐢垫睜鍙傛暟
var battCMD = GLOBAL.CMD.batt; // cmd鍛戒护
var battPopup = GLOBAL.battInfoPopup; // 鐢垫睜鍙傛暟妯″潡
+ battPopup.testVal(); // 璁剧疆闈㈡澘鐨勫彇鍊艰寖鍥�
$('#battInfoBtn').click(function() {
+ // 鑾峰彇鐢垫睜淇℃伅
var batt = getBatt();
- // console.log(batt);
var temp = {
dev_id: batt.FBSDeviceId
};
@@ -5162,13 +5170,16 @@
var load = layer.load(1);
battPopup.search(temp, batt, function(res, binf) {
layer.close(load);
- // console.log(res);
+ battInfo_popup.showPopup(); // 鏄剧ずbattInfo_popup寮瑰嚭妗嗗拰閬僵灞�
});
- battInfo_popup.showPopup(); // 鏄剧ずbattInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+
});
// 鐐瑰嚮璁惧畾
$('#battInfo_en').click(function() {
+ if($(this).hasClass('whyc-btn-disabled')) {
+ return;
+ }
// 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
var load = layer.load(1);
battPopup.set(function(res) {
@@ -5179,11 +5190,24 @@
// 鐐瑰嚮璇诲彇
$('#battInfo_read').click(function() {
+ var batt = getBatt();
+ var temp = {
+ dev_id: batt.FBSDeviceId
+ };
// 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
var load = layer.load(1);
battPopup.read(function(res) {
layer.close(load);
- layer.msg('鑾峰彇鍙傛暟鎴愬姛');
+ // console.log(res);
+ if(res.code == 1) {
+ battPopup.search(temp, batt, function(res, binf) {
+ layer.close(load);
+ layer.msg('鑾峰彇鍙傛暟鎴愬姛');
+ });
+ }else {
+ layer.msg('鑾峰彇鍙傛暟澶辫触');
+ }
+
});
});
@@ -5199,7 +5223,7 @@
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
- console.log(rs);
+ //console.log(rs);
}
,complete: function() {
layer.close(load);
@@ -5295,6 +5319,37 @@
}
});
}
+
+
+ //鏌ヨ璁惧鐨凷D鍗＄姸鎬�
+ function searchDevSDState(){
+ var obj= getBatt();
+ var status = GLOBAL.circleStatus.status;
+ $.ajax({
+ type: "post",
+ url: "Bts_station_stateAction_action_serchSDCard",
+ async: true,
+ dataType: 'json',
+ data: "json = " + JSON.stringify(obj),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ //console.info(rs);
+ var sdStatus = rs.data?'宸叉彃鍏�': '<span style="color: #FF0000">鏈彃鍏�</span>';
+ //console.log(sdStatus);
+ status.setText('sdCard', "sd鍗＄姸鎬侊細"+sdStatus);
+ clearTimeout(searchDevSDState.timeout);
+ searchDevSDState.timeout = setTimeout(function() {
+ searchDevSDState();
+ }, 2000);
+ },
+ error: function() {
+ clearTimeout(searchDevSDState.timeout);
+ searchDevSDState.timeout = setTimeout(function() {
+ searchDevSDState();
+ }, 5000);
+ }
+ });
+ }
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
--
Gitblit v1.9.1