From 44d9cc533a7ff51146d6f33530c84ef4f50dbe2e Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 27 九月 2018 16:58:13 +0800
Subject: [PATCH] station3->0

---
 gx_tieta/WebRoot/equipHistWarn1.jsp |  164 +++++++++++++++++++++++++-----------------------------
 1 files changed, 76 insertions(+), 88 deletions(-)

diff --git a/gx_tieta/WebRoot/equipHistWarn1.jsp b/gx_tieta/WebRoot/equipHistWarn1.jsp
index 10be0cc..d1f260e 100644
--- a/gx_tieta/WebRoot/equipHistWarn1.jsp
+++ b/gx_tieta/WebRoot/equipHistWarn1.jsp
@@ -89,13 +89,18 @@
                     <!-- 缁存姢鍖轰俊鎭� -->
                     <table>
                         <tr class="fWeight">
-                            <td><s:text name="Maintenance_area"/></td>				<!-- 缁存姢鍖� -->
+                            <td>鐪�</td>				<!-- 鐪� -->
+                            <td>甯�</td>				<!-- 甯� -->
                             <td><s:text name="Computer_name"/></td>					<!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
                             <td colspan="2"><s:text name="Alarm_start_time"/></td>	<!-- 鍛婅寮�濮嬫椂闂存 -->
                         </tr>
                         <tr>
                             <td>
                                 <select id="station_name1" name="station_name1">
+                                </select>
+                            </td>
+                            <td>
+                                <select id="city" name="station_name2">
                                 </select>
                             </td>
                             <td>
@@ -523,7 +528,8 @@
 		});
     }
     
-    $(document).ready(function(){
+    // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+	$(document).ready(function(){
 		//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
 		$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
 			data=data.result;
@@ -546,118 +552,99 @@
 			}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.StationName, __data, _attr);
+					optsList.push(tmp);
 				}
+				
+				// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+				createOptions($select, optsList, true);
 			}else{
-				$("#station_name").text('').html('<option>鏆傛棤绠$悊鐨勬満鎴跨珯鐐�</option>');
+				$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 			}
 			seachDevHisAlarm();
 		});
 	}
-    
-   /*  //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
-	$.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();
+	// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
+	$('#station_name').change(function(){
+		seachDevHisAlarm();
 	});
-	
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-	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++){
-					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);	
-						if(stationid !=undefined && stationid == data.data[i-1].StationName){
-							$option.attr("selected",true);
-						}						
-					}					
-					$select.append($option);					
-				}
-				seachDevHisAlarm();
-			}
-		});
-	} */
 	
 	//鏋勯�犳煡璇㈡潯浠�
 	function createSearchParam(){
 		var temp = {
 			binf:{
 				StationName:$('#station_name').val(),		//鏈烘埧鍚�
-				StationName1:$('#station_name1').val(),		//缁存姢鍖�
+				StationName2:$('#city').val(),		// 甯�
+				StationName1:$('#station_name1').val(),		// 鐪�
 				BattProductDate:$('#starttime').val()+" 00:00:00",
 				BattProductDate1:$('#endtime').val()+" 23:59:59",
 			},
@@ -666,6 +653,7 @@
 				pageCurr:Page.pageCurr,						//褰撳墠椤�
 			}
 		};
+		console.log(temp);
 		return temp;
 	}
 	

--
Gitblit v1.9.1