From b952c6ed66717e9fd221326be07d003b8549dff7 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.24>
Date: 星期一, 05 十一月 2018 16:24:43 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 192 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 181 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 4747b1f..10b3efc 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -965,6 +965,22 @@
<td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>
</tr>
<tr>
+ <th>IP鍦板潃</th>
+ <th>瀛愮綉鎺╃爜</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="sysSet_ip" readonly="readonly" value=""></td>
+ <td><input type="text" id="sysSet_subnet" readonly="readonly" value=""></td>
+ </tr>
+ <tr>
+ <th>缃戝叧鍦板潃</th>
+ <th>鐗╃悊鍦板潃</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="sysSet_netgate" readonly="readonly" value=""></td>
+ <td><input type="text" id="sysSet_mac" readonly="readonly" value=""></td>
+ </tr>
+ <tr>
<th>鎬荤画鑸椂闂�</th>
<th>淇濅竴娆′笅鐢电画鑸椂闂�</th>
</tr>
@@ -974,14 +990,14 @@
</tr>
<tr>
<th>鐢垫祦閽抽噺绋�</th>
- <th>涓�娆′笅鐢电數鍘�</th>
+ <th>涓�娆′笅鐢电數鍘�(V)</th>
</tr>
<tr>
<td><input type="text" id="sysSet_range" value=""></td>
<td><input type="text" id="sysSet_firVol" value=""></td>
</tr>
<tr>
- <th>浜屾涓嬬數鐢靛帇</th>
+ <th>浜屾涓嬬數鐢靛帇(V)</th>
<th>DCDC妯″潡鏁伴噺</th>
</tr>
<tr>
@@ -997,12 +1013,20 @@
<td><input type="text" id="sysSet_bleedNum" value=""></td>
</tr>
<tr>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�</th>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�</th>
+ <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�(V)</th>
+ <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�(V)</th>
</tr>
<tr>
<td><input type="text" id="sysSet_stopLimit" value=""></td>
<td><input type="text" id="sysSet_startLimit" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�</th>
+ <th>鑳屽厜鏃堕暱</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="sysSet_groupNum" value=""></td>
+ <td><input type="text" id="sysSet_backLightTime" value=""></td>
</tr>
</tbody>
</table>
@@ -4450,6 +4474,17 @@
// 绯荤粺鍙傛暟璁剧疆
$(function() {
+ var sysCMD = GLOBAL.CMD.sys;
+
+ // 鐐瑰嚮璇诲彇
+ $('#sysSet_read').click(function() {
+ var batt = getBatt();
+ var temp = {
+ dev_id:batt.FBSDeviceId
+ };
+ searchSysData(temp, true);
+ });
+
// 鐐瑰嚮璁剧疆绯荤粺鍙傛暟
$('#sysSet').click(function() {
var batt = getBatt();
@@ -4459,13 +4494,33 @@
searchSysData(temp);
});
+ // 璁剧疆
+ $('#sysSet_en').click(function() {
+ var tmp = getSysSetData();
+
+ updateSysData(tmp);
+ });
+
// 閲嶅惎璁惧
var resetPwd = '42ddc6374290e76908c1a0ba5f4caa19';
$("#sysSet_restart").click(function() {
layer.prompt({title: '杈撳叆閲嶅惎鍙ｄ护', formType: 1}, function(pass, index){
var _pass = hex_md5(pass);
if(_pass == resetPwd) {
- layer.msg('璁惧閲嶅惎');
+ // 鍏抽棴鍙ｄ护闈㈡澘
+ layer.close(index);
+ // 鏋勯�犻噸鍚懡鍚�
+ var batt = getBatt();
+ var temp = {
+ dev_id: batt.FBSDeviceId,
+ cmd: sysCMD.restart
+ };
+
+ console.log(temp);
+ layer.msg('鍔熻兘寮�鍙戜腑...');
+ return;
+ // 閲嶅惎
+ restartSys(temp);
}else {
layer.msg('鍙ｄ护杈撳叆閿欒');
}
@@ -4474,7 +4529,10 @@
// 鏌ヨ璁惧鐨勭郴缁熷弬鏁�
- function searchSysData(temp) {
+ function searchSysData(temp, showSU) {
+ // 寮�鍚瓑寰呮
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴
$.ajax({
type: "post",
url: "Fbs9100_sysparamAction_action_serchByCondition",
@@ -4487,34 +4545,120 @@
if(rs.code == 1){
var data = rs.data[0];
setSysSetData(data);
+ if(showSU) {
+ noContent.showNoContent('璇诲彇鎴愬姛', true);
+ }
}else{
noContent.showNoContent('鏌ヨ澶辫触!');
}
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ },
+ error: function() {
+ noContent.showNoContent('鏌ヨ澶辫触!');
+ // 鍏抽棴绛夊緟
+ layer.close(load);
}
});
}
+
+ // 鏇存柊绯荤粺鍙傛暟
+ function updateSysData(temp) {
+ // 寮�鍚瓑寰呮
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: "post",
+ url: "Fbs9100_sysparamAction_action_update",
+ async: true,
+ dataType: 'json',
+ data: "json = " + JSON.stringify(temp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ console.info(rs);
+ if(rs.code == 1){
+ noContent.showNoContent('鏇存柊鎴愬姛', true);
+ }else{
+ noContent.showNoContent('鏇存柊澶辫触!');
+ }
+
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ },
+ error: function() {
+ noContent.showNoContent('鏇存柊澶辫触!');
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ }
+ });
+ }
+
+ // 閲嶅惎璁惧
+ function restartSys(temp) {
+ // 寮�鍚瓑寰呮
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: "post",
+ url: "Fbs9100_sysparamAction_action_update",
+ async: true,
+ dataType: 'json',
+ data: "json = " + JSON.stringify(temp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ console.info(rs);
+ if(rs.code == 1){
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゆ垚鍔�', true);
+ }else{
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゅけ璐�!');
+ }
+
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ },
+ error: function() {
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゅけ璐�!');
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ }
+ });
+
+ }
+
+
// 鏍规嵁鏁版嵁璁剧疆闈㈡澘淇℃伅
function setSysSetData(data) {
$('#sysSet_dev_id').val(data.dev_id); // 璁惧ID
$('#sysSet_stationName').val(data.stationName); // 璁惧鍚嶇О
- $('#sysSet_endur').val(); // 鎬荤画鑸椂闂�
- $('#sysSet_firTime').val(); // 淇濅竴娆′笅鐢电画鑸椂闂�
+ $('#sysSet_ip').val(data.IPADDR); // ip鍦板潃
+ $('#sysSet_subnet').val(data.SubIPADDR); // 瀛愮綉鎺╃爜
+ $('#sysSet_netgate').val(data.NetGateADDR); // 缃戝叧
+ $('#sysSet_mac').val(data.MACADDR); // mac鍦板潃
+ $('#sysSet_endur').val(data.GroupVolRange); // 鎬荤画鑸椂闂�
+ $('#sysSet_firTime').val(data.GroupVolSorce); // 淇濅竴娆′笅鐢电画鑸椂闂�
$('#sysSet_range').val(data.CurrentRange); // 鐢垫祦閽抽噺绋�
- $('#sysSet_firVol').val(); // 涓�娆′笅鐢电數鍘�
- $('#sysSet_secVol').val(); // 浜屾涓嬬數鐢靛帇
+ $('#sysSet_firVol').val(data.CurrentTyte); // 涓�娆′笅鐢电數鍘�
+ $('#sysSet_secVol').val(data.MonomerOrder); // 浜屾涓嬬數鐢靛帇
$('#sysSet_dcdc').val(data.LoaderCount); // DCDC妯″潡鏁伴噺
$('#sysSet_sourceStyle').val(data.DtCardCount); // 鍗曚綋鏁版嵁鏉ユ簮绫诲瀷
$('#sysSet_bleedNum').val(data.PowerBreakChargeCurr); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
$('#sysSet_stopLimit').val(data.POF_BG_Boost_VolStop); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�
$('#sysSet_startLimit').val(data.POF_BG_Boost_VolStart); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�
+ $('#sysSet_groupNum').val(data.MajorBattGroupNum); // 鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�
+ $('#sysSet_backLightTime').val(data.BackLightTime); // 鑳屽厜鏃堕棿
+
sysSet_popup.showPopup();
}
// 鑾峰彇闈㈡澘淇℃伅鐨勫��
function getSysSetData() {
var dev_id = $('#sysSet_dev_id').val(); // 鏈烘埧id
- var stationName = $('#sysSet_stationName').val(); // 鏈烘埧鍚嶇О
+ //var stationName = $('#sysSet_stationName').val(); // 鏈烘埧鍚嶇О
+ var ip = $('#sysSet_ip').val(); // ip鍦板潃
+ var subnet = $('#sysSet_subnet').val(); // 瀛愮綉鎺╃爜
+ var netgate = $('#sysSet_netgate').val(); // 缃戝叧
+ var mac = $('#sysSet_mac').val(); // mac鍦板潃
var endur = $('#sysSet_endur').val(); // 鎬荤画鑸椂闂�
var firTime = $('#sysSet_firTime').val(); // 淇濅竴娆′笅鐢电画鑸椂闂�
var range = $('#sysSet_range').val(); // 鐢垫祦閽抽噺绋�
@@ -4525,6 +4669,32 @@
var bleedNum = $('#sysSet_bleedNum').val(); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
var stopLimit = $('#sysSet_stopLimit').val(); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�
var startLimit = $('#sysSet_startLimit').val(); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�
+ var groupNum = $('#sysSet_groupNum').val(); // 鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�
+ var backLightTime = $('#sysSet_backLightTime').val(); // 鑳屽厜鏃堕棿
+
+
+ var rs = {
+ dev_id: dev_id,
+ IPADDR: ip,
+ SubIPADDR: subnet,
+ NetGateADDR: netgate,
+ MACADDR: mac,
+ GroupVolRange: endur,
+ GroupVolSorce: firTime,
+ CurrentRange: range,
+ CurrentTyte: firVol,
+ MonomerOrder: secVol,
+ LoaderCount: dcdc,
+ DtCardCount: sourceStyle,
+ PowerBreakChargeCurr:bleedNum,
+ POF_BG_Boost_VolStop:stopLimit,
+ POF_BG_Boost_VolStart:startLimit,
+ MajorBattGroupNum:groupNum,
+ BackLightTime:backLightTime,
+ num: sysCMD.set
+ };
+
+ return rs;
}
});
--
Gitblit v1.9.1