From f5d074139f55ca0d507430fd074508b056e588c9 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.9>
Date: 星期五, 21 十二月 2018 10:25:19 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index bffa62a..8ff0c27 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>
@@ -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);
+
}
// 鑾峰彇闈㈡澘淇℃伅鐨勫��
--
Gitblit v1.9.1