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-approved1.html |  276 +++++++++++++++++++++---------------------------------
 1 files changed, 108 insertions(+), 168 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 7a18bac..e62f748 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -57,13 +57,9 @@
 		
 		<!-- 澶撮儴鍐呭 -->
 		<div data-role="header" data-position="fixed">
-			<a href="batt-unapproved-index.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+			<a href="batt-approve-index.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
 			<h1>宸插鎵归�氳繃鏈烘埧璇︽儏</h1>
-			<fieldset data-role="controlgroup" class="ptr0" >
-		           
-		           
-			            
-		            	
+			<fieldset data-role="controlgroup" class="ptr0" >     	
 		        	</fieldset>
 			
 		</div>
@@ -72,30 +68,6 @@
 			<!-- <div class="set-option"> -->
 								<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>
@@ -117,64 +89,65 @@
 										<tr>
 											<td>鏈烘埧鍚嶇О</td>
 											<td>
-												<input type="text" id="homeName"  data-mini="true">
-									            	
+												<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" />
-											
-										
+																			
 												<input type="hidden" id="StationIp" data-mini="true" />
-											
-										
-										
-										
-											
+																						
 												<input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>	
+												
 												<input type="hidden" id="FbsDeviceIp_WG" class="unable"  data-mini="true" value="456"/>
+												
 												<input type="hidden" id="FBSDeviceName" data-mini="true" />
-											
-										
-									
-										
-										
-											
+																						
 												<input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
-											
 										
 												<input type="hidden" id="FloatVolLevel" data-mini="true" />
-											
-										
-											
+																															
 												<input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" />
 											
-										
-											
 												<input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
-											
-										
-										
-										
+									
 												<input type="hidden" id="MonResStd" data-mini="true" />	
+												
 												<input type="hidden" id="MonSerStd" data-mini="true" />
+												
 												<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
 										
 										<tr>
 											<td>*璐熻浇鐢垫祦(A)</td>
 											<td>
-												<input type="text" id="Load_curr" data-mini="true" />
+												<input type="text" id="Load_curr" class="unable" data-mini="true" />
 											</td>
-										</tr>
-										
-												<input type="hidden" id="DisCurrMax" data-mini="true" />
-											
-										
+										</tr>										
+												<input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
+
 										<tr>
 											<td>鍩虹珯鐢佃瘽鍙风爜</td>
 											<td>
-												<input type="text" id="station_phone" data-mini="true" />
+												<input type="text" id="station_phone" class="unable" data-mini="true" />
 											</td>
 										</tr>
 
@@ -185,28 +158,28 @@
 										<tr>
 											<td>*瀹夎浜哄憳</td>
 											<td>
-												<input type="text" id="install_user" data-mini="true" />
+												<input type="text" id="install_user" class="unable" data-mini="true" />
 											</td>
 										</tr>
 										
 										<tr>
 											<td>*閫氳璁℃暟</td>
 											<td>
-												<input type="text" id="tongxunnumber" data-mini="true" />
+												<input type="text" id="tongxunnumber" class="unable" data-mini="true" />
 											</td>
 										</tr>
 										
 										<tr>
 											<td>*涓㈠寘鐜�</td>
 											<td>
-												<input type="text" id="diubaonumber" data-mini="true" />
+												<input type="text" id="diubaonumber" class="unable" data-mini="true" />
 											</td>
 										</tr>
 										
 										<tr>
 											<td>*鏄惁楠屾敹</td>
 											<td>
-												<input type="text" id="check_en" data-mini="true" />
+												<input type="text" id="check_en" class="unable" data-mini="true" />
 											</td>
 										</tr>
 									</tbody>
@@ -247,10 +220,25 @@
 			<div data-role="navbar">
 				<ul>
 				  <li><a href="" id="applyyanshou"class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">鐢宠楠屾敹</a></li>
-				  <li><a href="" id="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="delete" data-role="button">瀹炴椂鏁版嵁</a></li>
+				  <li><a href="#yourPopup" id="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="delete" data-role="button">瀹炴椂鏁版嵁</a></li>
 				</ul>
 			</div>		
-		</div>   
+		</div>
+		<div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
+		<a href="#"  data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
+		          <h1>閫夋嫨鏌ョ湅鐢垫睜缁�</h1>
+		           <fieldset data-role="controlgroup" >	                      
+			            <select id="newbattnum" data-mini="true">
+			              <option value="1">鐢垫睜缁�1</option>
+			        
+			            </select>            	            	
+		        	</fieldset>
+		  
+		        	<div data-role="controlgroup" data-type="horizontal" class="mt6">
+                        <a href=""  id="sure" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check pl5" >纭畾</a>
+                        <a href=""  data-rel="back" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-delete pl5" >鍙栨秷</a> 
+                    </div>
+	     </div>      
 		<div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
 		<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
         <a href="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check" >鎻愪氦</a>
@@ -265,7 +253,7 @@
 <script type="text/javascript" src="src/layui.all.js"></script>
 <script type="text/javascript">	
 	function creatAllView(num){
-        var allString=''
+       var allString=''
            ,i=0;
        if(num>4){return false}
        for(i=0;i<num;i++){
@@ -274,40 +262,41 @@
      return $("#battdata").html(allString);   
   	} 
 	
-	$("#applyyanshou").on('click',function(){
-
-	})
-	
-	$("#shishishuju").on('click',function(){
-
-	})
-	
-  function creatBattView(index){
+	function battnumber(){
+       var selected=''
+       for(var i=1;i<=temp.length;i++){
+       		selected+= '<option '+'value='+i+'>'+"鐢垫睜缁�"+i+'</option>';	
+       }
+       return $('#newbattnum').html(selected); 
+  	}	
+		
+   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+'>'
-            ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>' 
-            ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'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+'>'
-            ,battNumOpt=selectedNum(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>'+'<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"'+'>'+creatMonCapOpt(index)+'</select>'
-             +'</fieldset>'+'</td>'+'</tr>' 
-            ,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' />'+'</tr>' 
-            ,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
-         return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;             
+            //,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+MonVolStd+nomCap+battIndex+battName;             
   }	
    function selectedNum(index){
-      var selected='';
+     var selected='';
     if(temp[index].binf.MonCount==4){  
     return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
   	}else{
-  	 return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
-  	
+  	 return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';	
   	}
   }
 
- 
    function selectedIndex(index){
        var selected='',
            i=0;
@@ -321,10 +310,20 @@
        }
        return selected; 
   }	
-  	var temp = getCookie("eleparm");
+  	var temp = getCookie("eleparm1");
 	temp=JSON.parse(temp);
 	var arr = temp;
 	
+	function setcookieCreat(i){
+		var index=Math.ceil(i-1);
+		arrdata = temp[index].binf;
+		//console.info(index);
+		//console.info(temp);
+		console.info(arrdata);
+		var json = JSON.stringify(arrdata);
+		setCookie("batt",json);
+		window.location.href="control.html"; 
+	}
 	// 鐐瑰嚮鐢宠楠屾敹鏄剧ず闈㈡澘
 	$("#applyyanshou").on('click',function(){
 		console.info(temp);
@@ -367,9 +366,10 @@
 	var moncount = 0;
 	var fuchongfazhi = [0,0,0,0];
 	var lixiandianyafazhi = [0,0,0,0];
+	battnumber();
    $(function(){
-   creatAllView(temp.length).trigger('create');
-   setMonVolStd(temp.length);
+	   creatAllView(temp.length).trigger('create');
+	   setMonVolStd(temp.length);
    });
 
 	$(function () {
@@ -378,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);
@@ -458,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;
@@ -480,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;
@@ -516,9 +467,11 @@
 				var battModel = "#batttype"+i;
 				var battproducer = "#battproducer"+i
 				//var battproducer ="#battproducer"+i; 
+				console.info(data);
 				$(battString).val(data.binf.BattGroupName);
 				$(battModel).val(data.binf.BattModel);
 				$(battproducer).val(data.binf.BattProducer);
+				$('#MonCount'+i).val(data.binf.MonCount)
 				console.info($(battproducer).val());
 			}
 	}
@@ -630,22 +583,13 @@
 <script type="text/javascript">  
 	$(function(){
 		$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
-	    $(function(){
-	   
-	    })
-		$("#sure").click(function(){
-			if(nullOrn()){
-				editBatt();
-			}else{
-			}				//楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱   
-	   		//function backpage(){window.location.href="ele-param1.html";}
-	 		// setTimeout(backpage,500); 
+			$("#sure").click(function(){
+			console.info($('#newbattnum').val());
+	       	setcookieCreat($('#newbattnum').val());
+	        //window.location.href="control.html"; 
+	        });  
 		});
-		$("#cancel").click(function(){
-	    	window.location.href="ele-param2.html";
-		});
-	});
- 	
+
  	function nullOrn(){
 	
 	 		return true;
@@ -754,10 +698,7 @@
           k=i*50;
           
            //optionStr+='<option'+' value='+k+'>'+k+'</option>';
-          optionStr+='<option'+' value='+k+'>'+k+'</option>';
-           
-          
-           
+          optionStr+='<option'+' value='+k+'>'+k+'</option>';   
           }
           allString=optionStr+'<option'+' selected=selected '+' value='+1000+'>'+1000+'</option>'
           return allString;
@@ -782,8 +723,7 @@
           for(var i=0;i<index;i++){
              var s='#MonVolStd'+i;
              $(s).val(12);
-          }
-         
+          }     
     }
   
     /* 鎿嶄綔鎴愬姛 

--
Gitblit v1.9.1