From d348347f5e006f37309874b1726d02d42cb8ae19 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 15:26:26 +0800
Subject: [PATCH] 手机电池单体统计分析

---
 gx_tieta/WebRoot/mobil/eleMonomer.html |  660 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 421 insertions(+), 239 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/eleMonomer.html b/gx_tieta/WebRoot/mobil/eleMonomer.html
index 02d4573..e451eff 100644
--- a/gx_tieta/WebRoot/mobil/eleMonomer.html
+++ b/gx_tieta/WebRoot/mobil/eleMonomer.html
@@ -22,26 +22,30 @@
 				<div class="fg-panel-content">
 					<input type="hidden" id="test_type" name="bmd.tdata.test_type" value="3"/>
 	                <fieldset data-role="controlgroup">
-	          
-		            <p>缁存姢鍖�</p>
-		            <select id="privince" name="bmd.binf.StationName1" data-mini="true">
-		              <option value="">鍏ㄩ儴</option>
-		     
-		            </select>
-		            
-		            <p>鏈烘埧绔欑偣</p>
-		            <select id="city" name="bmd.binf.StationName" data-mini="true">
-		            	<option value="">鍏ㄩ儴</option>
-		            </select>
-		           
-		            <p>钃勭數姹犵粍</p>
-		            <select id="battgroup_name" name="bmd.binf.BattGroupId" data-mini="true">
-		            <option value="0">鍏ㄩ儴</option>
-		            </select>
-		            <p>鍗曚綋缂栧彿閫夋嫨</p>
-		            <select id="Single_number" name="bmd.binf.MonNum" data-mini="true">
-		            	<option value="0">鍏ㄩ儴锛堝叡0鑺傦級</option>
-		            </select>
+	          	<p>鐪�</p>
+		            	<select id="mainteArea" name="bmd.binf.StationName1"data-mini="true">
+		              		<option value="">鍏ㄩ儴</option>
+		            	</select>
+		            	<p>甯�</p>
+			            <select id="city" name="bmd.binf.StationName2" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+			            <p>鍖�/鍘�</p>
+			            <select id="country" name="bmd.binf.StationName5" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+		             	<p>鏈烘埧绔欑偣</p>
+		            	<select id="homeName" name="bmd.binf.StationName" data-mini="true">
+		            		<option value="">鍏ㄩ儴</option>
+		            	</select>
+		            	<p>钃勭數姹犵粍</p>
+		            	<select id="battgroup_name" name="bmd.binf.BattGroupId" data-mini="true">
+		            		<option value="0">鍏ㄩ儴</option>
+		            	</select>
+		          		<p>鍗曚綋缂栧彿閫夋嫨</p>
+		            	<select id="Single_number" name="bmd.binf.MonNum" data-mini="true">
+		            		<option value="0">鍏ㄩ儴锛堝叡0鑺傦級</option>
+		            	</select>-->
 	          		<div>
 			            <legend class="volTest">鏀剧數娴嬭瘯</legend>
 			        	<label for="elevol">鏀剧數鎴鐢靛帇</label>
@@ -134,105 +138,245 @@
 	var newArrTd = [];
 	var tblCon = $('.tbl-container');
 		
-	//鐐瑰嚮绛涢�夊脊鍑洪�夋嫨妗嗘椂,鏌ヨ缁存姢鍖轰腑鐨勬灑绾界被鍨�(灏濊瘯鍔犺浇灏辫繑鍥炴暟鎹�)
+	//椤甸潰鍔犺浇鏃舵煡璇㈢渷
 	$.post("BattInfAction_serchByStation",null,function(data){
-		data=data.result;
-		data=eval("("+data+")");
-	    if(data.code==1 && data.data.length>0){
-			var $select=$("#privince");
-			$select.text("");
-			for(var i=0;i<=data.data.length;i++){
-				$option=$("<option></option>");
-				if(i==0){
-					$option.html("鍏ㄩ儴(鍏�"+data.sum+"鑺�)");
-					$select.siblings('span').text($option.text());	
-					$option.attr("value", "");			
-				}else{
-					$option.text(data.data[i-1].StationName1);
-					$option.attr("value",data.data[i-1].StationName1);	
-				}					
-				$select.append($option);
-			}				
-		}				
-   		findStationNamebyStationname1();
-	});
-		 
-	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-	$('#privince').change(function(){	
-	 	findStationNamebyStationname1();
-	});
-		 	
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-	function findStationNamebyStationname1(){
-		var selectvalue=$("#privince option:selected").val();
-		//alert(selectvalue);
-		$.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			//console.info(data);
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#city");
-				$select.text("");
-				for(var i=0;i<data.data.length;i++){
-					var $option=$("<option></option>");
-					$option.text(data.data[i].StationName);
-					$option.attr("value",data.data[i].StationName);
-					if(i==0){
-						//$option.html("鍏ㄩ儴(鍏�"+data.sum+"绉�)");	
-						$select.siblings('span').text($option.text());
-						//$option.attr("value", "");			
-					}else{
-							
-					}					
-					$select.append($option);
-				}
-			}
-			findserchByBattGroupNamebystationname();
-		});
-	}
-	//
-	$('#city').on('change', function(){
-		findserchByBattGroupNamebystationname();
-	});	
-	//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
-	function findserchByBattGroupNamebystationname(){
-		var station_name1=$("#privince option:selected").val();
-		var station_name=$("#city option:selected").val();
-		$.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
-			data=data.result;
-			//console.info(data);
-			data=eval("("+data+")");
-			//console.info(data.data.length);		
-			if(data.code==1 && data.data.length>0){	
-				var $Obattgroup_name = $("#battgroup_name");
-				var arr = new Array();
-				for(var i=0;i<=data.data.length;i++) {
-					if(i == 0) {
-						arr.push({
-							val: "0",
-							txt: "鍏ㄩ儴(鍏�"+data.sum+"缁�)"
-						});
-					}else{
-						arr.push({
-							val: data.data[i-1].BattGroupId,
-							txt:data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"鑺�" 
-						});
-					}
-				}
-				updataSel($Obattgroup_name, arr);
-			}
-			Obattgroup_nameonchange();
-		});
-	}
+		data = data.result;
+	    data = eval("("+data+")");
+	    //console.info(data);
+	    //console.info(data.code);
+	    if(data.code==1&&data.data.length>0){
+	   		var $Ostation_name1=$("#mainteArea");
+	    	$Ostation_name1.text("");
+	    	var arr = new Array();
+	    	for(var i=0;i<=data.data.length;i++)
+	        {
+	           	if(i == 0){
+	           		arr.push({
+	           			val:"",
+	           			txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+	           		});
+	           	}else{
+	           		arr.push({
+	           			val:data.data[i-1].StationName1,
+	           			txt:data.data[i-1].StationName1,
+	           		});
+	           	}
+	    	}
+	    	updataSel($Ostation_name1, arr);
+        }
+         findCity();
+    });
+
+  
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+	function findCity(){
+		var data = {
+			StationName1: $("#mainteArea").val()
+		};
+		//console.info(data);
+		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName2",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#city");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName2,
+		           			txt:data.data[i-1].StationName2,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         findCounty();
+	    }
+	    });
+    }
 	
-	$("#battgroup_name").on('change',function(){
-		Obattgroup_nameonchange();
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+	function findCounty(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName5",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#country");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName5,
+		           			txt:data.data[i-1].StationName5,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	      findStationNamebyStationname1();   
+	    }
+	    });
+    }
+  
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧  
+    function findStationNamebyStationname1(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val()
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName3",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#homeName");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			stationid:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName,
+		           			stationid:data.data[i-1].StationId,
+		           			txt:data.data[i-1].StationName3,
+		           		});
+		           	}
+		    	}
+		    	//console.info(111111111111111);
+		    	updataSelStation($Ostation_name1, arr);
+	        }
+	       
+	        findserchByBattGroupNamebystationname(); 
+	    }
+	    });
+    }
+ 
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�   
+     function findserchByBattGroupNamebystationname(){
+		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+	
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val(),
+			StationName: $("#homeName").val(),
+			StationId: stationid
+		};
+		
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchBattByStation",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.warn();
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#battgroup_name");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:0,
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].BattGroupId,
+		           			txt:data.data[i-1].BattGroupName,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         Obattgroup_nameonchange();
+	    }
+	    });
+    }
+    
+   //褰撶渷鏀瑰彉鏃舵洿鏂板競
+   $('#mainteArea').change(function(){
+   		findCity();	
+   });
+   //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+   $('#city').change(function(){
+   		findCounty();	
+   });
+   //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+   $('#country').change(function(){
+   		findStationNamebyStationname1(); 	
+   });   	
+	//褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍	
+	$('#homeName').change(function(){
+		findserchByBattGroupNamebystationname();
 	});
-	//褰撻�夋嫨钃勭數姹犵粍鏃�
+	$('#battgroup_name').change(function(){
+		//Obattgroup_nameonchange();
+	});
+	//褰撻�夋嫨钃勭數姹犵粍鏃舵洿鏂板崟浣�
 	function Obattgroup_nameonchange(){
 		var battgroup_id = $("#battgroup_name option:selected").val();
 		var $OSingle_number = $("#Single_number");
 		$OSingle_number.text("");
+		//console.info(battgroup_id);
 		//alert();
 		if(battgroup_id==0){
 			var $option =  $("<option></option>");
@@ -241,13 +385,15 @@
 			$OSingle_number.siblings('span').text($option.text());
 			$OSingle_number.append($option);
 		}else{
-			$.post("BattInfAction!serchByMonNum","bif.BattGroupId="+battgroup_id,function(data){
+			console.info(battgroup_id);
+			$.post("BattInfAction!serchByMonNum","bif.BattGroupId="+battgroup_id,function(data){	
 				
 				data=data.result;
 				data=eval("("+data+")");
+				console.info(data);
 				if(data.code==1 && data.data.length>0){
 					data=data.data[0];
-					//console.info(data);
+					console.info(data);
 					for(var i=0;i<=data.MonCount;i++){
 						var $option = $("<option></option>");
 						if(i!=0){
@@ -301,6 +447,7 @@
 	//鏌ヨ鍗曚綋
 		
 	function searchMonomer(){
+		var totalcount = 0;
 		MonNumlist=new Array();
 		MonVollist=new Array();
 		MonTestDate=new Array();
@@ -322,146 +469,181 @@
 				arrResisTestTd=new Array();
 				arrChargeTd=new Array();
 				data=data.result;
-				data=eval("("+data+")");
+				var model = eval("("+data+")");
 				//alert(battgroupid);
-				//console.info(data);
+				console.info(model);
 				//console.info(data.data);	
-				if(data.code==1 && data.data.length>0){					
-					data=data.data;
+				if(model.code==1 && model.data.length>0){					
+					data=model.data;
 					var test_type=$('#test_type').attr('value');
 					if(test_type==3){
 					//鏌ヨ鍏呮斁鐢垫祴璇曠殑鏁版嵁
 						var index=0;
+						var number = 0;
+						var lowCA = model.lowCA;
+						var lowCH = model.lowCH;
 						for(var i=0;i<data.length;i++){
-							//$('#total').text(data[i].smodel.data.length);						
-							if(data[i].smodel.code==1 && data[i].smodel.data.length>0){
-								var lowCA=data[i].smodel.lowCA;
-								var lowCH=data[i].smodel.lowCH;
-								var testdateIndex=-1;
-								var test_record_count=0;
-								for(var j=0;j<data[i].smodel.data.length;j++){
-									if(MonVollist[data[i].smodel.data[j].mon_num-1]==undefined){									
-										MonVollist[data[i].smodel.data[j].mon_num-1]=new Array();
-										RealCaplist[data[i].smodel.data[j].mon_num-1]=new Array();
-									}
-								//	console.info(test_record_count+"&&&&&");
-									if(test_record_count!=data[i].smodel.data[j].test_record_count){
-										MonTestDate.push(data[i].smodel.data[j].test_starttime);
-										test_record_count=data[i].smodel.data[j].test_record_count;
-									}
-									MonVollist[data[i].smodel.data[j].mon_num-1].push(data[i].smodel.data[j].mon_vol.toFixed(3));
-									
-									MonNumlist[data[i].smodel.data[j].mon_num-1]=data[i].smodel.data[j].mon_num;
-									
-										
-									arrChargeTd[index++]=(i+1)+"-"+data[i].smodel.data[j].mon_num;		//缂栧彿
-									arrChargeTd[index++]=data[i].smodel.data[j].test_starttime;		//娴嬭瘯鏃ユ湡
-									arrChargeTd[index++]=data[i].smodel.data[j].test_curr.toFixed(1);			//娴嬭瘯鐢垫祦
-									arrChargeTd[index++]=data[i].smodel.data[j].test_cap.toFixed(1);			//娴嬭瘯瀹归噺
-									arrChargeTd[index++]=data[i].smodel.data[j].mon_num;			//鍗曚綋缂栧彿
-									arrChargeTd[index++]=data[i].smodel.data[j].mon_vol.toFixed(3);			//鍗曚綋鐢靛帇
-									var realCap=Math.round(GetMonomerCap(data[i].data.binf.MonCapStd,GetHourRate(data[i].data.binf.MonCapStd,data[i].smodel.data[j].test_curr),data[i].smodel.data[j].test_cap,data[i].data.tdata.max_monvol,data[i].smodel.data[j].mon_vol,data[i].data.binf.MonVolStd,CapType_Real));		//瀹為檯瀹归噺
-									//console.info(data[i].data.tdata.max_monvol);
-									arrChargeTd[index++]=realCap;
-									RealCaplist[data[i].smodel.data[j].mon_num-1].push(realCap);
-									var rest=Math.round(GetMonomerCap(data[i].data.binf.MonCapStd,GetHourRate(data[i].data.binf.MonCapStd,data[i].smodel.data[j].test_curr),data[i].smodel.data[j].test_cap,data[i].data.tdata.max_monvol,data[i].smodel.data[j].mon_vol,data[i].data.binf.MonVolStd,CapType_Rest));	//鍓╀綑瀹归噺
-									arrChargeTd[index++]=rest;
-									arrChargeTd[index++]=(realCap/data[i].data.binf.MonCapStd).toFixed(2)*100+"%";			//瀹归噺鐧惧垎姣�
-									if(realCap>=data[i].data.binf.MonCapStd*lowCA){
-										arrChargeTd[index++]="姝e父";		//缁存姢璁板綍			姝e父
-									}else if(realCap<data[i].data.binf.MonCapStd*lowCA && realCap>data[i].data.binf.MonCapStd*lowCH){
-										arrChargeTd[index++]="鍛婅";		//缁存姢璁板綍			鍛婅
-									}else{
-										arrChargeTd[index++]="鏇存崲";		//缁存姢璁板綍			鏇存崲
-									}
-								}
+							totalcount++;
+							var testdata = data[i];
+							if(MonVollist[testdata.sdata.mon_num-1]==undefined){									
+								MonVollist[testdata.sdata.mon_num-1]=new Array();
+								RealCaplist[testdata.sdata.mon_num-1]=new Array();
 							}
-						}
-					   // console.info(arrChargeTd);
+							if(test_record_count != testdata.tdata.test_record_count){
+								number++;
+								//console.info(testdata.tdata.test_record_count);
+								MonTestDate.push(testdata.sdata.test_starttime);
+								test_record_count = testdata.tdata.test_record_count;
+							}
+							MonVollist[testdata.sdata.mon_num-1].push(testdata.sdata.mon_vol.toFixed(3));
+							
+							MonNumlist[testdata.sdata.mon_num-1] = testdata.sdata.mon_num;
+						
+							arrChargeTd.push((number)+"-"+testdata.sdata.mon_num);				//缂栧彿
+							arrChargeTd.push(testdata.sdata.test_starttime);					//娴嬭瘯鏃ユ湡
+							arrChargeTd.push(testdata.sdata.test_curr.toFixed(1));			//娴嬭瘯鐢垫祦
+							arrChargeTd.push(testdata.sdata.test_cap.toFixed(1));			//娴嬭瘯瀹归噺
+							arrChargeTd.push(testdata.sdata.mon_num);						//鍗曚綋缂栧彿
+							arrChargeTd.push(testdata.sdata.mon_vol.toFixed(3));				//鍗曚綋鐢靛帇
+							console.info(testdata.sdata.test_curr);
+							var avg_curr = testdata.sdata.test_timelong>0?testdata.sdata.test_cap*3600/testdata.sdata.test_timelong:testdata.sdata.test_curr;			//璁$畻骞冲潎鐨勬斁鐢电數娴� 
+							//console.info("avg="+avg_curr);
+							var realCap=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,avg_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Real));		//瀹為檯瀹归噺
+							//console.info(data[i].data.tdata.max_monvol);
+							arrChargeTd.push(realCap);
+							
+							//console.info("MonCapStd:"+data[i].data.binf.MonCapStd+"\t  test_curr:"+data[i].smodel.data[j].test_curr+"\t test_cap"+data[i].smodel.data[j].test_cap+"\t max_monvol:"+data[i].data.tdata.max_monvol+"\t mon_vol"+data[i].smodel.data[j].mon_vol+"\t MonVolStd"+data[i].data.binf.MonVolStd);
+							
+							RealCaplist[testdata.sdata.mon_num-1].push(realCap);					
+							
+							
+							var rest=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,avg_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Rest));		//鍓╀綑瀹归噺
+							arrChargeTd.push(rest);
+							arrChargeTd.push((realCap*100/testdata.binf.MonCapStd).toFixed(0)+"%");		//瀹归噺鐧惧垎姣�
+							if(realCap >= testdata.binf.MonCapStd*lowCA){
+								arrChargeTd.push("姝e父");		//缁存姢璁板綍			姝e父
+							}else if(realCap<testdata.binf.MonCapStd*lowCA && realCap>testdata.binf.MonCapStd*lowCH){
+								arrChargeTd.push("鍛婅");		//缁存姢璁板綍			鍛婅
+							}else{
+								arrChargeTd.push("鏇存崲");		//缁存姢璁板綍			鏇存崲
+							}
+						}	
 						createTbl(tblCon, arrTh1, arrChargeTd);
 					}else if(test_type==5){
 						//鏌ヨ鐢靛娴嬭瘯鏁版嵁
-						//console.info(123456);
 						var index=0;
 						//console.info(data);
+						var test_record_count=0;
+						var test_index = -1;
+						var number = 0;
+						var lowRa=model.lowRA;
+						var lowRH=model.lowRH;
+						
+						var every_arr = new Array();		//骞冲潎鐢靛
+						var monser_arr = new Array();		//姣忔鏁版嵁鐨勭數瀵兼暟鎹�     AvgSer_Arr
 						for(var i=0;i<data.length;i++){
-							if(data[i].rmodel.code==1 && data[i].rmodel.data.length>0){
-								$('#total').text(data[i].rmodel.data.length);
-								var test_record_count=0;
-								var test_index=-1;
-								for(var j=0;j<data[i].rmodel.data.length;j++){
-									//console.info(data[i].rmodel)
-									mdata=data[i].rmodel.data[j];
-									var momnum=(mdata.mon_num+"").substring(0,(mdata.mon_num+"").length-1);
-									if(Voltagelist[momnum-1] ==undefined){
-										Voltagelist[momnum-1]=new Array();
-										Conductlist[momnum-1]=new Array();
-										Conductpercentlist[momnum-1]=new Array();
-										Resistancelist[momnum-1]=new Array();
-										Templist[momnum-1]=new Array();
-										ConnOhmlist[momnum-1]=new Array();										
-									}										
-									if(test_record_count!=mdata.test_record_count){
-										MonTestDate[++test_index]=mdata.test_starttime;
-									    test_record_count=mdata.test_record_count;
-									}
-										
-									Voltagelist[momnum-1][test_index]=(mdata.mon_vol).toFixed(3);
-									Conductlist[momnum-1][test_index]=mdata.mon_ser;
-									Resistancelist[momnum-1][test_index]=(mdata.mon_res).toFixed(3);
-									Templist[momnum-1][test_index]=(mdata.mon_tmp).toFixed(1);
-									ConnOhmlist[momnum-1][test_index]=(mdata.conn_res).toFixed(3);
-									
-									MonNumlist[momnum-1]=momnum;
-									MonTestDate[test_index]=mdata.test_starttime;
-								
-									//console.info((mdata.mon_num+"").length+"mdata.mon_num");
-									//console.info(momnum+"momnum");
-									arrResisTestTd[index++]=mdata.test_record_count+"-"+momnum;		//缂栧彿
-									arrResisTestTd[index++]=mdata.test_starttime;					//娴嬭瘯鏃ユ湡																
-									arrResisTestTd[index++]=momnum;									//鍗曚綋缂栧彿
-									arrResisTestTd[index++]=mdata.mon_vol.toFixed(3);				//鍗曚綋鐢靛帇
-									arrResisTestTd[index++]=mdata.mon_tmp.toFixed(1);				//鍗曚綋娓╁害
-									arrResisTestTd[index++]=mdata.mon_res.toFixed(3);				//鍗曚綋鍐呴樆
-									arrResisTestTd[index++]=mdata.mon_ser;							//鍗曚綋鐢靛
-									if(data[i].data.binf.MonSerStd!=0){
-										console.info(data[i].data.binf.MonSerStd);
-										arrResisTestTd[index++]=((mdata.mon_ser/data[i].data.binf.MonSerStd)*100).toFixed(1);	//鐢靛鐧惧垎姣�
-									}else{
-										arrResisTestTd[index++]=(0).toFixed(1);						//鐢靛鐧惧垎姣�
-									}
-									Conductpercentlist[momnum-1][test_index]=arrResisTestTd[index-1];
-									//console.info(mdata);
-									arrResisTestTd[index++]=mdata.conn_res.toFixed(3);				//杩炴帴鏉¢樆鎶�
-									arrResisTestTd[index++]=data[i].rmodel.newsum==1?"骞冲潎鍊�":" 鏍囩О鍊�";			/* 骞冲潎鍊�		鏍囩О鍊� */								//鐢靛鍒嗘瀽鍩哄噯
-									arrResisTestTd[index++]=mdata.mon_avg.toFixed(0);				//鐢靛鍩哄噯鍊�
-									
-									var lowRa=data[i].rmodel.lowRA;
-									var lowRH=data[i].rmodel.lowRH;				
-									if(data[i].rmodel.newsum==1){
-										//鏍规嵁骞冲潎鍊兼瘮杈�
-										if(mdata.mon_ser>=((mdata.mon_avg.toFixed(0))*lowRa)){
-											arrResisTestTd[index++]="姝e父";			/* 姝e父 */							//缁存姢寤鸿
-										}else if(mdata.mon_ser<(mdata.mon_avg.toFixed(0))*lowRa && mdata.mon_ser>(mdata.mon_avg.toFixed(0))*lowRH){
-											arrResisTestTd[index++]="鍛婅";			/* 鍛婅 */							//缁存姢寤鸿
-										}else{
-											arrResisTestTd[index++]="鏇存崲";		/* 鏇存崲 */
-										}
-										
-									}else if(data[i].rmodel.newsum==0){
-										//鏍规嵁鏍囩О鍊兼瘮杈�
-										var MonSerstd=data[i].data.binf.MonResStd;
-										//console.info(MonSerstd);
-										if(mdata.mon_ser>=(MonSerstd*lowRa)){
-											arrResisTestTd[index++]="姝e父";			/* 姝e父 */
-										}else if(mdata.mon_ser<(MonSerstd*lowRa) && mdata.mon_ser>MonSerstd*lowRH){
-											arrResisTestTd[index++]="鍛婅";			/* 鍛婅 */
-										}else{
-											arrResisTestTd[index++]="鏇存崲";		/* 鏇存崲 */
-										}
-									}									
+							var resdata = data[i];
+							//鏂扮殑涓�姣旀暟鎹�
+							if(test_record_count != resdata.rdata.test_record_count){
+								monser_arr.push(every_arr);
+								if(i>0){
+									every_arr = new Array();
 								}
-							}							
+							}
+							var conduct = 0;
+							if(resdata.rdata.mon_res>0){
+								conduct = (1000/resdata.rdata.mon_res).toFixed(0);
+							}
+							every_arr.push(conduct);							
+						}
+						test_record_count = 0 ;
+						for(var i=0;i<data.length;i++){
+							var resdata = data[i];							
+								
+							totalcount++;		
+							
+							//console.info(data[i].rmodel)
+							mdata=resdata.rdata;
+							var momnum=(mdata.mon_num+"").substring(0,(mdata.mon_num+"").length-1);
+							if(Voltagelist[momnum-1] ==undefined){
+								Voltagelist[momnum-1]=new Array();
+								Conductlist[momnum-1]=new Array();
+								Conductpercentlist[momnum-1]=new Array();
+								Resistancelist[momnum-1]=new Array();
+								Templist[momnum-1]=new Array();
+								ConnOhmlist[momnum-1]=new Array();										
+							}
+							
+							if(test_record_count!=mdata.test_record_count){
+								MonTestDate.push(mdata.test_starttime);
+								test_record_count=mdata.test_record_count;
+								test_index ++;
+								number ++;
+							}
+							
+							Voltagelist[momnum-1].push((mdata.mon_vol).toFixed(3));
+							
+							Templist[momnum-1].push((mdata.mon_tmp).toFixed(1));
+							ConnOhmlist[momnum-1].push((mdata.conn_res).toFixed(3));
+							
+							MonNumlist[momnum-1]=momnum;
+							//MonTestDate[test_index]=mdata.test_starttime;
+						
+							//console.info((mdata.mon_num+"").length+"mdata.mon_num");
+							//console.info(momnum+"momnum");
+							arrResisTestTd.push((number)+"-"+momnum);		//缂栧彿
+							arrResisTestTd.push(mdata.test_starttime);					//娴嬭瘯鏃ユ湡																
+							arrResisTestTd.push(momnum);									//鍗曚綋缂栧彿
+							arrResisTestTd.push(mdata.mon_vol.toFixed(3));				//鍗曚綋鐢靛帇
+							arrResisTestTd.push(mdata.mon_tmp.toFixed(1));				//鍗曚綋娓╁害
+							
+							arrResisTestTd.push(mdata.mon_res.toFixed(3));				//鍗曚綋鍐呴樆
+							Resistancelist[momnum-1].push((mdata.mon_res).toFixed(3));
+							
+							var conduct = 0;
+							if(mdata.mon_res > 0){
+								conduct = (1000/mdata.mon_res).toFixed(0);
+							}
+							Conductlist[momnum-1].push(conduct);						
+							arrResisTestTd.push(conduct);							//鍗曚綋鐢靛
+							var Conductpercent = 0;
+							if(resdata.binf.MonSerStd!=0){
+								//console.info(data[i].data.binf.MonSerStd);
+								Conductpercent = ((conduct/resdata.binf.MonSerStd)*100).toFixed(1);
+							}else{
+								Conductpercent = (0).toFixed(1);						//鐢靛鐧惧垎姣�
+							}
+							arrResisTestTd.push(Conductpercent);	//鐢靛鐧惧垎姣�
+							Conductpercentlist[momnum-1].push(Conductpercent);
+							//console.info(mdata);
+							arrResisTestTd.push(mdata.conn_res.toFixed(3));				//杩炴帴鏉¢樆鎶�
+							arrResisTestTd.push(model.newsum==1?"骞冲潎鍊�":"鏍囩О鍊�");			// 骞冲潎鍊�		鏍囩О鍊� 								//鐢靛鍒嗘瀽鍩哄噯
+							arrResisTestTd.push(arrAverageNum(monser_arr[test_index]));				//鐢靛鍩哄噯鍊糾data.mon_avg.toFixed(0)
+							
+											
+							if(model.newsum==1){
+								//console.info(typeof AvgSer_Arr[test_index]);
+								//鏍规嵁骞冲潎鍊兼瘮杈�
+								if(conduct>=((arrAverageNum(monser_arr[test_index]).toFixed(0))*lowRa)){
+									arrResisTestTd.push("姝e父 ");			/* 姝e父 */							//缁存姢寤鸿
+								}else if(conduct<(arrAverageNum(monser_arr[test_index]).toFixed(0))*lowRa && conduct>(arrAverageNum(monser_arr[test_index]).toFixed(0))*lowRH){
+									arrResisTestTd.push("鍛婅");			/* 鍛婅 */							//缁存姢寤鸿
+								}else{
+									arrResisTestTd.push("鏇存崲");		/* 鏇存崲 */
+								}
+								
+							}else if(model.newsum==0){
+								//鏍规嵁鏍囩О鍊兼瘮杈�
+								var MonSerstd=resdata.binf.MonResStd;
+								//console.info(MonSerstd);
+								if(conduct>=(MonSerstd*lowRa)){
+									arrResisTestTd.push("姝e父");			/* 姝e父 */
+								}else if(conduct<(MonSerstd*lowRa) && conduct>MonSerstd*lowRH){
+									arrResisTestTd.push("鍛婅");			/* 鍛婅 */
+								}else{
+									arrResisTestTd.push("鏇存崲");		/* 鏇存崲 */
+								}
+							}											
 						}
 					    console.info(arrResisTestTd);
 						createTbl(tblCon, arrTh2, arrResisTestTd);

--
Gitblit v1.9.1