From c9704f2049fbca9f8cdf306d7b13bf78ff6eb169 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 09:10:20 +0800
Subject: [PATCH] 修改已审批

---
 gx_tieta/WebRoot/mobil/batt-approved1.html |  113 +++++++++++++++-----------------------------------------
 1 files changed, 31 insertions(+), 82 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index a52b1a0..5c8bf03 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -69,30 +69,6 @@
 								<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>
 											<td>鐪�</td>
 											<td>
 									            <input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
@@ -116,6 +92,25 @@
 												<input type="text" id="homeName"  class="unable" data-mini="true">        	
 											</td>
 										</tr>
+										<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>
+										
 										
 												<input type="hidden" id="StationName4" data-mini="true" />
 																			
@@ -278,17 +273,20 @@
    function creatBattView(index){
          var count=index+1
             ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
-             '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'
-            ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>' 
+             '<table class="layout-set">'+'<tbody>'/*+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'
+            ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'*/
+            ,battBrand='<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'鐢垫睜鍝佺墝'+count+' />'+'</td>'+'</tr>' 
             ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>' 
-            ,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup"  data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+' class="unable" '+'>'
-            ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'     
+          	,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'MonCount'+index+' data-mini="true"'+'value='+'鍗曚綋鏁伴噺'+count+' />'+'</td>'+'</tr>' 
+            //,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup"  data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+' class="unable" '+'>'
+            //,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'     
             ,MonVolStd='<tr>'+'<td>'+'*鏍囩О鍗曚綋鐢靛帇(V)'+'</td>'+'<td>'+'<input type="text" '+'id='+'MonVolStd'+index+' data-mini="true"'+' class="unable" '+'/>'+'</td>'+'</tr>'
-            ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</select>'
-             +'</fieldset>'+'</td>'+'</tr>' 
+            //,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</select>'
+            // +'</fieldset>'+'</td>'+'</tr>' 
+             ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'MonCapStd'+index+' data-mini="true"'+'value='+'鏍囩О瀹归噺'+count+' />'+'</td>'+'</tr>' 
             ,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' class="unable" '+' />'+'</tr>' 
             ,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' class="unable" '+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
-         return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;             
+         return battTitle+battBrand+battType+battNum+MonVolStd+nomCap+battIndex+battName;             
   }	
    function selectedNum(index){
      var selected='';
@@ -380,51 +378,6 @@
 		
 		installstartdata(temp);
 	});
-	
-	function creatgroupid(){
-		var dev_id ='';
-		$.ajax({
-				type: 'post'
-				,async: true
-				,url: 'BattInfAction!searchmaxdev_id'
-				,data: null
-				,dataType: 'json'
-				,success:function(res) {
-					console.info(res);
-					var data = JSON.parse(res.result);
-					console.info(data);
-					if(data.length!=0){
-						data = data.data;
-						dev_id = data;
-						//console.info(dev_id);
-						document.getElementById("FBSDeviceId").value = dev_id;
-						var ip = getDevIp(dev_id);
-						//console.info(ip);
-						document.getElementById("FbsDeviceIp").value = ip;
-					}else{
-						alert("groupid鐢熸垚澶辫触");
-					}
-				}   
-		
-		});	
-	}
-	// 鏍规嵁璁惧id璁$畻璁惧ip
-    function getDevIp(dev_id) {
-    	var ptn = /^91([0-9]{7})$/;
-    	var ip = '';
-    	console.info(dev_id);
-    	if(ptn.test(dev_id)) {
-    		var value = Number(RegExp.$1);
-    		// console.log(value);
-    		var intNum = prefixInteger(Math.floor(value/256), 3);
-    		var resNum = prefixInteger(value%256, 3);
-    		ip = '127.000.'+intNum+'.'+resNum;
-    	}else {
-    		ip = '璁惧ID鏍煎紡涓嶆纭�';
-    	}
-    	console.info(ip);
-    	return ip;
-    }
     
     function applyendyanshou(arr){   //鐢宠楠屾敹
 		var temp = JSON.stringify(arr);
@@ -460,11 +413,7 @@
 		console.info(vol);
  	}
  	
- 
-    function prefixInteger(num, length) {
- 		return (num/Math.pow(3,length)).toFixed(length).substr(2);
-	}
-	
+
 	//瀵煎叆琛ㄦ牸榛樿鏁版嵁
 	function installstartdata(temp){
 			data=temp[0].binf;
@@ -482,7 +431,7 @@
 			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("BattGroupId").value = data.BattGroupId;
 			document.getElementById("BattGroupNum").value = data.BattGroupNum;
 			//document.getElementById("BattGroupName").value = temp[15];
 			document.getElementById("FloatVolLevel").value = data.FloatVolLevel;

--
Gitblit v1.9.1