From 2e979a30ffd7fabf7e1a4d9fbd419c24603073ed Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 14:46:40 +0800
Subject: [PATCH] 添加筛选条件加载等待

---
 gx_tieta/WebRoot/dischargetest.jsp |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 8655f70..7df1b5a 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -17,6 +17,7 @@
 	<link rel="stylesheet" type="text/css" href="font-awesome-4.7.0/css/font-awesome.min.css">
     <link rel="stylesheet" type="text/css" href="font-awesome-4.7.0/css/font-awesome-animation.min.css">
     <link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
+    <link href="src/css/layui.css" type="text/css" rel="stylesheet">
 	<style>
 		.confirm {
 			z-index: 999;
@@ -538,6 +539,7 @@
 	<script type="text/javascript" src="js/elecircle.content.js"></script>
 	<script type="text/javascript" src="js/mypattern.js"></script>
 	<script type="text/javascript" src="js/whyc-jqueryui.js"></script>
+	<script type="text/javascript" src="src/layui.all.js"></script>
 	<script type="text/javascript">
 		var arrTh = new Array();
 		var arrTd = new Array();
@@ -1131,8 +1133,10 @@
 			}
 		}
 		
-		
+		// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+		var filterLoad;
 		$(document).ready(function(){
+			filterLoad = layer.load();
 			//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
 			$.post("BattInfAction!serchAllStation",null,function(data){
 				data=data.result;
@@ -1157,10 +1161,16 @@
 		});
 		
 		// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
-		function findCity() {
+		function findCity(isLoad) {
 			var data = {
 				StationName1: $("#station_name1").val()
 			};
+			
+			// 鏄惁娣诲姞绛夊緟
+			if(isLoad) {
+				filterLoad = layer.load();
+			}
+			
 			// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
 			$.ajax({ 	
 		        type: "post", 				
@@ -1195,26 +1205,29 @@
 		
 		//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
 		$('#station_name1').change(function(){
-			findCity();
+			findCity(true);
 		});
 		
 		//褰撳競鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
 		$('#city').change(function(){
-			findCounty();
+			findCounty(true);
 		});
 		
 		//褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
 		$('#county').change(function(){
-			findStationNamebyStationname1();
+			findStationNamebyStationname1(true);
 		});
 		
 		// 鏌ヨ鍖�/鍘�
-		function findCounty() {
+		function findCounty(isLoad) {
 			var tmp = {
 				StationName1:$("#station_name1").val(),
 				StationName2:$("#city").val(),
 			};
-			
+			// 鏄惁娣诲姞绛夊緟
+			if(isLoad) {
+				filterLoad = layer.load();
+			}
 			// 鏌ヨ鍖哄幙
 			$.ajax({
 				type: 'post',
@@ -1248,12 +1261,16 @@
 		}
 		
 		//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-		function findStationNamebyStationname1(){
+		function findStationNamebyStationname1(isLoad){
 			var tmp = {
 				StationName1:$("#station_name1").val(),
 				StationName2:$("#city").val(),
 				StationName5: $("#county").val()
 			};
+			// 鏄惁娣诲姞绛夊緟
+			if(isLoad) {
+				filterLoad = layer.load();
+			}
 			//var selectvalue=$("#station_name1 option:selected").val();
 			//alert(selectvalue);
 			$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -1282,11 +1299,11 @@
 		}
 		
 		$('#station_name').change(function(){
-			findserchByBattGroupNamebystationname();
+			findserchByBattGroupNamebystationname(true);
 		});
 		
 		//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
-		function findserchByBattGroupNamebystationname(){
+		function findserchByBattGroupNamebystationname(isLoad){
 			var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
 			// 鏋勯�犳煡璇㈡潯浠�
 			var tmp = {
@@ -1296,7 +1313,10 @@
 				StationName: $("#station_name").val(),
 				StationId: stationid
 			};
-		
+			// 鏄惁娣诲姞绛夊緟
+			if(isLoad) {
+				filterLoad = layer.load();
+			}
 			//var station_name1=$("#station_name1 option:selected").val();
 			//var station_name=$("#station_name option:selected").val();
 			
@@ -1326,6 +1346,8 @@
 				}else{
 					$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
 				}
+				
+				layer.close(filterLoad);
 			});
 		}
 		// 闅愯棌琛ㄦ牸鍔熻兘鎸夐挳鍒楄〃

--
Gitblit v1.9.1