From 009fa41d421de9413de6c3e62fa81cfbf37166ec Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 27 九月 2018 11:47:21 +0800
Subject: [PATCH] 电池统计查询

---
 gx_tieta/WebRoot/eleAnalyse.jsp     |  340 +++++-------------
 gx_tieta/WebRoot/eleMonomer.jsp     |  368 +++++--------------
 gx_tieta/WebRoot/ele_statistics.jsp |  364 +++++--------------
 3 files changed, 301 insertions(+), 771 deletions(-)

diff --git a/gx_tieta/WebRoot/eleAnalyse.jsp b/gx_tieta/WebRoot/eleAnalyse.jsp
index ef6d2a4..7e99583 100644
--- a/gx_tieta/WebRoot/eleAnalyse.jsp
+++ b/gx_tieta/WebRoot/eleAnalyse.jsp
@@ -55,8 +55,10 @@
 				<!-- 缁存姢鍖轰俊鎭� -->
 				<table>
 					<tr class="fWeight">
-						<!-- 缁存姢鍖� -->
-						<td><s:text name="Maintenance_area"/></td>
+						<!-- 鐪� -->
+						<td>鐪�</td>
+						<!-- 甯� -->
+						<td>甯�</td>
 						<!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
 						<td><s:text name="Computer_site"/></td>
 						<!-- 钃勭數姹犵粍 -->
@@ -81,6 +83,10 @@
 					<tr>
 						<td>
 							<select id="station_name1" name="bd.binf.StationName1">
+							</select>
+						</td>
+						<td>
+							<select id="city" name="bd.binf.StationName2">
 							</select>
 						</td>
 						<td>
@@ -298,6 +304,7 @@
 		eleform.submit();
 	}
 	
+	// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
 	$(document).ready(function(){
 		//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
 		$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -321,284 +328,136 @@
 			}else{
 				$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
 			}
-			findStationNamebyStationname1();		
+			findCity();		
 		});
 	});
 	
-	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+	// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+	function findCity() {
+		var data = {
+			StationName1: $("#station_name1").val()
+		};
+		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName2",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+	        	var rs = JSON.parse(data.result);
+	        	var $select = $("#city");
+	        	if(rs.code == 1) {
+	        		var _data= rs.data;
+	        		// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+					var optsList = [];
+					for(var i=0;i<_data.length;i++){
+						var __data = _data[i];
+						var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+						optsList.push(tmp);
+					}
+					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+					createOptions($select, optsList, true);
+	        	}else {
+	        		$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+	        	}
+	        	findStationNamebyStationname1();
+	        }
+	    });
+	}
+	
+	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
 	$('#station_name1').change(function(){
+		findCity();
+	});
+	
+	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+	$('#city').change(function(){
 		findStationNamebyStationname1();
 	});
-	var isNewload = true;
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+	
+	//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
 	function findStationNamebyStationname1(){
-		var stationid = getQueryString("stationId");
-		var user = {
-			UNote:$("#station_name1 option:selected").val()
+		var tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val()
 		};
 		//var selectvalue=$("#station_name1 option:selected").val();
 		//alert(selectvalue);
-		$.post("User_battgroup_baojigroup_battgroupAction!serchStationByStationName1","json="+JSON.stringify(user),function(data){
-			//console.info(data);
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
+		$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+			var rs = JSON.parse(data.result);
+			if(rs.code==1){
+				var _data = rs.data;
 				var $select = $("#station_name");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i==0){
-						$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
-						$option.attr("value", "");			
-					}else{
-						$option.text(data.data[i-1].StationName);
-						$option.attr("value",data.data[i-1].StationName);
-						//console.info(data.data);
-						if(data.data[i-1].StationId == stationid && isNewload){
-							$option.attr('selected','selected');
-						}	
-					}					
-					$select.append($option);
+				// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+				var optsList = [];
+				for(var i=0;i<_data.length;i++){
+					var __data = _data[i];
+					var _attr = {
+						StationId: __data.StationId
+					};
+					var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+					optsList.push(tmp);
 				}
+				
+				// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+				createOptions($select, optsList, true);
 			}else{
-				$("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴�</option>');
+				$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 			}
 			findserchByBattGroupNamebystationname();
 		});
 	}
 	
+	// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
 	$('#station_name').change(function(){
 		findserchByBattGroupNamebystationname();
 	});
 	
-	//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
+	//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
 	function findserchByBattGroupNamebystationname(){
-		var battgroupid = getQueryString("battgroupId");
-		var user = {
-			UNote:$("#station_name1 option:selected").val(),
-			UName:$("#station_name option:selected").val()
+		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+		// 鏋勯�犳煡璇㈡潯浠�
+		var tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val(),
+			StationName3: $("#station_name").val(),
+			StationId: stationid
 		};
 	
 		//var station_name1=$("#station_name1 option:selected").val();
 		//var station_name=$("#station_name option:selected").val();
 		
-		$.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
+		$.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
 			data=data.result;
 			//console.info(data);
 			data=eval("("+data+")");
 			//console.info(data);		
 			if(data.code==1 && data.data.length>0){
 				var $select = $("#battgroup_name");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					$option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
-						$option.attr("value",data.data[i-1].BattGroupId);
-						$option.attr("stationname",data.data[i-1].StationName);
-						if(data.data[i-1].BattGroupId == battgroupid && isNewload){
-							$option.attr('selected','selected');
-							isNewload = false;
-						}
-					}else{
-						$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
-						$option.attr("value", "0");
-					}
-					$select.append($option);
-				}
-			}else{
-				$("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勭數姹犵粍</option>');
-			}
-		});
-	}
-	
-	/* //鍔犺浇缁存姢鍖�
-	//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
-	$.post("BattInfAction_serchByStation",null,function(data){
-		data=data.result;
-		data=eval("("+data+")");
-		//console.info(data);
-		if(data.code==1 && data.data.length>0){
-			var Ostation_name1=document.getElementById("station_name1");
-			Ostation_name1.innerHTML="";
-			for(var i=0;i<=data.data.length;i++){
-				option=createEle("option");
-				if(i==0){
-					option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";	
-					option.setAttribute("value", "");			
-				}else{
-					option.innerHTML=data.data[i-1].StationName1;
-					option.setAttribute("value",data.data[i-1].StationName1);	
-				}					
-				Ostation_name1.appendChild(option);
-			}				
-		}
-		findStationNamebyStationname1();		
-	});
-	
-	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-	$('#station_name1').change(function(){
-		findStationNamebyStationname1();
-	});
-	
-	//鏌ヨ鐢垫睜鍝佺墝
-	$.post("BattInfAction_serchByBattProducer",null,function(data){
-		data=data.result;
-		data=eval("("+data+")");
-		if(data.code==1 && data.data.length>0){
-			var Obatt_producer=document.getElementById("batt_producer");
-			Obatt_producer.innerHTML="";
-			for(var i=0;i<=data.data.length;i++){
-				var option=createEle("option");
-				if(i!=0){
-					option.innerHTML=data.data[i-1].BattProducer;
-					option.setAttribute("value", data.data[i-1].BattProducer);	
-				}else{
-					option.innerHTML="<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�";
-					option.setAttribute("value", "");	
-				}
-				Obatt_producer.appendChild(option);
-			}
-		}
-	});
-	
-	
-	//鏌ヨ鍗曚綋鐢靛帇
-	$.post("BattInfAction_serchByMonVolStd",null,function(data){
-		data=data.result;
-		data=eval("("+data+")");
-		if(data.code==1 && data.data.length>0){
-			var Omonvol_std=document.getElementById("monvol_std");
-			Omonvol_std.innerHTML="";
-			//console.info(data)
-			for(var i=0;i<=data.data.length;i++){
-				var option=createEle("option");
-				if(i!=0){
-					option.innerHTML=data.data[i-1].MonVolStd;
-					option.setAttribute("value", data.data[i-1].MonVolStd);	
-				}else{
-					option.innerHTML="<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�";
-					option.setAttribute("value", 0);	
-				}
-				Omonvol_std.appendChild(option);
-			}
-		}
-	});	
-	
-	//鏌ヨ鐢垫睜瀹归噺
-	$.post("BattInfAction_serchByMonCapStd",null,function(data){
-		data=data.result;
-		data=eval("("+data+")");
-		if(data.code==1 && data.data.length>0){
-			var Omoncap_std=document.getElementById("moncap_std");
-			Omoncap_std.innerHTML="";
-			//console.info(data)
-			for(var i=0;i<=data.data.length;i++){
-				var option=createEle("option");
-				if(i!=0){
-					option.innerHTML=data.data[i-1].MonCapStd;
-					option.setAttribute("value", data.data[i-1].MonCapStd);	
-				}else{
-					option.innerHTML="<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�";
-					option.setAttribute("value", 0);	
-				}
-				Omoncap_std.appendChild(option);
-			}
-		}
-	});
-	
-	//鏌ヨ鍖呮満浜�
-	$.post("User_infAction_searchAll","bup.page.pageSize="+1000,function(data){
-		data=data.result;
-		data=eval("("+data+")");
-		//console.info(data);
-		if(data.code==1 && data.data.length>0){
-			var Obaojiren=document.getElementById("baojiren");
-			Obaojiren.innerHTML="";
-			//console.info(data)
-			for(var i=0;i<=data.data.length;i++){
-				var option=createEle("option");
-				if(i!=0){
-					option.innerHTML=data.data[i-1].uinf.UName;
-					option.setAttribute("value", data.data[i-1].uinf.UName);	
-				}else{
-					option.innerHTML="<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�";
-					option.setAttribute("value", "0");	
-				}
-				Obaojiren.appendChild(option);
-			}
-		}
-	});		
-	
-	var isNewload = true;
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-	function findStationNamebyStationname1(){
-		var selectvalue=$("#station_name1 option:selected").val();
-		var stationid = getQueryString("stationId");
-		$.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
-				var Ostttion_name = $("#station_name");
-				Ostttion_name.text('');
+				// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+				var optsList = [];
 				for(var i=0;i<data.data.length;i++){
-					var $option=$("<option></option>");
-					//if(i==0){
-					//	$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");	
-					//	$option.attr("value", "");
-					//}else{
-						$option.text(data.data[i].StationName);
-						$option.attr("value",data.data[i].StationName);	
-						if(data.data[i].StationId == stationid && isNewload){
-							$option.attr('selected','selected');
-						}			
-					//}					
-					Ostttion_name.append($option);
+					var _data = data.data[i];
+					var _attr = {
+						stationname: _data.StationName,
+						dev_id: _data.FBSDeviceId,
+						batt_num: _data.GroupIndexInFBSDevice+1
+					};
+					var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
+					var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+					optsList.push(tmp);
 				}
+				
+				// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+				createOptions($select, optsList, true);
+				$select.find('option').eq(0).val(0);
+			}else{
+				$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
 			}
-			findserchByBattGroupNamebystationname();
-		});
-		$('#station_name').change(function(){
-			findserchByBattGroupNamebystationname();
 		});
 	}
 	
-	//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
-	function findserchByBattGroupNamebystationname(){
-		var station_name1=$("#station_name1 option:selected").val();
-		var station_name=$("#station_name option:selected").val();
-		var battgroupid = getQueryString("battgroupId");
-		
-		$.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			//console.info(data.data);		
-			if(data.code==1 && data.data.length>0){
-				
-				var Obattgroup_name = $("#battgroup_name");
-				Obattgroup_name.text("");
-				
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
-						$option.attr("value",data.data[i-1].BattGroupId);
-						if($option.val() == battgroupid && isNewload){
-							isNewload = false;
-							$option.attr('selected','selected');
-						}
-					}else{
-						$option.text("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
-						$option.attr("value", "0");
-					}
-					Obattgroup_name.append($option);
-				}
-				if(battgroupid != undefined){
-					$('#paging .search').click();
-				}
-			}
-		});
-	} */
 	
 	//椤甸潰鍔犺浇鏃跺垵濮嬪寲鏃堕棿
 	$(document).ready(function(){		
@@ -1091,6 +950,7 @@
 			},
 			binf:{
 				StationName1:$('#station_name1').val(),
+				StationName2:$('#city').val(),
 				StationName:$('#station_name').val(),
 				BattGroupId:$('#battgroup_name').val(),
 				BattProducer:$('#batt_producer').val(),
diff --git a/gx_tieta/WebRoot/eleMonomer.jsp b/gx_tieta/WebRoot/eleMonomer.jsp
index cfd4b5c..368bec8 100644
--- a/gx_tieta/WebRoot/eleMonomer.jsp
+++ b/gx_tieta/WebRoot/eleMonomer.jsp
@@ -41,13 +41,19 @@
 				<!-- 缁存姢鍖轰俊鎭� -->
 				<table>
 					<tr class="fWeight">
-						<td><s:text name="Maintenance_area"/></td>					<!-- 缁存姢鍖� -->
+						<td>鐪�</td>					<!-- 鐪� -->
+						<td>甯�</td>					<!-- 甯� -->
 						<td><s:text name="Computer_site"/></td>						<!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
 						<td><s:text name="Battery"/></td>							<!-- 钃勭數姹犵粍 -->
 					</tr>
 					<tr>
 						<td>
 							<select id="station_name1" name="bmd.binf.StationName1">
+								
+							</select>
+						</td>
+						<td>
+							<select id="city" name="bmd.binf.StationName2">
 								
 							</select>
 						</td>
@@ -614,6 +620,7 @@
 		});
 	});
 	
+	// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
 	$(document).ready(function(){
 		//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
 		$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -637,100 +644,138 @@
 			}else{
 				$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
 			}
-			findStationNamebyStationname1();		
+			findCity();		
 		});
 	});
 	
-	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+	// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+	function findCity() {
+		var data = {
+			StationName1: $("#station_name1").val()
+		};
+		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName2",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+	        	var rs = JSON.parse(data.result);
+	        	var $select = $("#city");
+	        	if(rs.code == 1) {
+	        		var _data= rs.data;
+	        		// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+					var optsList = [];
+					for(var i=0;i<_data.length;i++){
+						var __data = _data[i];
+						var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+						optsList.push(tmp);
+					}
+					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+					createOptions($select, optsList, true);
+	        	}else {
+	        		$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+	        	}
+	        	findStationNamebyStationname1();
+	        }
+	    });
+	}
+	
+	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
 	$('#station_name1').change(function(){
+		findCity();
+	});
+	
+	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+	$('#city').change(function(){
 		findStationNamebyStationname1();
 	});
-	var isNewload = true;
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+	
+	//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
 	function findStationNamebyStationname1(){
-		var stationid = getQueryString("stationId");
-		var user = {
-			UNote:$("#station_name1 option:selected").val()
+		var tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val()
 		};
 		//var selectvalue=$("#station_name1 option:selected").val();
 		//alert(selectvalue);
-		$.post("User_battgroup_baojigroup_battgroupAction!serchStationByStationName1","json="+JSON.stringify(user),function(data){
-			//console.info(data);
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
+		$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+			var rs = JSON.parse(data.result);
+			if(rs.code==1){
+				var _data = rs.data;
 				var $select = $("#station_name");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i==0){
-						$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
-						$option.attr("value", "");			
-					}else{
-						$option.text(data.data[i-1].StationName);
-						$option.attr("value",data.data[i-1].StationName);
-						//console.info(data.data);
-						if(data.data[i-1].StationId == stationid && isNewload){
-							$option.attr('selected','selected');
-						}	
-					}					
-					$select.append($option);
+				// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+				var optsList = [];
+				for(var i=0;i<_data.length;i++){
+					var __data = _data[i];
+					var _attr = {
+						StationId: __data.StationId
+					};
+					var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+					optsList.push(tmp);
 				}
+				
+				// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+				createOptions($select, optsList, true);
 			}else{
-				$("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴�</option>');
+				$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 			}
 			findserchByBattGroupNamebystationname();
 		});
 	}
 	
+	// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
 	$('#station_name').change(function(){
 		findserchByBattGroupNamebystationname();
 	});
 	
-	//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
+	//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
 	function findserchByBattGroupNamebystationname(){
-		var battgroupid = getQueryString("battgroupId");
-		var batt_mon_num = getQueryString("battmon_num");
-		var user = {
-			UNote:$("#station_name1 option:selected").val(),
-			UName:$("#station_name option:selected").val()
+		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+		// 鏋勯�犳煡璇㈡潯浠�
+		var tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val(),
+			StationName3: $("#station_name").val(),
+			StationId: stationid
 		};
 	
 		//var station_name1=$("#station_name1 option:selected").val();
 		//var station_name=$("#station_name option:selected").val();
 		
-		$.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
+		$.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
 			data=data.result;
 			//console.info(data);
 			data=eval("("+data+")");
 			//console.info(data);		
 			if(data.code==1 && data.data.length>0){
 				var $select = $("#battgroup_name");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					$option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
-						$option.attr("value",data.data[i-1].BattGroupId);
-						$option.attr("stationname",data.data[i-1].StationName);
-						if(data.data[i-1].BattGroupId == battgroupid && isNewload){
-							$option.attr('selected','selected');
-						}
-					}else{
-						$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
-						$option.attr("value", "0");
-					}
-					$select.append($option);
+				// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+				var optsList = [];
+				for(var i=0;i<data.data.length;i++){
+					var _data = data.data[i];
+					var _attr = {
+						stationname: _data.StationName,
+						dev_id: _data.FBSDeviceId,
+						batt_num: _data.GroupIndexInFBSDevice+1
+					};
+					var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
+					var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+					optsList.push(tmp);
 				}
+				
+				// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+				createOptions($select, optsList, true);
+				$select.find('option').eq(0).val(0);
 			}else{
-				$("#battgroup_name").text('').html('<option value="0">鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
+				$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
 			}
-			searchBattMonNum(batt_mon_num);
 		});
 	}
 	
+	// 鏌ヨ鐢垫睜鍗曚綋
 	$('#battgroup_name').change(function(){
-		isNewload = false;
 		searchBattMonNum();
 	});
 	
@@ -796,214 +841,7 @@
 	var Resistancelist;				//鍐呴樆鏁扮粍
 	var Templist;					//娓╁害鏁扮粍
 	var ConnOhmlist;				//杩炴帴鏉￠樆鎶�
-	//鏌ヨ鍗曚綋
-	/* function searchMonomer(){
-	
-		var battgroupid=$('#battgroup_name').attr('value');
-		if(battgroupid==undefined || battgroupid==0){
-			alert("<s:text name='Please_choose_a_group_of_battery_pack!' />");
-			return;
-		}
-		MonNumlist=new Array();
-		MonVollist=new Array();
-		MonTestDate=new Array();
-		RealCaplist=new Array();
-		
-		Voltagelist=new Array();
-		Conductlist=new Array();
-		Conductpercentlist=new Array();
-		Resistancelist=new Array();
-		Templist=new Array();
-		ConnOhmlist=new Array();
-		
-		//鍒涘缓绛夊緟鐨勬妗�
-		loading.showLoading($('#main'));
-		var battgroupid=$('#battgroup_name').attr('value');
-		var temp ={
-			binf:{
-				StationName1:$('#station_name1').val(),
-				StationName:$('#station_name').val(),
-				BattGroupId:$('#battgroup_name').val(),
-				MonNum:$('#Single_number').val(),				
-			},
-			tdata:{
-				test_type:$('#test_type').val()
-			}
-		};
-		//console.info(temp);
-		//console.info($("#search_form").serialize());
-		if(battgroupid!=undefined && battgroupid!=0){
-			$.post("Batt_MaintAction!serchMon_num",$("#search_form").serialize(),function(data){
-				arrResisTestTd=new Array();
-				arrChargeTd=new Array();
-				data=data.result;
-				data=eval("("+data+")");
-				//alert(battgroupid);
-				//console.info(data);
-				var totalcount = 0;
-				if(data.code==1 && data.data.length>0){					
-					data=data.data;
-					var test_type=$('#test_type').attr('value');
-					if(test_type==3){
-						//鏌ヨ鍏呮斁鐢垫祴璇曠殑鏁版嵁
-						var index=0;
-						for(var i=0;i<data.length;i++){
-							//console.info(data[i]);							
-							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++){
-									totalcount++;
-									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();
-									}
-									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;
-									
-									//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[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*100/data[i].data.binf.MonCapStd).toFixed(0)+"%";		//瀹归噺鐧惧垎姣�
-									if(realCap>=data[i].data.binf.MonCapStd*lowCA){
-										arrChargeTd[index++]="<s:text name='Normal' />";		//缁存姢璁板綍			姝ｅ父
-									}else if(realCap<data[i].data.binf.MonCapStd*lowCA && realCap>data[i].data.binf.MonCapStd*lowCH){
-										arrChargeTd[index++]="<s:text name='Alarm' />";		//缁存姢璁板綍			鍛婅
-									}else{
-										arrChargeTd[index++]="<s:text name='Replace' />";		//缁存姢璁板綍			鏇存崲
-									}
-								}
-							}
-						}
-					}else if(test_type==5){
-						//鏌ヨ鐢靛娴嬭瘯鏁版嵁
-						//console.info(123456);
-						var index=0;
-						//console.info(data);
-						for(var i=0;i<data.length;i++){
-							
-							if(data[i].rmodel.code==1 && data[i].rmodel.data.length>0){
-								
-								var test_record_count=0;
-								var test_index=-1;
-								for(var j=0;j<data[i].rmodel.data.length;j++){
-									totalcount++;
-									//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++]=(i+1)+"-"+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?"<s:text name='Average' />":"<s:text name='Nominal_value' />";			// 骞冲潎鍊�		鏍囩О鍊� 								//鐢靛鍒嗘瀽鍩哄噯
-									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++]="<s:text name='Normal' />";			// 姝ｅ父 							//缁存姢寤鸿
-										}else if(mdata.mon_ser<(mdata.mon_avg.toFixed(0))*lowRa && mdata.mon_ser>(mdata.mon_avg.toFixed(0))*lowRH){
-											arrResisTestTd[index++]="<s:text name='Alarm' />";			// 鍛婅 							//缁存姢寤鸿
-										}else{
-											arrResisTestTd[index++]="<s:text name='Replace' />";		// 鏇存崲 
-										}
-										
-									}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++]="<s:text name='Normal' />";			// 姝ｅ父 
-										}else if(mdata.mon_ser<(MonSerstd*lowRa) && mdata.mon_ser>MonSerstd*lowRH){
-											arrResisTestTd[index++]="<s:text name='Alarm' />";			// 鍛婅 
-										}else{
-											arrResisTestTd[index++]="<s:text name='Replace' />";		// 鏇存崲 
-										}
-									}									
-								}
-							}							
-						}
-					}					
-				}else{
-					noContent.showNoContent("鏆傛棤鏌ヨ鏁版嵁");
-				}
-				$('#total').text(totalcount);
-				var tblScroll=$('#eleInforTab').scrollLeft();
-				$('#tbHead table').css('left',-tblScroll);		
-				createTableByStatue();
-				loading.hideLoading($('#main'));
-				//$('#eleInforTab').scrollTop(0);		//璁╀腑闂磋〃鏍肩殑婊氳疆瀹氫綅鍒颁笂绔�
-			}).error(function(){
-				noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺�");
-			});
-		}else{
-			createTableByStatue();
-			$('body .mask').remove();
-		}		
-	} */
-	
+	// 鏌ヨ鍗曚綋
 	function searchMonomer(){
 	
 		var battgroupid=$('#battgroup_name').attr('value');
@@ -1029,6 +867,7 @@
 		var temp ={
 			binf:{
 				StationName1:$('#station_name1').val(),
+				StationName2:$('#city').val(),
 				StationName:$('#station_name').val(),
 				BattGroupId:$('#battgroup_name').val(),
 				MonNum:$('#Single_number').val(),				
@@ -1037,8 +876,7 @@
 				test_type:$('#test_type').val()
 			}
 		};
-		//console.info(temp);
-		//console.info($("#search_form").serialize());
+		// 鏌ヨ鍐呭
 		if(battgroupid!=undefined && battgroupid!=0){
 			$.post("Batt_MaintAction!serchMon_num",$("#search_form").serialize(),function(data){
 				arrResisTestTd=new Array();
@@ -1046,7 +884,7 @@
 				data=data.result;
 				var model = eval("("+data+")");
 				//alert(battgroupid);
-				//console.info(model);
+				console.info(model);
 				var totalcount = 0;
 				if(model.code==1 && model.data.length>0){					
 					data = model.data;
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 72d80f5..0bd219c 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -35,8 +35,10 @@
 				<!-- 缁存姢鍖轰俊鎭� -->
 				<table>
 					<tr class="fWeight">
-						<!-- 缁存姢鍖� -->
-						<td><s:text name="Maintenance_area"/></td>
+						<!-- 鐪� -->
+						<td>鐪�</td>
+						<!-- 甯� -->
+						<td>甯�</td>
 						<!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
 						<td><s:text name="Computer_site"/></td>
 						<!-- 钃勭數姹犵粍 -->
@@ -55,6 +57,10 @@
 					<tr>
 						<td>
 							<select id="station_name1" name="bd.binf.StationName1">
+							</select>
+						</td>
+						<td>
+							<select id="city" name="bd.binf.StatioName2">
 							</select>
 						</td>
 						<td>
@@ -256,10 +262,10 @@
 			$.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
 				//alert(123);
 				data=eval("("+data.result+")");
+				//console.info(data);
 				if(data.code==1 && data.data.length>0){
 					data=data.data;
 					battinfo_list = data;
-					console.info(data);					
 					//console.info(Pmodel);
 					arr=new Array();
 					index=0;
@@ -276,50 +282,6 @@
 						arr[index++]=data[i].BattProducer;							//鐢垫睜鍝佺墝
 						arr[index++]=data[i].BattProductDate.substr(0,10);			//鐢垫睜鐢熶骇鏃ユ湡
 						arr[index++]=data[i].BattInUseDate.substr(0,10);			//鐢垫睜瀹夎鏃ユ湡
-						/* if(data[i].tmodel.code==1 && data[i].tmodel.data.length>0){
-							
-							//console.info(data[i].tmodel+"&&");
-							arr[index++]=data[i].tmodel.sum;							//鏀剧數鎬昏褰曟暟
-							arr[index++]=data[i].tmodel.newsum;							//鏂板鏀剧數娴嬭瘯娆℃暟
-							arr[index++]=data[i].tmodel.data[0].test_starttime;			//鏂板鏀剧數鏃堕棿
-						}else{
-							
-							arr[index++]=data[i].amodel.sum;							//鏀剧數鎬昏褰曟暟
-							arr[index++]=data[i].amodel.newsum;							//鏂板鏀剧數娴嬭瘯娆℃暟
-							arr[index++]='-';			//鏂板鏀剧數鏃堕棿
-						}
-						if(data[i].mmodel.code>0 && data[i].mmodel.data.length>0){
-							arr[index++]=data[i].mmodel.sum;							//鐢垫睜寮傚父缁存姢娆℃暟
-							arr[index++]=data[i].mmodel.data[0].maint_done_time;		//鏈�杩戠淮鎶ゆ椂闂�
-						}else{
-							arr[index++]=data[i].mmodel.sum;							//鐢垫睜寮傚父缁存姢娆℃暟
-							arr[index++]='-';											//鏈�杩戠淮鎶ゆ椂闂�
-						}				
-						arr[index++]=data[i].amodel.sum;							//鍛婅璁板綍鎬绘暟
-						arr[index++]=data[i].amodel.newsum;							//鏂板鍛婅璁板綍鏉℃暟
-											
-						
-						if(data[i].tmodel.code!=0 && data[i].tmodel.data.length>0){	
-							//console.info(data[i].tmodel.data[0].test_cap);
-							arr[index++]=Math.round(GetMonomerCap(data[i].data.binf.MonCapStd,GetHourRate(data[i].data.binf.MonCapStd,data[i].tmodel.data[0].test_curr),data[i].tmodel.data[0].test_cap,data[i].tmodel.data[0].max_monvol,data[i].tmodel.data[0].min_monvol,data[i].data.binf.MonVolStd,CapType_Real));
-						}else{
-							arr[index++]=0;												//瀹為檯瀹归噺棰勪及
-						
-						}
-						if(data[i].smodel.code!=0){
-							arr[index++]=0;
-							arr[index++]=0;
-							arr[index++]=0;
-						}else{
-							arr[index++]=0;
-							arr[index++]=0;
-							arr[index++]=0;
-						}
-						if(data[i].umodel.code==1){
-							arr[index++]=data[i].umodel.msg;					//鍖呮満浜�
-						}else{
-							arr[index++]=" ";
-						} */
 					}
 					
 					var arraytd=new Array();
@@ -604,42 +566,82 @@
 			}else{
 				$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
 			}
-			findStationNamebyStationname1();		
+			findCity();		
 		});
 	});
 	
-	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+	// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+	function findCity() {
+		var data = {
+			StationName1: $("#station_name1").val()
+		};
+		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName2",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+	        	var rs = JSON.parse(data.result);
+	        	var $select = $("#city");
+	        	if(rs.code == 1) {
+	        		var _data= rs.data;
+	        		// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+					var optsList = [];
+					for(var i=0;i<_data.length;i++){
+						var __data = _data[i];
+						var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+						optsList.push(tmp);
+					}
+					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+					createOptions($select, optsList, true);
+	        	}else {
+	        		$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+	        	}
+	        	findStationNamebyStationname1();
+	        }
+	    });
+	}
+	
+	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
 	$('#station_name1').change(function(){
+		findCity();
+	});
+	
+	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+	$('#city').change(function(){
 		findStationNamebyStationname1();
 	});
 	
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+	//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
 	function findStationNamebyStationname1(){
-		var user = {
-			UNote:$("#station_name1 option:selected").val()
+		var tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val()
 		};
 		//var selectvalue=$("#station_name1 option:selected").val();
 		//alert(selectvalue);
-		$.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
-			//console.info(data);
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
+		$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+			var rs = JSON.parse(data.result);
+			if(rs.code==1){
+				var _data = rs.data;
 				var $select = $("#station_name");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i==0){
-						$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
-						$option.attr("value", "");			
-					}else{
-						$option.text(data.data[i-1]);
-						$option.attr("value",data.data[i-1]);	
-					}					
-					$select.append($option);
+				// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+				var optsList = [];
+				for(var i=0;i<_data.length;i++){
+					var __data = _data[i];
+					var _attr = {
+						StationId: __data.StationId
+					};
+					var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+					optsList.push(tmp);
 				}
+				
+				// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+				createOptions($select, optsList, true);
 			}else{
-				$("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+				$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 			}
 			findserchByBattGroupNamebystationname();
 		});
@@ -649,220 +651,49 @@
 		findserchByBattGroupNamebystationname();
 	});
 	
-	//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
+	//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
 	function findserchByBattGroupNamebystationname(){
-		var user = {
-			UNote:$("#station_name1 option:selected").val(),
-			UName:$("#station_name option:selected").val()
+		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+		// 鏋勯�犳煡璇㈡潯浠�
+		var tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val(),
+			StationName3: $("#station_name").val(),
+			StationId: stationid
 		};
 	
 		//var station_name1=$("#station_name1 option:selected").val();
 		//var station_name=$("#station_name option:selected").val();
 		
-		$.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
+		$.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
 			data=data.result;
 			//console.info(data);
 			data=eval("("+data+")");
 			//console.info(data);		
 			if(data.code==1 && data.data.length>0){
 				var $select = $("#battgroup_name");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					$option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
-						$option.attr("value",data.data[i-1].BattGroupId);
-						$option.attr("stationname",data.data[i-1].StationName);
-					}else{
-						$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
-						$option.attr("value", "0");
-					}
-					$select.append($option);
-				}
-			}else{
-				$("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
-			}
-		});
-	}
-	
-	/* $(document).ready(function(){
-		//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
-		$.post("BattInfAction_serchByStation",null,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			//console.info(data);
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#station_name1");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					$option=$("<option></option>");
-					if(i==0){
-						$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");	
-						$option.attr("value", "");			
-					}else{
-						$option.text(data.data[i-1].StationName1);
-						$option.attr("value",data.data[i-1].StationName1);	
-					}					
-					$select.append($option);
-				}				
-			}
-			findStationNamebyStationname1();		
-		});
-		
-		//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-		$('#station_name1').change(function(){
-			
-			findStationNamebyStationname1();
-		});
-		
-		//鏌ヨ鐢垫睜鍝佺墝
-		$.post("BattInfAction_serchByBattProducer",null,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#batt_producer");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].BattProducer);
-						$option.attr("value", data.data[i-1].BattProducer);	
-					}else{
-						$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
-						$option.attr("value", "");	
-					}
-					$select.append($option);
-				}
-			}
-		});
-		
-		
-		//鏌ヨ鍗曚綋鐢靛帇
-		$.post("BattInfAction_serchByMonVolStd",null,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#monvol_std");
-				$select.text('');
-				//console.info(data)
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].MonVolStd);
-						$option.attr("value", data.data[i-1].MonVolStd);	
-					}else{
-						$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
-						$option.attr("value", 0);	
-					}
-					$select.append($option);
-				}
-			}
-		});	
-		
-		//鏌ヨ鐢垫睜瀹归噺
-		$.post("BattInfAction_serchByMonCapStd",null,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#moncap_std");
-				$select.text('');
-				//console.info(data)
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].MonCapStd);
-						$option.attr("value", data.data[i-1].MonCapStd);	
-					}else{
-						$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
-						$option.attr("value", 0);	
-					}
-					$select.append($option);
-				}
-			}
-		});
-		
-		//鏌ヨ鍖呮満浜�
-		$.post("User_infAction_searchAll",null,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			//console.info(data);
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#baojiren");
-				$select.text('');
-				//console.info(data)
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].UName);
-						$option.attr("value", data.data[i-1].UName);	
-					}else{
-						$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
-						$option.attr("value", "0");	
-					}
-					$select.append($option);
-				}
-			}
-		});					
-	});
-	
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-	function findStationNamebyStationname1(){
-		var selectvalue=$("#station_name1 option:selected").val();
-		//alert(selectvalue);
-		$.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
-			//console.info(data);
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#station_name");
-				$select.text('');
+				// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+				var optsList = [];
 				for(var i=0;i<data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i==0){
-						$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");	
-						$option.attr("value", "");			
-					}else{
-						$option.text(data.data[i-1].StationName);
-						$option.attr("value",data.data[i-1].StationName);	
-					}					
-					$select.append($option);
+					var _data = data.data[i];
+					var _attr = {
+						stationname: _data.StationName,
+						dev_id: _data.FBSDeviceId,
+						batt_num: _data.GroupIndexInFBSDevice+1
+					};
+					var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
+					var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+					optsList.push(tmp);
 				}
+				
+				// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+				createOptions($select, optsList, true);
+				$select.find('option').eq(0).val(0);
+			}else{
+				$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
 			}
-			findserchByBattGroupNamebystationname();
 		});
 	}
-	
-	$('#station_name').change(function(){
-		findserchByBattGroupNamebystationname();
-	});
-	
-	//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
-	function findserchByBattGroupNamebystationname(){
-		var station_name1=$("#station_name1 option:selected").val();
-		var station_name=$("#station_name 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);		
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#battgroup_name");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					$option=$("<option></option>");
-					if(i!=0){
-						$option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
-						$option.attr("value",data.data[i-1].BattGroupId);
-					}else{
-						$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
-						$option.attr("value", "0");
-					}
-					$select.append($option);
-				}
-			}
-		});
-	} */
 	
 	//椤甸潰鍔犺浇鏃跺垵濮嬪寲鏃堕棿
 	$(document).ready(function(){
@@ -1077,6 +908,7 @@
 			},
 			binf:{
 				StationName1:$('#station_name1').val(),
+				StationName2:$('#city').val(),
 				StationName:$('#station_name').val(),
 				BattGroupId:$('#battgroup_name').val(),
 				BattProducer:$('#batt_producer').val(),

--
Gitblit v1.9.1