From 3575720e5906c0b567d984cb960a0035a61c4d77 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 17:23:55 +0800
Subject: [PATCH] BUG

---
 gx_tieta/WebRoot/mobil/ele-infor-search2.html |    4 
 gx_tieta/WebRoot/mobil/elewarn2.html          |    4 
 gx_tieta/WebRoot/mobil/taskplan2.html         |    4 
 gx_tieta/WebRoot/mobil/equiphistwarn.html     |  296 +++++++++++++++++++++++++++++++++++++++++-------
 4 files changed, 257 insertions(+), 51 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/ele-infor-search2.html b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
index ea4fd65..6a93a4f 100644
--- a/gx_tieta/WebRoot/mobil/ele-infor-search2.html
+++ b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
@@ -525,8 +525,8 @@
  
  //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�   
      function findserchByBattGroupNamebystationname(){
-		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
-	
+		var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
+		//console.info(stationid);
 		var data = {
 			StationName1: $("#mainteArea").val(),
 			StationName2:$("#city").val(),
diff --git a/gx_tieta/WebRoot/mobil/elewarn2.html b/gx_tieta/WebRoot/mobil/elewarn2.html
index 1cc8409..1b8f8fc 100644
--- a/gx_tieta/WebRoot/mobil/elewarn2.html
+++ b/gx_tieta/WebRoot/mobil/elewarn2.html
@@ -404,8 +404,8 @@
  
  //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�   
      function findserchByBattGroupNamebystationname(){
-		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
-	
+		var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
+
 		var data = {
 			StationName1: $("#mainteArea").val(),
 			StationName2:$("#city").val(),
diff --git a/gx_tieta/WebRoot/mobil/equiphistwarn.html b/gx_tieta/WebRoot/mobil/equiphistwarn.html
index d09e43e..751ac24 100644
--- a/gx_tieta/WebRoot/mobil/equiphistwarn.html
+++ b/gx_tieta/WebRoot/mobil/equiphistwarn.html
@@ -20,15 +20,27 @@
 				<div class="fg-panel-header">绛涢��</div>
 				<div class="fg-panel-content">
 					<label for="privince"><strong>缁存姢鍖�:</strong></label>
-					<select name="privince" id="privince" data-mini="true">
-						<option value="">鍏ㄩ儴</option>
-					
-					</select>
-					<label for="city"><strong>鏈烘埧鍚嶇О:</strong></label>
-					<select name="city" id="city" data-mini="true">
-						<option value="">鍏ㄩ儴</option>
-						
-					</select>
+					<p>鐪�</p>
+	            	<select id="mainteArea" data-mini="true" name="bmd.binf.StationName1">
+	              		<option value="">鍏ㄩ儴</option>
+	            	</select>
+	            	<p>甯�</p>
+		            <select id="city" data-mini="true" name="bmd.binf.StationName2">
+		            	<option value="">鍏ㄩ儴</option>
+		            </select>
+		            <p>鍖�/鍘�</p>
+		            <select id="country" data-mini="true" name="bmd.binf.StationName5">
+		            	<option value="">鍏ㄩ儴</option>
+		            </select>
+	             	<p>鏈烘埧绔欑偣</p>
+	            	<select id="homeName" data-mini="true" name="bmd.binf.stationName">
+	            		<option value="">鍏ㄩ儴</option>
+	            	</select>
+	            	<p>钃勭數姹犵粍</p>
+	            	<select id="battgroup_name" data-mini="true" name="bmd.binf.BattGroupId">
+	            		<option value="0">鍏ㄩ儴</option>
+	            	</select>
+						            	
 					<fieldset data-role="collapsible" data-collapsed="false" data-mini="true">
 						<legend><strong>鏃堕棿娈甸�夋嫨锛�</strong></legend>
 						<label for="startTime"><strong>寮�濮嬫椂闂达細</strong></label>
@@ -199,44 +211,238 @@
 		}
 			
 			
+ 	//椤甸潰鍔犺浇鏃舵煡璇㈢渷
+	$.post("BattInfAction_serchByStation",null,function(data){
+		data = data.result;
+	    data = eval("("+data+")");
+	    //console.info(data);
+	    //console.info(data.code);
+	    if(data.code==1&&data.data.length>0){
+	   		var $Ostation_name1=$("#mainteArea");
+	    	$Ostation_name1.text("");
+	    	var arr = new Array();
+	    	for(var i=0;i<=data.data.length;i++)
+	        {
+	           	if(i == 0){
+	           		arr.push({
+	           			val:"",
+	           			txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+	           		});
+	           	}else{
+	           		arr.push({
+	           			val:data.data[i-1].StationName1,
+	           			txt:data.data[i-1].StationName1,
+	           		});
+	           	}
+	    	}
+	    	updataSel($Ostation_name1, arr);
+        }
+         findCity();
+    });
 
-		//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷 
- 		$.post("BattInfAction_serchByStation",null,function(data){
- 			data = data.result;
- 		    data = eval("("+data+")");
- 		    //console.info(data);
- 		   // console.info(data.code)
- 		   
- 		    if(data.code==1&&data.data.length>0){
- 		   		var $Ostation_name1=$("#privince");
- 		    	$Ostation_name1.text("");
- 		    	//console.info("aa")
- 		    	for(var i=0;i<=data.data.length;i++)
- 		        {
- 		           //console.info(data.data[i-1].StationName1)
- 		    		$option=$("<option></option>");
- 		    		if (i==0){
- 		    	    	$option.html("鍏ㄩ儴(鍏�"+data.sum+"鑺�)");	
-					    $option.attr("value", "");
- 		    	
- 		    	    }else{
- 		    	    	$option.text(data.data[i-1].StationName1);
- 		    	    	$option.attr("value",data.data[i-1].StationName1);
- 		    	        
- 		    	    }
- 		    	 // console.info($option)
- 		    	  $Ostation_name1.append($option);
- 		    	};
- 		    	
- 	        }
-           	findStationNamebyStationname1();
- 	    });
+  
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+	function findCity(){
+		var data = {
+			StationName1: $("#mainteArea").val()
+		};
+		//console.info(data);
+		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName2",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#city");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName2,
+		           			txt:data.data[i-1].StationName2,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         findCounty();
+	    }
+	    });
+    }
 	
- 	   //褰撶淮鎶ゅ尯鏀瑰彉鏃舵洿鏂扮珯鐐�
- 	   $('#mainteArea').change(function(){	
-			findStationNamebyStationname1();
-	   });
-	 	  
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+	function findCounty(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName5",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#country");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName5,
+		           			txt:data.data[i-1].StationName5,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	      findStationNamebyStationname1();   
+	    }
+	    });
+    }
+  
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧  
+    function findStationNamebyStationname1(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val()
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName3",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#homeName");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			stationid:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName,
+		           			stationid:data.data[i-1].StationId,
+		           			txt:data.data[i-1].StationName3,
+		           		});
+		           	}
+		    	}
+		    	//console.info(111111111111111);
+		    	updataSelStation($Ostation_name1, arr);
+	        }
+	       
+	        findserchByBattGroupNamebystationname(); 
+	    }
+	    });
+    }
+ 
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�   
+     function findserchByBattGroupNamebystationname(){
+		var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
+
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val(),
+			StationName: $("#homeName").val(),
+			StationId: stationid
+		};
+		
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchBattByStation",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.warn();
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#battgroup_name");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:0,
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].BattGroupId,
+		           			txt:data.data[i-1].BattGroupName,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         
+	    }
+	    });
+    }
+    
+   //褰撶渷鏀瑰彉鏃舵洿鏂板競
+   $('#mainteArea').change(function(){
+   		findCity();	
+   });
+   //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+   $('#city').change(function(){
+   		findCounty();	
+   });
+   //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+   $('#country').change(function(){
+   		findStationNamebyStationname1(); 	
+   });   	
+	//褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍	
+	$('#homeName').change(function(){
+		findserchByBattGroupNamebystationname();
+	});
+  	
+	  
 		function findStationNamebyStationname1(){
 			var selectvalue=$("#privince option:selected").val();
 	 	   
diff --git a/gx_tieta/WebRoot/mobil/taskplan2.html b/gx_tieta/WebRoot/mobil/taskplan2.html
index c1e8fea..a46c767 100644
--- a/gx_tieta/WebRoot/mobil/taskplan2.html
+++ b/gx_tieta/WebRoot/mobil/taskplan2.html
@@ -445,8 +445,8 @@
  
  //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�   
      function findserchByBattGroupNamebystationname(){
-		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
-	
+		var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
+
 		var data = {
 			StationName1: $("#mainteArea").val(),
 			StationName2:$("#city").val(),

--
Gitblit v1.9.1