From 2a3e8af49bd9759f5691619578fa5503d8c86815 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期三, 02 一月 2019 11:41:37 +0800
Subject: [PATCH] IP修改功能不修改问题，电池组添加数量异常问题
---
gx_tieta/WebRoot/mobil/batt-edit2.html | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index cd8cb34..b2f1c92 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -73,8 +73,9 @@
<input type="hidden" type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
- <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
+ <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId0" class="uncheck" data-mini="true" />
+ <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId1" class="uncheck" data-mini="true" />
<td>鐪�</td>
<td>
<input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
@@ -101,8 +102,7 @@
<input type="hidden" id="StationName4" data-mini="true" />
-
-
+
<input type="hidden" id="StationIp" data-mini="true" />
<input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>
@@ -154,6 +154,10 @@
<input type="hidden" id="MonResStd" data-mini="true" />
<input type="hidden" id="MonSerStd" data-mini="true" />
<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
+ <input type="hidden" id="fuchongfazhi0" data-mini="true" />
+ <input type="hidden" id="fuchongfazhi1" data-mini="true" />
+ <input type="hidden" id="lixiandianyafazhi0" data-mini="true" />
+ <input type="hidden" id="lixiandianyafazhi1" data-mini="true" />
<tr>
<td>*璐熻浇鐢垫祦(A)</td>
@@ -294,8 +298,8 @@
console.info(temp);
var moncount = 0;
var tempgroupid = new Array() ;
- var fuchongfazhi = [0,0,0,0];
- var lixiandianyafazhi = [0,0,0,0];
+ //var fuchongfazhi = [0,0,0,0];
+ //var lixiandianyafazhi = [0,0,0,0];
for(var i=0;i<temp.length;i++){
tempgroupid.push(temp[i].binf.BattGroupId);
}
@@ -310,8 +314,7 @@
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
- //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
+ //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
installstartdata(temp);
});
@@ -369,10 +372,8 @@
var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊�
var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊�
- //$('#BattFloatCurrent').val(chargeVol); // 娴厖鐢靛帇闃�鍊�
- //$('#OfflineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
- fuchongfazhi[index] = chargeVol;
- lixiandianyafazhi[index] = outlineVol;
+ $("#fuchongfazhi"+index).val(chargeVol); // 娴厖鐢靛帇闃�鍊�
+ $("#lixiandianyafazhi"+index).val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
console.info(vol);
}
@@ -385,6 +386,8 @@
function installstartdata(temp){
data=temp[0].binf;
setMonVolStd(temp.length);
+ //creatgroupid();
+ var ip = getDevIp(data.FBSDeviceId);
document.getElementById("StationId").value = data.StationId;
document.getElementById("mainteArea").value = data.StationName1;
document.getElementById("city").value = data.StationName2; //甯�
@@ -392,17 +395,17 @@
document.getElementById("homeName").value = data.StationName3; //鏈烘埧鍚嶇О
document.getElementById("StationName4").value = data.StationName4; //璁惧鍚嶇О
document.getElementById("StationIp").value = data.StationIp; //璁惧IP
- document.getElementById("FBSDeviceId").value = data.FBSDeviceId;
- document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
+ document.getElementById("FBSDeviceId").value = data.FBSDeviceId;
+ document.getElementById("FbsDeviceIp").value = ip;
document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;
document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;
document.getElementById("FBSDeviceName").value = data.FBSDeviceName;
//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
- document.getElementById("BattGroupId").value = data.BattGroupId;
+
document.getElementById("BattGroupNum").value = data.BattGroupNum;
//document.getElementById("BattGroupName").value = temp[15];
- document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
- document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
+ //document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
+ //document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
//document.getElementById("MonCount").value = data.MonCount;
//document.getElementById("MonCapStd").value = data.MonCapStd;
@@ -421,6 +424,8 @@
document.getElementById("install_user").value = data.install_user;
for(var i=0;i<temp.length;i++){
data=temp[i].binf;
+ console.info(data.BattGroupId);
+ document.getElementById("BattGroupId"+i).value = data.BattGroupId;
document.getElementById("MonCapStd"+i).value = data.MonCapStd;
document.getElementById("MonVolStd"+i).value = data.MonVolStd;
console.info(data.MonCount);
@@ -470,11 +475,11 @@
FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(), // 缃戝叧
FBSDeviceName : $("#FBSDeviceName").val(), //璁惧鍚嶇О
GroupIndexInFBSDevice : i, //fbs璁惧绱㈠紩
- BattGroupId : $("#BattGroupId").val(), //鐢垫睜缁刬d
+ BattGroupId : $("#BattGroupId"+i).val(), //鐢垫睜缁刬d
BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿
BattGroupName : $(battString).val(),
- FloatVolLevel : fuchongfazhi[i], //娴厖鐢靛帇闃�鍊�
- OfflineVolLevel : lixiandianyafazhi[i], //绂荤嚎鐢靛帇闃�鍊�
+ FloatVolLevel : $("#fuchongfazhi"+i).val(), //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : $("#lixiandianyafazhi"+i).val(), //绂荤嚎鐢靛帇闃�鍊�
BattFloatCurrent : $("#BattFloatCurrent").val(), //娴厖鐢垫祦闃�鍊�
MonCount :$("#MonCount"+i).val(), //鍗曚綋鏁伴噺
MonCapStd : $("#MonCapStd"+i).val(), //鏍囩О瀹归噺
@@ -531,7 +536,9 @@
}
}
- function editBatt(){//
+
+ function editBatt(){
+ //creatgroupid(); //id锛宨p
console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
--
Gitblit v1.9.1