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 | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index a41089d..5d6da13 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -260,7 +260,7 @@
</td>
</tr>
<tr>
- <td>鍩虹珯鍙风爜</td>
+ <td>鍩虹珯鐢佃瘽鍙风爜</td>
<td>
<input type="text" id="station_phone" data-mini="true" />
</td>
@@ -434,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
@@ -483,7 +483,7 @@
// 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("MonVolLowToAvg").value = data.MonVolLowToAvg;
// document.getElementById("Load_curr").value = data.Load_curr;
document.getElementById("DisCurrMax").value = data.DisCurrMax;
// document.getElementById("station_phone").value = data.station_phone;
@@ -593,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