From d3d3f559854042f8f71ece4e576cced226aa1605 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期三, 19 十二月 2018 17:41:32 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index de28ba3..5d6da13 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -202,13 +202,13 @@
<tr>
<td>绂荤嚎鐢靛帇闃�鍊�(V)</td>
<td>
- <input type="text" id="OfflineVolLevel" data-mini="true" />
+ <input type="text" id="OfflineVolLevel" class="unable" data-mini="true" />
</td>
</tr>
<tr>
<td>娴厖鐢垫祦闃�鍊�(A)</td>
<td>
- <input type="text" id="BattFloatCurrent" data-mini="true" />
+ <input type="text" id="BattFloatCurrent" class="unable" data-mini="true" />
</td>
</tr>
<tr>
@@ -260,7 +260,7 @@
</td>
</tr>
<tr>
- <td>鍩虹珯鍙风爜</td>
+ <td>鍩虹珯鐢佃瘽鍙风爜</td>
<td>
<input type="text" id="station_phone" data-mini="true" />
</td>
@@ -409,6 +409,12 @@
$('#OfflineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
}
+ $('#MonVolStd').change(function(){
+ setFloatAndoutLine();
+ });
+ $('#MonCount').change(function(){
+ setFloatAndoutLine();
+ })
function prefixInteger(num, length) {
return (num/Math.pow(3,length)).toFixed(length).substr(2);
}
@@ -428,7 +434,7 @@
,FbsDeviceIp: '127.0.0.1'
,FbsDeviceIp_YM: '255.255.255.0'
,FbsDeviceIp_WG: '127.0.0.1'
- ,FBSDeviceName: '璁惧鍚嶇О'
+ ,FBSDeviceName: 'BTS'
,GroupIndexInFBSDevice: 1
,BattGroupId: 1000005
,BattGroupNum: 2
@@ -458,13 +464,13 @@
// document.getElementById("city").value = data.StationName2; //甯�
// document.getElementById("county").value = data.StationName5; //鍖哄幙
// document.getElementById("StationName3").value = data.StationName3; //鏈烘埧鍚嶇О
- // document.getElementById("StationName4").value = data.StationName4; //璁惧鍚嶇О
+ document.getElementById("StationName4").value = data.StationName4; //璁惧鍚嶇О
document.getElementById("StationIp").value = data.StationIp; //璁惧IP
//document.getElementById("FBSDeviceId").value = dev_id;
document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;
document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;
- // document.getElementById("FBSDeviceName").value = data.FBSDeviceName;
+ document.getElementById("FBSDeviceName").value = data.FBSDeviceName;
//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
document.getElementById("BattGroupId").value = data.BattGroupId;
document.getElementById("BattGroupNum").value = data.BattGroupNum;
@@ -475,11 +481,11 @@
// document.getElementById("MonCount").value = data.MonCount;
// document.getElementById("MonCapStd").value = data.MonCapStd;
// document.getElementById("MonVolStd").value = data.MonVolStd;
- // document.getElementById("MonResStd").value = data.MonResStd;
- // document.getElementById("MonSerStd").value = data.MonSerStd;
- // document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
+ document.getElementById("MonResStd").value = data.MonResStd;
+ document.getElementById("MonSerStd").value = data.MonSerStd;
+ document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
// document.getElementById("Load_curr").value = data.Load_curr;
- // document.getElementById("DisCurrMax").value = data.DisCurrMax;
+ document.getElementById("DisCurrMax").value = data.DisCurrMax;
// document.getElementById("station_phone").value = data.station_phone;
// document.getElementById("BattProducer").value = data.BattProducer;
document.getElementById("BattModel").value = data.BattModel;
@@ -587,7 +593,8 @@
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
$("#sure").click(function(){
- addBatt();
+ creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
+ addBatt(); //鎻愪氦
//function backpage(){window.location.href="ele-param1.html";}
// setTimeout(backpage,500);
});
--
Gitblit v1.9.1