From 8b67d0abb22ebbab192fa51be7f271eb215999d9 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.9>
Date: 星期一, 26 十一月 2018 15:34:06 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/equip-charge-param.jsp |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/WebRoot/equip-charge-param.jsp b/gx_tieta/WebRoot/equip-charge-param.jsp
index 4d2d88d..7cc7238 100644
--- a/gx_tieta/WebRoot/equip-charge-param.jsp
+++ b/gx_tieta/WebRoot/equip-charge-param.jsp
@@ -36,7 +36,7 @@
 	<div id="main">
 		<!-- 鏌ヨ鏉′欢寮�濮� -->
 		<div class="query-list">
-			<div class="query-header"><a href="javascript:;"><s:text name="Equipment_discharg_model_param"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>			<!-- 璁惧鍏呮斁鐢垫ā鍧楀弬鏁�  鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
+			<div class="query-header"><a href="javascript:;"><s:text name="Discharg_model_state"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>			<!-- 璁惧鍏呮斁鐢垫ā鍧楀弬鏁�  鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
 			<!-- 鏌ヨ鏉′欢鍐呭寮�濮� -->
 			<div class="query-body">
 				<form action="" id="search_form">
@@ -245,7 +245,7 @@
 		        success: function(data){ 
 		        	data = eval('('+data+')');
 		        	var model = eval('('+data.result+')');
-		        	console.info(model);
+		        	//console.info(model);
 		        	if(model.code == 1){
 		        		for(var i = 0;i<model.data.length;i++){
 		        			data = model.data;
@@ -356,10 +356,13 @@
 			}); 
 		}
 		
+		
+		var isNewLoad = true;			//鏄惁绗竴娆″姞杞介〉闈�
 		// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
 		var filterLoad;
 		$(document).ready(function(){
 			filterLoad = layer.load();
+			var pre_province = getQueryString('province');
 			//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
 			$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
 				data=data.result;
@@ -376,6 +379,9 @@
 						}else{
 							$option.text(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);
 					}
@@ -395,6 +401,7 @@
 			if(isLoad) {
 				filterLoad = layer.load();
 			}
+			var pre_city = getQueryString("city");
 			// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
 			$.ajax({ 	
 		        type: "post", 				
@@ -412,6 +419,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);
 						}
 						// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -434,6 +444,7 @@
 			if(isLoad) {
 				filterLoad = layer.load();
 			}
+			var pre_county = getQueryString('county'); 
 			// 鏌ヨ鍖哄幙
 			$.ajax({
 				type: 'post',
@@ -453,6 +464,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);
 						}
 						
@@ -492,6 +506,9 @@
 			if(isLoad) {
 				filterLoad = layer.load();
 			}
+			var pre_home = getQueryString('home');
+			
+			var auto_seach = false;
 			//var selectvalue=$("#station_name1 option:selected").val();
 			//alert(selectvalue);
 			$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -509,6 +526,11 @@
 							'dev_name': __data.FBSDeviceName
 						};
 						var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);
+						if(pre_home == __data.StationName && isNewLoad){
+							tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr,{},true);
+							auto_seach = true;
+							
+						}
 						optsList.push(tmp);
 					}
 					
@@ -517,7 +539,11 @@
 				}else{
 					$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 				}
-				
+				if(auto_seach){
+					var temp = createSearchParam();
+					searchModelParam(temp);
+				}
+				isNewLoad = false;
 				layer.close(filterLoad);
 			});
 		}
@@ -536,7 +562,7 @@
 		$("#pre").click(function(){
 			if(Page!=undefined){
 				var currentPage = Page.pageCurr;
-				console.info(Page);
+				//console.info(Page);
 				if(Page != undefined && currentPage>1){
 					//console.info(Pmodel.data);
 					Page.pageCurr = currentPage - 1;

--
Gitblit v1.9.1