From c673a0b9ffe1f1239f596dfd88c0a76c735b3d43 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.106>
Date: 星期五, 28 十二月 2018 09:24:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/batt-edit2.html |   43 ++++++++++++-------------------------------
 1 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index 6b9a40e..686e3ad 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -78,30 +78,14 @@
 								<table class="layout-set">
 									<tbody>
 										<tr>
-											<td>鏈烘埧缂栧彿</td>
-											<td>
-												<input type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
-											</td>
-										</tr>
-										<tr>
-											<td>FBS璁惧ID(閲嶈)</td>
-											<td>
-												<input type="text" id="FBSDeviceId" class="unable" data-mini="true" onfocus="this.blur()"/>
-											</td>
-										</tr>
-										<tr>
-											<td>FBS璁惧IP(閲嶈)</td>
-											<td>
-												<input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" />
-											</td>
-										</tr>
-										<tr>
-											<td>鐢垫睜缁処D</td>
-											<td>
-												<input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
-											</td>
-										</tr>
-										<tr>
+												<input type="hidden" type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
+											
+												<input type="hidden" type="text" id="FBSDeviceId" class="unable" data-mini="true" />
+									
+												<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" />
+
 											<td>鐪�</td>
 											<td>
 									            <input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
@@ -434,8 +418,9 @@
  	}
  
     function prefixInteger(num, length) {
- 		return (num/Math.pow(3,length)).toFixed(length).substr(2);
+    	return (Array(length).join('0') + num).slice(-length);
 	}
+	
 	function creatBa(a){
         var battnum=4-a,
             opstring='';        
@@ -471,8 +456,7 @@
 			document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
 			document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
 			//document.getElementById("MonCount").value = data.MonCount;
-			//document.getElementById("MonCapStd").value = data.MonCapStd;
-			
+			//document.getElementById("MonCapStd").value = data.MonCapStd;		
 			document.getElementById("MonResStd").value = data.MonResStd;
 			document.getElementById("MonSerStd").value = data.MonSerStd;
 			document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
@@ -590,10 +574,7 @@
 	});
  	
  	function nullOrn(){
-	
-	 		return true;
-	 	
- 	
+	 		return true;	
  	}
  	
  	function editBatt(){//

--
Gitblit v1.9.1