From 1f4e9c5e2a5f7797c8a7686ccc88cff212cacfd1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 27 九月 2018 15:24:56 +0800
Subject: [PATCH] 电池历史和实时告警省-市-机房-电池组联动

---
 gx_tieta/WebRoot/elewarn.jsp            |  254 +++++++-----------
 gx_tieta/WebRoot/eleHistoryWarn.jsp     |  258 +++++++-----------
 gx_tieta/WebRoot/equip-charge-param.jsp |  147 ++++++---
 gx_tieta/WebRoot/equipment.jsp          |  144 ++++++---
 4 files changed, 390 insertions(+), 413 deletions(-)

diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index 589a0c0..e7b7f1a 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -40,7 +40,8 @@
 						<table>
 							<tbody>
 								<tr>
-									<th><s:text name="Maintenance_area"/></th>														<!-- 缁存姢鍖� -->
+									<th>鐪�</th>														<!-- 鐪� -->
+									<th>甯�</th>														<!-- 甯� -->
 									<th><s:text name="Computer_site"/></th>															<!-- 鏈烘埧绔欑偣 -->
 									<th><s:text name="Battery"/></th>																<!-- 钃勭數姹犵粍 -->
 									<th colspan="2" style="width: 30%;"><s:text name="Alarm"/><s:text name="Start_date"/></th>		<!-- 寮�濮嬪憡璀︽棩鏈� -->
@@ -48,6 +49,11 @@
 								<tr>
 									<td>
 										<select name="" id="station_name1">
+											
+										</select>
+									</td>
+									<td>
+										<select name="" id="city">
 											
 										</select>
 									</td>
@@ -386,7 +392,8 @@
 			var temp={
 				page:Page,
 				binf:{
-					StationName1:$('#station_name1').val(),													//缁存姢鍖�
+					StationName1:$('#station_name1').val(),													// 鐪�
+					StationName2:$('#city').val(),															// 甯�
 					StationName:$('#station_name').val(),													//鏈烘埧鍚嶇О
 					BattGroupId:$('#battgroup_name').val(),													//鐢垫睜缁勫悕绉�
 				},
@@ -418,6 +425,7 @@
 			return temp;
 		}
 		
+		// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
 		$(document).ready(function(){
 			//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
 			$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -441,201 +449,139 @@
 				}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 user = {
-				UNote:$("#station_name1 option:selected").val()
+			var tmp = {
+				StationName1:$("#station_name1").val(),
+				StationName2:$("#city").val()
 			};
-			var stationid = getQueryString("stationId");
 			//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]);
-							if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
-								$option.attr("selected",true);
-								isNewload = false;
-							}	
-						}					
-						$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 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);
+					// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+					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);
 					}
-					searchHistalm();			//鍔犺浇瀹岀數姹犵粍灏辨煡璇㈠憡璀�
+					
+					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+					createOptions($select, optsList, true);
+					$select.find('option').eq(0).val(0);
+					
+					searchHistalm();	// 鏌ヨ鍘嗗彶鍛婅
 				}else{
-					$("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
+					$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
 				}
 			});
 		}
 		
-		
-		/* $(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++) {
-						var $option = $("<option></option>");
-						if (i == 0) {
-							$option.html("<s:text name='All'/>(<s:text name='Common'/>"+ data.sum+ "<s:text name='Species'/>)");
-							$option.val("");
-						} else {
-							$option.text(data.data[i - 1].StationName1);
-							$option.val(data.data[i - 1].StationName1);
-						}
-						$select.append($option);
-					}
-				}
-				findStationNamebyStationname1();
-			});
-	
-			//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-			$('#station_name1').change(function() {
-				findStationNamebyStationname1();
-			});
-		});
-		
-		//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-		function findStationNamebyStationname1() {
-			var stationid = getQueryString("stationId");
-			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('');
-					for ( var i = 0; i <= data.data.length; i++) {
-						$option = $("<option></option>");
-						if (i == 0) {
-							$option.text("<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);								
-							if(stationid != undefined && stationid == data.data[i-1].StationId){
-								$option.attr("selected",true);
-							}
-						}
-						$select.append($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();
-			if(station_name.length == 0){
-				var $select = $("#battgroup_name");
-				$select.text('');
-				var $option = $("<option></option>");
-				$option.html("<s:text name='All'/>");
-				$option.attr("value", "0");
-				$select.append($option);
-				searchHistalm();
-			}else{
-				$.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.innerHTML = "鍏ㄩ儴钃勭數姹犵粍锛堝叡"	+ data.sum + "缁勶級";
-								$option.html("<s:text name='All'/>锛�<s:text name='Common'/>"	+ data.sum + "<s:text name='Species'/>锛�");
-								$option.attr("value", "0");
-							}
-							$select.append($option);
-						}
-						searchHistalm();
-					}
-				});
-			}
-		} */
-		
+		// 鏇存柊鐢垫睜缁勫悕绉版煡璇㈠巻鍙插憡璀�
 		$('#battgroup_name').on("change",function(){
 			searchHistalm();
 		});
diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index fb073c2..4285093 100644
--- a/gx_tieta/WebRoot/elewarn.jsp
+++ b/gx_tieta/WebRoot/elewarn.jsp
@@ -35,13 +35,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>
@@ -342,7 +348,7 @@
 		$.post("Battalarm_dataAction!serchByCondition",$('#search_form').serialize(),function(data){
 			data=data.result;
 			data=eval("("+data+")");
-			console.info(data);
+			//console.info(data);
 			var pagecurr=parseInt($('#pageCurr').attr('value'));
 			var pagesize=parseInt($('#pageSize').attr('value'));					
 			if(data.code==1 && data.data.length>0){
@@ -551,6 +557,7 @@
 		eleform.submit();
 	}
 	
+	// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
 	$(document).ready(function(){
 		//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
 		$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -574,200 +581,137 @@
 			}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 user = {
-			UNote:$("#station_name1 option:selected").val()
+		var tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val()
 		};
-		var stationid = getQueryString("stationId");
 		//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]);
-						if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
-							$option.attr("selected",true);
-							isNewload = false;
-						}	
-					}					
-					$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 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);
+				// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+				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);
+				
 				searchAlarm();			//鍔犺浇瀹岀數姹犵粍灏辨煡璇㈠憡璀�
 			}else{
-				$("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
+				$("#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 $seleect=$("#station_name1");
-			 $seleect.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);	
-				}					
-				 $seleect.append($option);
-			}				
-		}
-		findStationNamebyStationname1();		
-	}); 
-	
-	
-	
-	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-	$('#station_name1').change(function(){
-		findStationNamebyStationname1();
-	});
-		
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-	function findStationNamebyStationname1(){
-		var stationid = getQueryString("stationId");
-		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+")");
-			//console.info(stationid);
-			//console.info(data);
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#station_name");
-				$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].StationName);
-						$option.attr("value",data.data[i-1].StationName);
-						if(stationid!=undefined && stationid == data.data[i-1].StationId){
-							$option.attr("selected",true);
-						}	
-					}					
-					$select.append($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();
-		if(station_name.length == 0){
-			var $select = $("#battgroup_name");
-			$select.text('');
-			var $option=$("<option></option>");
-			$option.html("<s:text name='All'/>");
-			$option.attr("value", "0");
-			$select .append($option);
-			searchAlarm();			//鍔犺浇瀹岀數姹犵粍灏辨煡璇㈠憡璀�
-		}else{
-			$.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+"鑺�");
-							$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);
-					}
-					searchAlarm();			//鍔犺浇瀹岀數姹犵粍灏辨煡璇㈠憡璀�
-				}
-			});
-		}		
-	}
-	*/
 	
 	//椤甸潰涓〃鏍肩殑鐐瑰嚮浜嬩欢
 	$(document).ready(function(){
diff --git a/gx_tieta/WebRoot/equip-charge-param.jsp b/gx_tieta/WebRoot/equip-charge-param.jsp
index ba216b7..28bbe8a 100644
--- a/gx_tieta/WebRoot/equip-charge-param.jsp
+++ b/gx_tieta/WebRoot/equip-charge-param.jsp
@@ -42,7 +42,8 @@
 				<table>
 					<thead>
 						<tr>
-							<th><s:text name="Maintenance_area"/><!-- 缁存姢鍖� --></th>
+							<th>鐪�<!-- 鐪� --></th>
+							<th>甯�<!-- 甯� --></th>
 							<th><s:text name="Computer_site"/><!-- 鏈烘埧绔欑偣 --></th>
 						</tr>
 					</thead>
@@ -50,6 +51,10 @@
 						<tr>
 							<td>
 								<select id="station_name1" name="station_name1">
+								</select>
+							</td>
+							<td>
+								<select id="city" name="station_name2">
 								</select>
 							</td>							
 							<td>
@@ -305,7 +310,6 @@
 		        success: function(data){ 
 		        	data = eval('('+data+')');
 		        	var model = eval('('+data.result+')');
-		        	console.info(model);
 		        	if(model.code == 1){
 		        		var arr = new Array();
 		        		for(var i = 0;i<model.data.length;i++){
@@ -349,72 +353,111 @@
 			}); 
 		}
 		
-		
+		// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
 		$(document).ready(function(){
 			//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
-			$.post("BattInfAction!serchByStationNot91",null,function(data){
+			$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
 				data=data.result;
 				data=eval("("+data+")");
 				//console.info(data);
-				var $select=$("#station_name1");
-				$select.text("");
 				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.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].StationName1);
-							$option.attr("value",data.data[i-1].StationName1);	
+							$option.text(data.data[i-1]);
+							$option.attr("value",data.data[i-1]);	
 						}					
 						$select.append($option);
-					}				
-				}else{
-					var $option=$("<option>鏆傛棤9100S缁存姢鍖�</option>");
-					$select.append($option);
-				}
-				findStationNamebyStationname1();		
-			});
-			
-			//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-			$('#station_name1').change(function(){
-				findStationNamebyStationname1();
-			});
-			
-			//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-			function findStationNamebyStationname1(){
-				//var stationid = getQueryString("stationId");
-				var selectvalue=$("#station_name1 option:selected").val();
-				//alert(selectvalue);
-				$.post("BattInfAction!serchByStationNameNot91","bif.StationName1="+selectvalue,function(data){
-					//console.info(data);
-					data=data.result;
-					data=eval("("+data+")");
-					console.info(data);
-					if(data.code==1 && data.data.length>0){
-						var $select = $("#station_name");
-						$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].StationName);
-								$option.attr("value",data.data[i-1].FBSDeviceId);
-								$option.attr("dev_name",data.data[i-1].FBSDeviceName);
-								$option.attr("stataion_name",data.data[i-1].StationName);
-								$option.attr("stataion_name1",data.data[i-1].StationName1);
-								$select.append($option);	
-							}					
-							
-						}
 					}
-				});
-			}
+				}else{
+					$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+				}
+				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 tmp = {
+				StationName1:$("#station_name1").val(),
+				StationName2:$("#city").val()
+			};
+			//var selectvalue=$("#station_name1 option:selected").val();
+			//alert(selectvalue);
+			$.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");
+					// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+					var optsList = [];
+					for(var i=0;i<_data.length;i++){
+						var __data = _data[i];
+						var _attr = {
+							'stataion_name1': __data.StationName1,
+							'stataion_name': __data.StationName3,
+							'dev_name': __data.FBSDeviceName
+						};
+						var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);
+						optsList.push(tmp);
+					}
+					
+					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+					createOptions($select, optsList);
+				}else{
+					$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+				}
+			});
+		}
 		
 		//棣栭〉
 		$('#home').click(function(){
diff --git a/gx_tieta/WebRoot/equipment.jsp b/gx_tieta/WebRoot/equipment.jsp
index 923bf44..cd153cb 100644
--- a/gx_tieta/WebRoot/equipment.jsp
+++ b/gx_tieta/WebRoot/equipment.jsp
@@ -66,7 +66,8 @@
 				<input type="hidden" value="10" name="bup.page.pageSize" id="pageSize" />
 				<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 ="Statistical"/><s:text name ="Parameter"/></td>	<!-- 缁熻鍙傛暟 -->
 						
@@ -77,6 +78,10 @@
 					<tr>
 						<td>
 							<select id="station_name1">
+							</select>
+						</td>
+						<td>
+							<select id="city">
 							</select>
 						</td>
 						<td>
@@ -833,77 +838,116 @@
         	}				
 		});
 	}
-	
-
+	// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
 	$(document).ready(function(){
 		//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
-		$.post("BattInfAction_serchByStation",null,function(data){
+		$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",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("");
+				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.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].StationName1);
-						$option.attr("value",data.data[i-1].StationName1);	
+						$option.text(data.data[i-1]);
+						$option.attr("value",data.data[i-1]);	
 					}					
 					$select.append($option);
-				}				
-			}
-			findStationNamebyStationname1();
-
-			var $yearselect = $('#search-year');	
-			var d = new Date();
-			//console.info(d.getFullYear());
-			for(var i=1970;i<= d.getFullYear();i++){
-				var $option = $("<option></option>");
-				$option.attr("value",i);
-				$option.text(i);
-				if(i == d.getFullYear()){
-					$option.attr("selected", true);
 				}
-				$yearselect.append($option);
+			}else{
+				$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
 			}
+			findCity();		
 		});
-		
-		//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-		$('#station_name1').change(function(){
-			findStationNamebyStationname1();
-		});
-			
-		//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-		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+")");
-				//console.info(data);
-				if(data.code==1 && data.data.length>0){
-					var $select = $("#station_name");
-					$select.text("");
-					for(var i=0;i<data.data.length;i++){
-						$option=$("<option></option>");
-						$option.text(data.data[i].StationName);
-						$option.attr("value",data.data[i].StationId);	
-						$select.append($option);
-					}
-				}
-			});
-		}
 	});
 	
+	// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+	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 tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val()
+		};
+		//var selectvalue=$("#station_name1 option:selected").val();
+		//alert(selectvalue);
+		$.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");
+				// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+				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);
+			}else{
+				$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+			}
+		});
+	}
+	
+	// 鏌ヨ淇℃伅
 	function createSearchParam(){
 		var temp = {
 			StationId:$('#station_name').val(),
 			StationName1:$('#station_name1').val(),
+			StationName2:$('#city').val(),
 			BattProductDate:$('#startime').val()+" 00:00:00",
 			BattProductDate1:$('#endtime').val()+" 23:59:59",
 			MonCount:Page.pageCurr,

--
Gitblit v1.9.1