From 5254ca4206fee8db39de086ab836c6ea39b1ad14 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:09:23 +0800
Subject: [PATCH] 问题反馈修改

---
 gx_tieta/WebRoot/batt-fault-manage.jsp |  440 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 233 insertions(+), 207 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index e764ea4..19ece7e 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -44,25 +44,21 @@
 					<tr>
 						<th>鐪�</th>														<!-- 鐪� -->
 						<th>甯�</th>														<!-- 甯� -->
+						<th>鍖�/鍘�</th>													<!-- 甯� -->
 						<th><s:text name="Computer_site"/></th>															<!-- 鏈烘埧绔欑偣 -->
-						
-						
 					</tr>
 					<tr>
 						<td>
-							<select name="" id="station_name1">
-								
-							</select>
+							<select name="" id="station_name1"></select>
 						</td>
 						<td>
-							<select name="" id="city">
-								
-							</select>
+							<select name="" id="city"></select>
 						</td>
 						<td>
-							<select name="" id="station_name3">
-								
-							</select>
+							<select name="" id="county"></select>
+						</td>
+						<td>
+							<select name="" id="station_name3"></select>
 						</td>
 						
 						
@@ -87,12 +83,7 @@
 		<div id="paging">
 			<a href="javascript:" id="search" class="layui-btn layui-btn-normal search">鏌ユ壘</a>
 			<a class="layui-btn layui-btn-normal addbtn">娣诲姞</a>
-	<script type="text/html" id="toolBar">
-		<a class="layui-btn layui-btn-xs" lay-event="details">娣诲姞</a>
-	</script> 
-	        
 			<a href="javascript:" id="export_table"  class="layui-btn layui-btn-normal outbtn"><s:text name="Export"/></a>		<!-- 瀵煎嚭 -->
-			
 		</div>
 	</div>
 	<div id="details"></div>
@@ -107,7 +98,9 @@
 	<script type="text/javascript" src="js/myinterval.js"></script>
 	<script type="text/javascript" src="js/pageUtil.js"></script>
 	<script type="text/javascript" src="src/layui.js"></script>
-	
+	<script type="text/html" id="toolBar">
+		<a class="layui-btn layui-btn-xs" lay-event="details">鏁呴殰璇︽儏</a>
+	</script>
 	<script type="text/javascript">
 		var permits;
 		<%	Object obj=session.getAttribute("permits");
@@ -134,7 +127,8 @@
 			    ,{field:'city', title:'甯�', align:'center'}
 			    ,{field:'stationName3', title:'鏈烘埧鍚嶇О', align:'center'}
 			    ,{field:'note', title:'鏃堕棿', align:'center'}
-			    ,{field:'question',fixed: 'right', title:'鏁呴殰璇︽儏',  width: 70}
+			    ,{field:'question', title:'鏁呴殰鎻忚堪', align:'center'},
+			    ,{fixed: 'right', title:'鏁呴殰璇︽儏',toolbar: '#toolBar', width: 100}
 			    ]]
 				,data:[]
 			    ,page: true
@@ -143,216 +137,248 @@
 			
 			// 鐢熸垚琛ㄦ牸鏁版嵁
 			table.render(tOptions);
-			// $(document).ready(function(){
-		        //console.info(1111);
-           //     tOptions.data=getData(100,0);
-          //      var tableObj = table.render(tOptions);
-          //      tableObj.reload(tOptions);
-          //  });
-            
             
             function getData(a,b){
-            var arr=[];
-            for(i=0;i<a;i++){
-            	arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
-            }
-           		return arr
+	            var arr=[];
+	            for(i=0;i<a;i++){
+	            	arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
+	            }
+	           	return arr
             }
 		
 			$(document).on('click','.addbtn',function(){
                 searchStationHistRecord();
             });
             function searchStationHistRecord(){
-				// 灏唒aram娣诲姞鍒�#detailsOpts
-				//$('#detailsOpts').data('data', param);		
-				// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
 				// 鏄剧ず闈㈡澘
 				layer.open({
 					type: 2,
 					title: '<span style="font-weight:bold">>>闂娣诲姞</span>',
-					area: ['650px', '450px'],
+					area: ['1200px', '600px'],
 					fixed: false, //涓嶅浐瀹�
+					resize: false,
 					maxmin: true,
-					content: 'iframe/batt-fault-manage-add.html'
+					content: 'iframe/batt-fault-manage-add1.html'
 				});
 				
 			}		
 
-		// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
-	    $(document).ready(function() {
-	        //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
-	        $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
-	        function(data) {
-	            data = data.result;
-	            data = eval("(" + data + ")");
-	            //console.info(data);
-	            if (data.code == 1 && data.data.length > 0) {
-	                var $select = $("#station_name1");
-	                $select.text('');
-	                for (var i = 0; i <= data.data.length; i++) {
-	                    $option = $("<option></option>");
-	                    if (i == 0) {
-	                        $option.html("鍏ㄩ儴(" + data.data.length + ")");
-	                        $option.attr("value", "");
-	                    } else {
-	                        $option.text(data.data[i - 1]);
-	                        $option.attr("value", data.data[i - 1]);
-	                    }
-	                    $select.append($option);         
-	                }	                
-	            } else {
-	                $("#station_name1").text('').html('<option>鏆傛棤绠$悊鐨勭淮鎶ゅ尯</option>');       
-	            }
-	            findCity();
-	        });
-	 });
+			// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+		    $(document).ready(function() {
+		        //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+		        $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
+		        function(data) {
+		            data = data.result;
+		            data = eval("(" + data + ")");
+		            //console.info(data);
+		            if (data.code == 1 && data.data.length > 0) {
+		                var $select = $("#station_name1");
+		                $select.text('');
+		                for (var i = 0; i <= data.data.length; i++) {
+		                    $option = $("<option></option>");
+		                    if (i == 0) {
+		                        $option.html("鍏ㄩ儴(" + data.data.length + ")");
+		                        $option.attr("value", "");
+		                    } else {
+		                        $option.text(data.data[i - 1]);
+		                        $option.attr("value", data.data[i - 1]);
+		                    }
+		                    $select.append($option);         
+		                }	                
+		            } else {
+		                $("#station_name1").text('').html('<option>鏆傛棤绠$悊鐨勭淮鎶ゅ尯</option>');       
+		            }
+		            findCity();
+		        });
+		 	});
 
-    function findCity() {
-        var data = {
-            StationName1: $("#station_name1").val()
-        };
-        // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
-        $.ajax({
-            type: "post",
-            url: "BattInfAction!serchStationName2",
-            async: true,
-            dataType: 'json',
-            data: "json = " + JSON.stringify(data),
-            success: function(data) {
-                var rs = JSON.parse(data.result);
-                var $select = $("#city");
-                if (rs.code == 1) {
-                    var _data = rs.data;
-                    // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
-                    var optsList = [];
-                    for (var i = 0; i < _data.length; i++) {
-                        var __data = _data[i];
-                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
-                        optsList.push(tmp);
-                    }
-                    // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
-                    createOptions($select, optsList, true);
-                    
-                } else {
-                    $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
-                   
-                }
-                findStationNamebyStationname1();
-            }
-        });
-    }
-    //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
-    $('#station_name1').change(function() {
-        findCity();
-    });
-    //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-    $('#city').change(function() {
-        findStationNamebyStationname1();
-    });
-
-    //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
-    function findStationNamebyStationname1() {
-        var tmp = {
-            StationName1: $("#station_name1").val(),
-            StationName2: $("#city").val()
-        };
-        //var selectvalue=$("#station_name1 option:selected").val();
-        //alert(selectvalue);
-        $.post("BattInfAction!serchStationName3", "json=" + JSON.stringify(tmp),
-        function(data) {
-            var rs = JSON.parse(data.result);
-            console.info(rs);
-            if (rs.code == 1) {
-                var _data = rs.data;
-                var $select = $("#station_name3");
-                // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
-                var optsList = [];
-                for (var i = 0; i < _data.length; i++) {
-                    var __data = _data[i];
-                    var _attr = {
-                        StationId: __data.StationId
-                    };
-                    var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
-                    optsList.push(tmp);
-                }
-
-                // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
-                createOptions($select, optsList, true);
-                
-            } else {
-                $("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
-               
-            }
-        });
-    }	
-    
-    function tempCondition(){
-    	temp ={
-    		StationId:"",
-			StationName1:$('#station_name1').val(),
-			StationName2:$('#city').val(),
-			StationName5:"",
-			page:{
-					pageSize:10,
-					pageCurr:1,
-				},	
-    	}
-    	console.info(temp);
-    	return temp; 
-    }
-    
-    function searchfault()
-    {
-    	var sData = tempCondition(); 
-    	var loading = layer.load();
-		// 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
-		$.ajax({
-			type: 'post',
-			async: true,
-			url: 'Deverror_recordAction!serchByCondition',
-			data: "json="+JSON.stringify(sData),
-			dataType: 'json',
-			success: function(result) {
-			    //console.info(result);
-    			var data = JSON.parse(result.result);
-    			console.info(data)
-    			if(data.code==1&&data.data.length>0){
-    				console.info(data);
-    				var data = data.data;
-    				for(i=0;i<data.length;i++){
-    					var tmp = {};
-    					var data = data[i];
-						tmp.station_name1 = data.stationName1;
-						tmp.city = data.stationName2;
-						tmp.stationName3 = data.stationName; 
-						tmp.note = data.record_time;
-						tmp.question = data.error_descript;
-						tOptions.data.push(tmp);
-    				}
-    				//tOptions.data.length = data.length;
-    			}else {
-					layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
-				}
-				console.info(tOptions);
-				var pageNum = tOptions.data.length;
-				console.info(pageNum);
-				tOptions.limit = pageNum;
-				// 璁剧疆鍒嗛〉淇℃伅
-				$('#total').text(pageNum);
-				table.render(tOptions);
-    			layer.close(loading);
-    		} 
-    	});
-    }
-    
-    $('#search').click(function(){
-    	searchfault();
-    });
-      
-});	
-		
+		    function findCity() {
+		        var data = {
+		            StationName1: $("#station_name1").val()
+		        };
+		        // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		        $.ajax({
+		            type: "post",
+		            url: "BattInfAction!serchStationName2",
+		            async: true,
+		            dataType: 'json',
+		            data: "json = " + JSON.stringify(data),
+		            success: function(data) {
+		                var rs = JSON.parse(data.result);
+		                var $select = $("#city");
+		                if (rs.code == 1) {
+		                    var _data = rs.data;
+		                    // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+		                    var optsList = [];
+		                    for (var i = 0; i < _data.length; i++) {
+		                        var __data = _data[i];
+		                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+		                        optsList.push(tmp);
+		                    }
+		                    // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+		                    createOptions($select, optsList, true);
+		                    
+		                } else {
+		                    $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+		                   
+		                }
+		                findCounty();
+		            }
+		        });
+		    }
+		    
+		    // 鏌ヨ鍖�/鍘�
+			function findCounty() {
+				var tmp = {
+					StationName1:$("#station_name1").val(),
+					StationName2:$("#city").val(),
+				};
+				
+				// 鏌ヨ鍖哄幙
+				$.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);
+								optsList.push(tmp);
+							}
+							
+							// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+							createOptions($select, optsList, true);
+						}else{
+							$select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+						}
+						findStationNamebyStationname1();
+					}
+				});
+			}
+	    
+		    //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+		    $('#station_name1').change(function() {
+		        findCity();
+		    });
+		    //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+		    $('#city').change(function() {
+		        findCounty();
+		    });
+	    
+		    //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+			$('#county').change(function(){
+				findStationNamebyStationname1();
+			});
 	
+		    //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+		    function findStationNamebyStationname1() {
+		        var tmp = {
+		            StationName1: $("#station_name1").val(),
+		            StationName2: $("#city").val(),
+		            StationName5: $("#county").val()
+		        };
+		        //var selectvalue=$("#station_name1 option:selected").val();
+		        //alert(selectvalue);
+		        $.post("BattInfAction!serchStationName3", "json=" + JSON.stringify(tmp),
+		        function(data) {
+		            var rs = JSON.parse(data.result);
+		            console.info(rs);
+		            if (rs.code == 1) {
+		                var _data = rs.data;
+		                var $select = $("#station_name3");
+		                // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+		                var optsList = [];
+		                for (var i = 0; i < _data.length; i++) {
+		                    var __data = _data[i];
+		                    var _attr = {
+		                        StationId: __data.StationId
+		                    };
+		                    var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+		                    optsList.push(tmp);
+		                }
 		
+		                // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+		                createOptions($select, optsList, true);
+		                
+		            } else {
+		                $("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+		               
+		            }
+		        });
+		    }	
+    		
+    		// 鏋勯�犳煡璇㈠悗鍙版暟鎹�
+		    function tempCondition(){
+		    	temp ={
+		    		StationId:"",
+					StationName1:$('#station_name1').val(),
+					StationName2:$('#city').val(),
+					StationName5:"",
+					page:{
+							pageSize:10,
+							pageCurr:1,
+						},	
+		    	};
+		    	console.info(temp);
+		    	return temp; 
+		    }
+    		
+    		//  鏌ヨ鏁呴殰鍐呭
+		    function searchfault()
+		    {
+		    	var sData = tempCondition(); 
+		    	var load = layer.load(1);
+		    	tOptions.data = [];
+				// 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
+				$.ajax({
+					type: 'post',
+					async: true,
+					url: 'Deverror_recordAction!serchByCondition',
+					data: "json="+JSON.stringify(sData),
+					dataType: 'json',
+					success: function(result) {
+		    			var data = JSON.parse(result.result);
+		    			if(data.code==1&&data.data.length>0){
+		    				data = data.data;
+		    				for(var i=0;i<data.length;i++){
+		    					var tmp = {};
+		    					var _data = data[i];
+								tmp.station_name1 = _data.stationName1;
+								tmp.city = _data.stationName2;
+								tmp.stationName3 = _data.stationName; 
+								tmp.note = _data.record_time;
+								tmp.question = _data.error_descript;
+								tOptions.data.push(tmp);
+		    				}
+		    			}else {
+							layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
+						}
+						//console.info(tOptions);
+						var pageNum = tOptions.data.length;
+						//console.info(pageNum);
+						tOptions.limit = pageNum;
+						// 璁剧疆鍒嗛〉淇℃伅
+						$('#total').text(pageNum);
+						table.render(tOptions);
+		    			layer.close(load);
+		    		} 
+		    	});
+		    }
+		    
+		    $('#search').click(function(){
+		    	searchfault();
+		    });
+		});	
 	</script>
   </body>
 </html>

--
Gitblit v1.9.1