From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/WebRoot/taskplan.jsp |  206 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 144 insertions(+), 62 deletions(-)

diff --git a/gx_tieta/WebRoot/taskplan.jsp b/gx_tieta/WebRoot/taskplan.jsp
index 11f9adb..7714037 100644
--- a/gx_tieta/WebRoot/taskplan.jsp
+++ b/gx_tieta/WebRoot/taskplan.jsp
@@ -19,6 +19,7 @@
 <!-- 瀵煎叆椤甸潰鐗瑰畾鏍峰紡 -->
 <link rel="stylesheet" type="text/css" href="css/taskplan_layout.css">
 <link rel="stylesheet" type="text/css" href="css/query.css">
+<link href="src/css/layui.css" type="text/css" rel="stylesheet">
 <!-- 瀵煎叆Jquery -->
 </head>
 <body>
@@ -34,56 +35,53 @@
 			<span class="summary"><s:text name="Behind_monomer"/><s:text name="Search"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
 			<div class="checkCon">
 				<form action="" id="search_form">
-				<!-- 缁存姢鍖轰俊鎭� -->
-				<table>
-					<tr class="fWeight">
-						<td>璁惧绫诲瀷</td>
-						<td>鐪�</td>			<!-- 鐪� -->
-						<td>甯�</td>			<!-- 甯� -->
-						<td><s:text name="Computer_site"/></td>				<!-- 鏈烘埧绔欑偣(鎴栨満鎴胯澶�)-->
-						<td><s:text name="Battery"/></td>					<!-- 钃勭數姹犵粍 -->
-						<td style="display:none;" colspan="2"><s:text name="Battery_installation_period"/></td> 										<!-- 鐢垫睜瀹夎鏃堕棿娈�-->		
-						<td colspan="2"><s:text name='Record'/><s:text name="Time"/></td>		<!-- 鏀剧數鏃堕棿 -->
-						<td style="display:none;"><s:text name="Battery_brand"/>鐢垫睜鍝佺墝</td> 
-					</tr>
-					<tr>
-						<td>
-							<select id="dev_type" name="dev_type">
-								<option value="1">FBS/BTS璁惧</option>
-								<option value="2">LD9璁惧</option>
-							</select>
-						</td>
-						<td>
-							<select id="station_name1" name="station_name1">
-								
-							</select>
-						</td>
-						<td>
-							<select id="city" name="station_name2">
-								
-							</select>
-						</td>
-						<td>
-							<select id="station_name" name="station_name">
-								
-							</select>
-						</td>
-						<td>
-							<select id="battgroup_name" name="battgroup_name">
-							</select>
-						</td>
-						<td style="display:none;"><input type="text" id="startinusedate" name="startinusedate" value="1970-1-1" readonly="readonly" onfocus="new Calendar().show(this)"></td>
-						<td style="display:none;"><input type="text" id="endinusedate" name="endinusedate" readonly="readonly" onfocus="new Calendar().show(this)"></td>
-						
-						<td><input type="text" id="startdischargedate" name="startdischargedate" value="1970-1-1" readonly="readonly" onfocus="new Calendar().show(this)"></td>
-						<td><input type="text" id="enddischargedate" name="enddischargedate" readonly="readonly" onfocus="new Calendar().show(this)"></td>
-						<td style="display:none;">
-							<select id="producer" name="producer">
-								
-							</select>
-						</td>
-					</tr>
-				</table>
+					<!-- 缁存姢鍖轰俊鎭� -->
+					<table>
+						<tr class="fWeight">
+							<td>璁惧绫诲瀷</td>
+							<td>鐪�</td>			<!-- 鐪� -->
+							<td>甯�</td>			<!-- 甯� -->
+							<td>鍖�/鍘�</td>		<!-- 鍖�/鍘� -->
+							<td><s:text name="Computer_site"/></td>				<!-- 鏈烘埧绔欑偣(鎴栨満鎴胯澶�)-->
+							<td><s:text name="Battery"/></td>					<!-- 钃勭數姹犵粍 -->
+							<td style="display:none;" colspan="2"><s:text name="Battery_installation_period"/></td> 										<!-- 鐢垫睜瀹夎鏃堕棿娈�-->		
+							<td colspan="2"><s:text name='Record'/><s:text name="Time"/></td>		<!-- 鏀剧數鏃堕棿 -->
+							<td style="display:none;"><s:text name="Battery_brand"/>鐢垫睜鍝佺墝</td> 
+						</tr>
+						<tr>
+							<td>
+								<select id="dev_type" name="dev_type">
+									<option value="1">FBS/BTS璁惧</option>
+									<option value="2">LD9璁惧</option>
+								</select>
+							</td>
+							<td>
+								<select id="station_name1" name="station_name1"></select>
+							</td>
+							<td>
+								<select id="city" name="station_name2"></select>
+							</td>
+							<td>
+								<select id="county" name="county"></select>
+							</td>
+							<td>
+								<select id="station_name" name="station_name"></select>
+							</td>
+							<td>
+								<select id="battgroup_name" name="battgroup_name"></select>
+							</td>
+							<td style="display:none;"><input type="text" id="startinusedate" name="startinusedate" value="1970-1-1" readonly="readonly" onfocus="new Calendar().show(this)"></td>
+							<td style="display:none;"><input type="text" id="endinusedate" name="endinusedate" readonly="readonly" onfocus="new Calendar().show(this)"></td>
+							
+							<td><input type="text" id="startdischargedate" name="startdischargedate" value="1970-1-1" readonly="readonly" onfocus="new Calendar().show(this)"></td>
+							<td><input type="text" id="enddischargedate" name="enddischargedate" readonly="readonly" onfocus="new Calendar().show(this)"></td>
+							<td style="display:none;">
+								<select id="producer" name="producer">
+									
+								</select>
+							</td>
+						</tr>
+					</table>
 				</form>
 			</div>
 		</div>
@@ -136,6 +134,7 @@
 	<div class="clear"></div>
 </body>
 <script type="text/javascript" src="js/createTab.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
 <script type="text/javascript">
 	var Page = {
 		pageSize:10, 				//姣忛〉鐨勮鏁�
@@ -345,7 +344,7 @@
 			Page.pageCurr = 1;
 			formjson = temp;
 		}
-		loading.showLoading();
+		var load = layer.load(1);
 		var json = window.JSON.stringify(temp);
 		arrTd = new Array();		
 		$.ajax({ 	
@@ -357,7 +356,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++){
 							//console.info(model.data.length);
@@ -386,7 +385,7 @@
 					$('#page_num').val(Page.pageCurr);
 					//console.info(arrTd);
 					changeTblByStatus();
-					loading.hideLoading();					
+					layer.close(load);					
 	        	},
 	        	error:function(a){
 	        		//console.info(a);
@@ -454,8 +453,12 @@
 		});
 	}
 	
+	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;
@@ -472,6 +475,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);
 				}
@@ -483,10 +489,15 @@
 	});
 	
 	// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
-	function findCity() {
+	function findCity(isLoad) {
 		var data = {
 			StationName1: $("#station_name1").val()
 		};
+		// 鏄惁娣诲姞绛夊緟
+		if(isLoad) {
+			filterLoad = layer.load();
+		}
+		var pre_city = getQueryString("city");
 		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
 		$.ajax({ 	
 	        type: "post", 				
@@ -504,6 +515,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);
 					}
 					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -511,27 +525,84 @@
 	        	}else {
 	        		$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
 	        	}
-	        	findStationNamebyStationname1();
+	        	findCounty();
 	        }
 	    });
 	}
 	
+	// 鏌ヨ鍖�/鍘�
+	function findCounty(isLoad) {
+		var tmp = {
+			StationName1:$("#station_name1").val(),
+			StationName2:$("#city").val(),
+		};
+		var pre_county = getQueryString("county");
+		// 鏄惁娣诲姞绛夊緟
+		if(isLoad) {
+			filterLoad = layer.load();
+		}
+		// 鏌ヨ鍖哄幙
+		$.ajax({
+			type: 'post',
+			async: true,
+			url: "BattInfAction!serchStationName5",
+			data: "json="+JSON.stringify(tmp),
+			success:function(data) {
+				var rs = JSON.parse(data.result);
+				var $select = $("#county");
+				if(rs.code==1){
+					var _data = rs.data;
+					// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+					var optsList = [];
+					for(var i=0;i<_data.length;i++){
+						var __data = _data[i];
+						var _attr = {
+							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);
+					}
+					
+					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+					createOptions($select, optsList, true);
+				}else{
+					$select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+				}
+				findStationNamebyStationname1();
+			}
+		});
+	}
+	
 	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
 	$('#station_name1').change(function(){
-		findCity();
+		findCity(true);
 	});
 	
 	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
 	$('#city').change(function(){
-		findStationNamebyStationname1();
+		findCounty(true);
+	});
+	
+	//褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+	$('#county').change(function(){
+		findStationNamebyStationname1(true);
 	});
 	
 	//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
-	function findStationNamebyStationname1(){
+	function findStationNamebyStationname1(isLoad){
 		var tmp = {
 			StationName1:$("#station_name1").val(),
-			StationName2:$("#city").val()
+			StationName2:$("#city").val(),
+			StationName5:$("#county").val()
 		};
+		// 鏄惁娣诲姞绛夊緟
+		if(isLoad) {
+			filterLoad = layer.load();
+		}
+		var pre_home = getQueryString("home");
 		//var selectvalue=$("#station_name1 option:selected").val();
 		//alert(selectvalue);
 		$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -547,6 +618,9 @@
 						StationId: __data.StationId
 					};
 					var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+					if(pre_home == __data.StationName && isNewLoad){
+						tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);
+					}
 					optsList.push(tmp);
 				}
 				
@@ -555,26 +629,31 @@
 			}else{
 				$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 			}
+			isNewLoad = false;
 			findserchByBattGroupNamebystationname();
 		});
 	}
 	
 	// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
 	$('#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 = {
 			StationName1:$("#station_name1").val(),
 			StationName2:$("#city").val(),
+			StationName5:$("#county").val(),
 			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();
 		
@@ -605,6 +684,8 @@
 			}else{
 				$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
 			}
+			searchBadBatt();
+			layer.close(filterLoad);
 		});
 	}
 	
@@ -638,6 +719,7 @@
 				StationName:$('#station_name').val(),
 				StationName2:$('#city').val(),
 				StationName1:$('#station_name1').val(),
+				StationName5:$('#county').val(),
 				BattGroupId:$('#battgroup_name').val(),
 				BattProducer:$('#producer').val(),
 				BattInUseDate:$('#startinusedate').val()+" 00:00:00",

--
Gitblit v1.9.1