From 41f38696f096edde8158e07ee129111e3deddcb7 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@LAPTOP-E51P2139>
Date: 星期四, 27 十二月 2018 01:46:23 +0800
Subject: [PATCH] ok

---
 gx_tieta/WebRoot/mobil/batt-edit2.html                  |  125 +++++++++++++++-----
 gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html       |   28 +++-
 gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html |  157 +++++++++++++++----------
 3 files changed, 201 insertions(+), 109 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index 74b3196..7446f82 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -160,10 +160,10 @@
 												<input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
 											
 										
-										<tr>
+										<!-- <tr>
 											<td>*鍗曚綋鏁伴噺</td>
 											<td>
-												<!-- <input type="text" id="MonCount" data-mini="true" /> -->
+												<input type="text" id="MonCount" data-mini="true" />
 												
 											      <fieldset data-role="controlgroup" data-type="horizontal">
 											        <label for="four">4 涓�</label>
@@ -191,7 +191,7 @@
 										            </select>
 									        	</fieldset>
 											</td>
-										</tr>
+										</tr> -->
 										
 												<input type="hidden" id="MonResStd" data-mini="true" />	
 												<input type="hidden" id="MonSerStd" data-mini="true" />
@@ -290,16 +290,29 @@
   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+'>'
+             '<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>'+'<input type="text" '+'id='+'battnum'+index+' data-mini="true"'+'value='+'鐢垫睜鏁伴噺'+count+' />'+'</td>'+'</tr>' 
-            ,nomCap='<tr>'+'<td>'+'鏍囩О瀹归噺'+'</td>'+'<td>'+'<input type="text" '+'id='+'nomCap'+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>'     
+            ,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()+'</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+nomCap+battIndex+battName; 
+        return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName; 
                
   }	
+  
+  function selectedNum(index){
+      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>';
+  	
+  	}
+  }
   function creatBa(a){
         var battnum=4-a,
             opstring='';        
@@ -333,6 +346,8 @@
 	console.info(temp);
 	var moncount = 0;
 	var tempgroupid = new Array() ;
+	var fuchongfazhi = [0,0,0,0];
+	var lixiandianyafazhi = [0,0,0,0];
 	for(var i=0;i<temp.length;i++){
 		tempgroupid.push(temp[i].binf.BattGroupId);
 	}
@@ -340,7 +355,10 @@
 	var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
    $(function(){
    creatAllView(temp.length).trigger('create');
+   //creatMonCapOpt(temp.length);
+   setMonVolStd(temp.length);
    creatBa(temp.length).trigger('create');
+   
    });
  
     
@@ -399,17 +417,21 @@
     	return ip;
     }
     
-  	 // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�   //
-  	function setFloatAndoutLine(monnum) {
-  		var vol = $('#MonVolStd').val();
-  		//var monnum = $('#MonCount').val();
+ // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�   //
+  	function setFloatAndoutLine(index) {
+  		var monvolstd = "#MonVolStd"+index;
+  		var MonCount = "#MonCount" +index;
+  		var vol = $(monvolstd).val();
+  		var monnum = $(MonCount).val();
   		var chargeVol = (vol*1.117*monnum).toFixed(1);		// 娴厖鐢靛帇闃�鍊�
 		var outlineVol = (vol*1.073*monnum).toFixed(1);		// 绂荤嚎鐢靛帇闃�鍊�
 	
-		$('#BattFloatCurrent').val(chargeVol);		// 娴厖鐢靛帇闃�鍊�
-		$('#OfflineVolLevel').val(outlineVol);	// 绂荤嚎鐢靛帇闃�鍊�
+		//$('#BattFloatCurrent').val(chargeVol);		// 娴厖鐢靛帇闃�鍊�
+		//$('#OfflineVolLevel').val(outlineVol);	// 绂荤嚎鐢靛帇闃�鍊�
+		fuchongfazhi[index] = chargeVol;
+		lixiandianyafazhi[index] = outlineVol;
+		console.info(vol);
  	}
- 	
  
     function prefixInteger(num, length) {
  		return (num/Math.pow(3,length)).toFixed(length).substr(2);
@@ -428,6 +450,7 @@
 	//瀵煎叆琛ㄦ牸榛樿鏁版嵁
 	function installstartdata(temp){
 			data=temp[0].binf;
+			setMonVolStd(temp.length);
 			document.getElementById("StationId").value = data.StationId;
 			document.getElementById("mainteArea").value = data.StationName1;
 			document.getElementById("city").value = data.StationName2;			//甯�
@@ -448,8 +471,8 @@
 			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("MonVolStd").value = data.MonVolStd;
+			//document.getElementById("MonCapStd").value = data.MonCapStd;
+			
 			document.getElementById("MonResStd").value = data.MonResStd;
 			document.getElementById("MonSerStd").value = data.MonSerStd;
 			document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
@@ -465,6 +488,10 @@
 			document.getElementById("install_user").value = data.install_user;		
 			for(var i=0;i<temp.length;i++){
 				data=temp[i].binf;
+				document.getElementById("MonCapStd"+i).value = data.MonCapStd;
+				document.getElementById("MonVolStd"+i).value = data.MonVolStd;
+				console.info(data.MonCount);
+				$("#MonCount"+i).find("option:selected").val(data.MonCount);
 				var battString = "#battname"+i;
 				var battModel = "#batttype"+i;
 				var battproducer = "#battproducer"+i
@@ -484,7 +511,7 @@
 			var arr = new Array();
 			
 			for(var i=0;i<temp.length;i++){
-				setFloatAndoutLine(moncount);
+				setFloatAndoutLine(i);
 				var battString = "#battname"+i;
 				var battModel = "#batttype"+i;
 				var battproducer ="#battproducer"+i; 
@@ -514,12 +541,12 @@
 						BattGroupId : $("#BattGroupId").val(),				//鐢垫睜缁刬d
 						BattGroupNum : $("#BattGroupNum").val(),			//鏈烘埧鍐呯數姹犵粍缂栧彿
 						BattGroupName : $(battString).val(),
-						FloatVolLevel : $("#FloatVolLevel").val(),			//娴厖鐢靛帇闃�鍊�
-						OfflineVolLevel : $("#OfflineVolLevel").val(),			//绂荤嚎鐢靛帇闃�鍊�
+						FloatVolLevel : fuchongfazhi[i],			//娴厖鐢靛帇闃�鍊�
+						OfflineVolLevel : lixiandianyafazhi[i],			//绂荤嚎鐢靛帇闃�鍊�
 						BattFloatCurrent : $("#BattFloatCurrent").val(),		//娴厖鐢垫祦闃�鍊�
-						MonCount : moncount,				//鍗曚綋鏁伴噺
-						MonCapStd : $("#MonCapStd").val(),				//鏍囩О瀹归噺
-						MonVolStd : $("#MonVolStd").val(),				//鏍囩О鐢靛帇
+						MonCount :$("#MonCount"+i).val(),				//鍗曚綋鏁伴噺
+						MonCapStd : $("#MonCapStd"+i).val(),				//鏍囩О瀹归噺
+						MonVolStd : $("#MonVolStd"+i).val(),				//鏍囩О鐢靛帇
 						MonResStd : $("#MonResStd").val(),				//鏍囩О鍐呴樆
 						MonSerStd : $("#MonSerStd").val(),				//鏍囩О鐢靛
 						MonVolLowToAvg : $("#MonVolLowToAvg").val(),			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
@@ -528,7 +555,7 @@
 						DisCurrMax : $("#DisCurrMax").val(),				//鏈�澶ф牳瀹圭數娴�
 						station_phone : $("#station_phone").val(),			//鍩虹珯鍙风爜
 										
-						BattProducer : $(battproducer).val(),			//鐢垫睜鍝佺墝
+						BattProducer : $("#battproducer"+i).find("option:selected").val(),			//鐢垫睜鍝佺墝
 						BattModel : $(battModel).val(),				//鐢垫睜鍨嬪彿
 						BattProductDate :  $("#startTestrecord").val(),		//鐢垫睜鐢熶骇鏃ユ湡
 						BattInUseDate :  $("#endTestrecord").val(),			//鐢垫睜浣跨敤鏃ユ湡
@@ -547,7 +574,7 @@
 	$(function(){
 		$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
 	    $(function(){
-	   
+	       
 	    })
 		$("#sure").click(function(){
 			if(nullOrn()){
@@ -618,16 +645,7 @@
 銆�銆�銆�銆�}
    });
    
-   function creatMonCapOpt(){
-       var k,optionStr='',allString;
-     for(var i=1;i<11;i++){
-          k=i*50;
-          optionStr+='<option'+' value='+k+'>'+k+'</option>'; 
-     }
-     allString=optionStr+'<option'+' value='+1000+'>'+1000+'</option>'
-   $("#MonCapStd").html(allString);
-   }
-   creatMonCapOpt();
+   
    
    $('#newbattnum').change(function(){
     	var numbattnum = parseInt($('#newbattnum').val());
@@ -637,6 +655,45 @@
     	creatAllView(addbattnum).trigger('create');
     	creatBattGroupId(addbattnum);
    });
+   function creatMonCapOpt(suoyin){
+        var optionStr,allString;
+       
+        for(var i=1;i<11;i++){
+        
+          k=i*50;
+          
+           //optionStr+='<option'+' value='+k+'>'+k+'</option>';
+          optionStr+='<option'+' value='+k+'>'+k+'</option>';
+           
+          
+           
+          }
+          allString=optionStr+'<option'+' selected=selected '+' value='+1000+'>'+1000+'</option>'
+          return allString;
+      
+          
+   }
+   function setMonVolStd(suoyin){
+         for(var u=0;u<suoyin;u++){  
+           var id='';  
+          id='#MonCount'+u; 
+          (function(u){
+              var vol='#MonVolStd'+u;
+	          $(document).on("change", id, function () {
+	                 if($(this).find("option:selected").val()==4){$(vol).val(12);}
+	                 if($(this).find("option:selected").val()==24){$(vol).val(2);} 
+	          })
+          })(u)
+               
+         }    
+   }
+   function setMonVolStd(index){
+          for(var i=0;i<index;i++){
+             var s='#MonVolStd'+i;
+             $(s).val(12);
+          }
+         
+    }
     /* 鎿嶄綔鎴愬姛 
    $('#changeSuc').popup('open');
        鎿嶄綔澶辫触
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 14ef5dd..527b3d7 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -247,7 +247,7 @@
   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+'>'
+             '<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>'  
              
@@ -552,6 +552,7 @@
                 ,install_user: 'test'
             };
             console.info(data.StationId);
+            setMonVolStd(temp.length);
 			creatgroupid();
 			document.getElementById("StationId").value = data.StationId;
 	//		document.getElementById("mainteArea").value = data.StationName1;
@@ -607,7 +608,7 @@
 				setFloatAndoutLine(i);
 				var battString = "#battname"+i;
 				var battModel = "#batttype"+i;
-				var battproducer ="#battproducer"+i; 
+				//var battproducer ="#battproducer"+i; 
 				var id = $('fieldset div div input[data-cacheval=\'true\']').val();
 				var inputVal = $(id).val();
 				//var input =$(four).option()
@@ -637,9 +638,9 @@
 						FloatVolLevel : fuchongfazhi[i],			//娴厖鐢靛帇闃�鍊�
 						OfflineVolLevel : lixiandianyafazhi[i],			//绂荤嚎鐢靛帇闃�鍊�
 						BattFloatCurrent : $("#BattFloatCurrent").val(),		//娴厖鐢垫祦闃�鍊�
-						MonCount : moncount,				//鍗曚綋鏁伴噺
-						MonCapStd : $("#MonCapStd").val(),				//鏍囩О瀹归噺
-						MonVolStd : $("#MonVolStd").val(),				//鏍囩О鐢靛帇
+						MonCount :$("#MonCount"+i).val(),				//鍗曚綋鏁伴噺
+						MonCapStd : $("#MonCapStd"+i).val(),				//鏍囩О瀹归噺
+						MonVolStd : $("#MonVolStd"+i).val(),				//鏍囩О鐢靛帇
 						MonResStd : $("#MonResStd").val(),				//鏍囩О鍐呴樆
 						MonSerStd : $("#MonSerStd").val(),				//鏍囩О鐢靛
 						MonVolLowToAvg : $("#MonVolLowToAvg").val(),			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
@@ -648,10 +649,10 @@
 						DisCurrMax : $("#DisCurrMax").val(),				//鏈�澶ф牳瀹圭數娴�
 						station_phone : $("#station_phone").val(),			//鍩虹珯鍙风爜
 										
-						BattProducer : $(battproducer).find("option:selected").val(),			//鐢垫睜鍝佺墝
+						BattProducer : $("#battproducer"+i).find("option:selected").val(),			//鐢垫睜鍝佺墝
 						BattModel : $(battModel).val(),				//鐢垫睜鍨嬪彿
-						BattProductDate :  $("#startTestrecord").val()+" 00:00:00",		//鐢垫睜鐢熶骇鏃ユ湡
-						BattInUseDate :  $("#endTestrecord").val()+" 00:00:00",			//鐢垫睜浣跨敤鏃ユ湡
+						BattProductDate :  $("#startTestrecord").val(),		//鐢垫睜鐢熶骇鏃ユ湡
+						BattInUseDate :  $("#endTestrecord").val(),			//鐢垫睜浣跨敤鏃ユ湡
 						install_user : $("#install_user").val(),			//瀹夎浜哄憳
 					}
 				}
@@ -708,10 +709,10 @@
  				console.info(data);
  				if(data.code==1){
  					alert("娣诲姞鎴愬姛");
- 					//window.location.href="batt-unapproved.html";
+ 					window.location.href="batt-unapproved.html";
  				}else{
  					alert("娣诲姞澶辫触");
- 					//window.location.href="batt-unapproved.html";
+ 					window.location.href="batt-unapproved.html";
  				}
  			}
  		});
@@ -766,6 +767,13 @@
          }    
    }
    setMonVolStd(suoyin);
+   function setMonVolStd(index){
+          for(var i=0;i<index;i++){
+             var s='#MonVolStd'+i;
+             $(s).val(12);
+          }
+         
+    }
    
     /* 鎿嶄綔鎴愬姛 
    $('#changeSuc').popup('open');
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index 4bde9de..2275c57 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -160,38 +160,7 @@
 												<input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
 											
 										
-										<tr>
-											<td>*鍗曚綋鏁伴噺</td>
-											<td>
-												<!-- <input type="text" id="MonCount" data-mini="true" /> -->
-												
-											      <fieldset data-role="controlgroup" data-type="horizontal">
-											        <label for="four">4 涓�</label>
-											        <input type="radio" name="battnum" id="four" value="4">
-											        <label for="twentyfour">24涓�</label>
-											        <input type="radio" name="battnum" id="twentyfour" value="24"> 
-											      </fieldset>
-											        
-											    
-												
-											</td>
-										</tr>
-										<tr>
-											<td>鏍囩О鍗曚綋鐢靛帇(V)</td>
-											<td>
-												<input type="text" id="MonVolStd" class="unable" data-mini="true" />
-											</td>
-										</tr>
-										<tr>
-											<td>*鏍囩О瀹归噺(AH)</td>
-											<td>
-											    <fieldset data-role="controlgroup" >
-										            <select id="MonCapStd" data-mini="true">
-										             
-										            </select>
-									        	</fieldset>
-											</td>
-										</tr>
+										
 										
 												<input type="hidden" id="MonResStd" data-mini="true" />	
 												<input type="hidden" id="MonSerStd" data-mini="true" />
@@ -290,15 +259,27 @@
   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+'">'
+             '<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>'+'<input type="text" '+'id='+'battnum'+index+' data-mini="true"'+'value='+'鐢垫睜鏁伴噺'+count+' />'+'</td>'+'</tr>' 
-            ,nomCap='<tr>'+'<td>'+'鏍囩О瀹归噺'+'</td>'+'<td>'+'<input type="text" '+'id='+'nomCap'+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>'     
+            ,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()+'</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+nomCap+battIndex+battName;              
+         return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;             
   }	
+   function selectedNum(index){
+      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>';
+  	
+  	}
+  }
   function creatBa(a){
         var battnum=4-a,
             opstring='';        
@@ -336,8 +317,11 @@
 	console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
 	var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
 	var moncount = 0;
+	var fuchongfazhi = [0,0,0,0];
+	var lixiandianyafazhi = [0,0,0,0];
    $(function(){
    creatAllView(temp.length).trigger('create');
+   setMonVolStd(temp.length);
    creatBa(temp.length).trigger('create');
    });
  
@@ -397,15 +381,20 @@
     	return ip;
     }
     
-  	 // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�   //
-  	function setFloatAndoutLine(monnum) {
-  		var vol = $('#MonVolStd').val();
-  		//var monnum = $('#MonCount').val();
+  	  // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�   //
+  	function setFloatAndoutLine(index) {
+  		var monvolstd = "#MonVolStd"+index;
+  		var MonCount = "#MonCount" +index;
+  		var vol = $(monvolstd).val();
+  		var monnum = $(MonCount).val();
   		var chargeVol = (vol*1.117*monnum).toFixed(1);		// 娴厖鐢靛帇闃�鍊�
 		var outlineVol = (vol*1.073*monnum).toFixed(1);		// 绂荤嚎鐢靛帇闃�鍊�
 	
-		$('#BattFloatCurrent').val(chargeVol);		// 娴厖鐢靛帇闃�鍊�
-		$('#OfflineVolLevel').val(outlineVol);	// 绂荤嚎鐢靛帇闃�鍊�
+		//$('#BattFloatCurrent').val(chargeVol);		// 娴厖鐢靛帇闃�鍊�
+		//$('#OfflineVolLevel').val(outlineVol);	// 绂荤嚎鐢靛帇闃�鍊�
+		fuchongfazhi[index] = chargeVol;
+		lixiandianyafazhi[index] = outlineVol;
+		console.info(vol);
  	}
  	
  
@@ -426,7 +415,7 @@
 	//瀵煎叆琛ㄦ牸榛樿鏁版嵁
 	function installstartdata(temp){
 			data=temp[0].binf;
-			
+			setMonVolStd(temp.length);
 			document.getElementById("StationId").value = data.StationId;
 			document.getElementById("mainteArea").value = data.StationName1;
 			document.getElementById("city").value = data.StationName2;			//甯�
@@ -447,34 +436,35 @@
 			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("MonVolStd").value = data.MonVolStd;
+			//document.getElementById("MonCapStd").value = data.MonCapStd;
+			
 			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("station_phone").value = data.station_phone;
-			//document.getElementById(battproducer).value = data.BattProducer;
-			//$(battproducer).val(data.BattProducer);
+			//document.getElementById("BattProducer").value = data.BattProducer;
 			//document.getElementById("BattModel").value = data.BattModel;
 			document.getElementById("startTestrecord").value = data.BattProductDate;
 			document.getElementById("endTestrecord").value = data.BattInUseDate;
 			//setTimes($("#startTestrecord"),data.productDate);
 			//setTimes($("#endTestrecord"),data.useDate);
-			document.getElementById("install_user").value = data.install_user;		
+			document.getElementById("install_user").value = data.install_user;	
 			for(var i=0;i<temp.length;i++){
-			var battproducer ="#battproducer"+i;
-				data=temp[i].binf;
+			data=temp[i].binf;
+				document.getElementById("MonCapStd"+i).value = data.MonCapStd;
+				document.getElementById("MonVolStd"+i).value = data.MonVolStd;
+				console.info(data.MonCount);
+				$("#MonCount"+i).find("option:selected").val(data.MonCount);
 				var battString = "#battname"+i;
-				//var battModel = "#batttype"+i;
+				var battModel = "#batttype"+i;
 				var battproducer = "#battproducer"+i
 				//var battproducer ="#battproducer"+i; 
 				$(battString).val(data.BattGroupName);
-				//$(battModel).val(data.BattModel);
-				//$(battproducer).val(data.BattProducer);
-				//console.info(data.BattProducer);		
-				console.info($(battproducer)[0]);
+				$(battModel).val(data.BattModel);
+				$(battproducer).val(data.BattProducer);
+				console.info($(battproducer).val());
 			}
 	}
 	
@@ -485,7 +475,7 @@
 			var arr = new Array();
 			
 			for(var i=0;i<temp.length;i++){
-				setFloatAndoutLine(moncount);
+				setFloatAndoutLine(i);
 				
 				var battString = "#battname"+i;
 				var battModel = "#batttype"+i;
@@ -518,12 +508,12 @@
 						BattGroupId : tempgroupid[i],				//鐢垫睜缁刬d
 						BattGroupNum : $("#BattGroupNum").val(),			//鏈烘埧鍐呯數姹犵粍缂栧彿
 						BattGroupName : $(battString).val(),
-						FloatVolLevel : $("#FloatVolLevel").val(),			//娴厖鐢靛帇闃�鍊�
-						OfflineVolLevel : $("#OfflineVolLevel").val(),			//绂荤嚎鐢靛帇闃�鍊�
+						FloatVolLevel : fuchongfazhi[i],			//娴厖鐢靛帇闃�鍊�
+						OfflineVolLevel : lixiandianyafazhi[i],			//绂荤嚎鐢靛帇闃�鍊�
 						BattFloatCurrent : $("#BattFloatCurrent").val(),		//娴厖鐢垫祦闃�鍊�
-						MonCount : moncount,				//鍗曚綋鏁伴噺
-						MonCapStd : $("#MonCapStd").val(),				//鏍囩О瀹归噺
-						MonVolStd : $("#MonVolStd").val(),				//鏍囩О鐢靛帇
+						MonCount :$("#MonCount"+i).val(),				//鍗曚綋鏁伴噺
+						MonCapStd : $("#MonCapStd"+i).val(),				//鏍囩О瀹归噺
+						MonVolStd : $("#MonVolStd"+i).val(),				//鏍囩О鐢靛帇
 						MonResStd : $("#MonResStd").val(),				//鏍囩О鍐呴樆
 						MonSerStd : $("#MonSerStd").val(),				//鏍囩О鐢靛
 						MonVolLowToAvg : $("#MonVolLowToAvg").val(),			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
@@ -532,7 +522,7 @@
 						DisCurrMax : $("#DisCurrMax").val(),				//鏈�澶ф牳瀹圭數娴�
 						station_phone : $("#station_phone").val(),			//鍩虹珯鍙风爜
 										
-						BattProducer :getSelected(battproducer) ,			//鐢垫睜鍝佺墝
+						BattProducer : $("#battproducer"+i).find("option:selected").val(),			//鐢垫睜鍝佺墝
 						BattModel : $(battModel).val(),				//鐢垫睜鍨嬪彿
 						BattProductDate :  $("#startTestrecord").val(),		//鐢垫睜鐢熶骇鏃ユ湡
 						BattInUseDate :  $("#endTestrecord").val(),			//鐢垫睜浣跨敤鏃ユ湡
@@ -597,7 +587,7 @@
 	        	},
 	        	error:function(){
 	        		alert("淇敼鐢垫睜缁勫け璐�!");
-	        		//window.location.href="batt-unapproved.html"
+	        		window.location.href="batt-unapproved.html"
 	        	}
  		});
  	}
@@ -653,8 +643,45 @@
     var s=$(id).find("option:selected").val();
     return s;
    }
-  
-    
+  function creatMonCapOpt(suoyin){
+        var optionStr,allString;
+       
+        for(var i=1;i<11;i++){
+        
+          k=i*50;
+          
+           //optionStr+='<option'+' value='+k+'>'+k+'</option>';
+          optionStr+='<option'+' value='+k+'>'+k+'</option>';
+           
+          
+           
+          }
+          allString=optionStr+'<option'+' selected=selected '+' value='+1000+'>'+1000+'</option>'
+          return allString;
+      
+          
+   }
+   function setMonVolStd(suoyin){
+         for(var u=0;u<suoyin;u++){  
+           var id='';  
+          id='#MonCount'+u; 
+          (function(u){
+              var vol='#MonVolStd'+u;
+	          $(document).on("change", id, function () {
+	                 if($(this).find("option:selected").val()==4){$(vol).val(12);}
+	                 if($(this).find("option:selected").val()==24){$(vol).val(2);} 
+	          })
+          })(u)
+               
+         }    
+   }
+    function setMonVolStd(index){
+          for(var i=0;i<index;i++){
+             var s='#MonVolStd'+i;
+             $(s).val(12);
+          }
+         
+    }
   
     /* 鎿嶄綔鎴愬姛 
    $('#changeSuc').popup('open');

--
Gitblit v1.9.1