From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/batt-state-statistical.jsp |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 74fd3e5..6474a11 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -10,7 +10,7 @@
   	<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
     <base href="<%=basePath%>">
-    <title><s:text name="Station_statestatistical"/></title>			<!-- 鏈烘埧鐘舵�佺粺璁℃煡璇�  -->
+    <title><s:text name="Station_histor_events_query"/></title>			<!-- 鏈烘埧鍘嗗彶浜嬩欢鏌ヨ  -->
 	<link rel="stylesheet" href="css/basic.css">
 	<link rel="stylesheet" type="text/css" href="css/nocontent.css">
 	<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -36,7 +36,7 @@
 	<!--瀵艰埅寮�濮�-->
 	<jsp:include page="nav.jsp" flush="true"/>
 	<div class="filter-container">
-		<div class="filter-title"><a href="javascript:;"><s:text name="Station_statestatistical"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>
+		<div class="filter-title"><a href="javascript:;"><s:text name="Station_histor_events_query"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>
 		<div class="filter-content">
 			<table>
 				<tbody>
@@ -252,10 +252,10 @@
 					dataType:'json',
 					data:"json="+json,
 					success:function(data){
-						console.info(data);
+						//console.info(data);
 						var data=JSON.parse(data.result);
 						if(data.code==1&&data!=null){
-							console.log(data.data);
+							//console.log(data.data);
 							tOptions.data = data.data;
 	     				}else {
 	     					tOptions.data = [];
@@ -344,9 +344,10 @@
 				return rs;
 			}
 			
-			
+			var isNewLoad = true;
 			// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
 			var filterLoad = layer.load();
+			var pre_province = getQueryString('province');
 			$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
 				data=data.result;
 				data=eval("("+data+")");
@@ -361,7 +362,11 @@
 							$option.attr("value", "");			
 						}else{
 							$option.text(data.data[i-1]);
-							$option.attr("value",data.data[i-1]);	
+							$option.attr("value",data.data[i-1]);
+							if(pre_province == data.data[i-1] && isNewLoad){
+								$option.attr("selected",true);
+							}	
+							
 						}					
 						$select.append($option);
 					}
@@ -379,6 +384,7 @@
 				if(isLoad) {
 					filterLoad = layer.load();
 				}
+				var pre_city = getQueryString('city');
 				// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
 				$.ajax({ 	
 			        type: "post", 				
@@ -396,6 +402,9 @@
 							for(var i=0;i<_data.length;i++){
 								var __data = _data[i];
 								var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+								if(pre_city == __data.StationName2 && isNewLoad){
+									tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+								}
 								optsList.push(tmp);
 							}
 							// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -418,6 +427,7 @@
 				if(isLoad) {
 					filterLoad = layer.load();
 				}
+				var pre_county = getQueryString('county');
 				// 鏌ヨ鍖哄幙
 				$.ajax({
 					type: 'post',
@@ -437,6 +447,9 @@
 									StationId: __data.StationId
 								};
 								var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+								if(pre_county == __data.StationName5 && isNewLoad){
+									tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);
+								}
 								optsList.push(tmp);
 							}
 							
@@ -474,6 +487,8 @@
 				if(isLoad) {
 					filterLoad = layer.load();
 				}
+				var pre_home = getQueryString('home');
+				var auto_search = false;
 				//var selectvalue=$("#station_name1 option:selected").val();
 				//alert(selectvalue);
 				$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -489,6 +504,10 @@
 								StationId: __data.StationId
 							};
 							var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+							if(pre_home == __data.StationName && isNewLoad){
+								tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);
+								auto_search = true;
+							}
 							optsList.push(tmp);
 						}
 						
@@ -497,8 +516,11 @@
 					}else{
 						$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 					}
-					
+					isNewLoad = false;
 					layer.close(filterLoad);
+					if(auto_search){
+						serachBattStatistical();
+					}
 				});
 			}
 		});

--
Gitblit v1.9.1