From 1380a8415d516f4294b2995fb00b22f14baddc3f Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.15>
Date: 星期三, 31 十月 2018 17:38:58 +0800
Subject: [PATCH] 故障问题反馈与添加。

---
 gx_tieta/WebRoot/iframe/batt-fault-manage-add.html |   48 ++++++++++-
 gx_tieta/WebRoot/batt-fault-manage.jsp             |  150 +++++++++++++++++++++++++------------
 2 files changed, 144 insertions(+), 54 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 8a48b1b..f26e2a1 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -85,7 +85,7 @@
 	<div >
 		<!-- 鍒嗛〉鍐呭 -->
 		<div id="paging">
-			<!-- <a href="javascript:" class="search">娣诲姞</a>		娣诲姞 -->
+			<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>
@@ -143,18 +143,18 @@
 			
 			// 鐢熸垚琛ㄦ牸鏁版嵁
 			table.render(tOptions);
-			 $(document).ready(function(){
-		        console.info(1111);
-                tOptions.data=getData(100,0);
-                var tableObj = table.render(tOptions);
-                tableObj.reload(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});
+            	arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
             }
            		return arr
             }
@@ -164,10 +164,8 @@
             });
             function searchStationHistRecord(){
 				// 灏唒aram娣诲姞鍒�#detailsOpts
-				//$('#detailsOpts').data('data', param);
-				
+				//$('#detailsOpts').data('data', param);		
 				// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
-	
 				// 鏄剧ず闈㈡澘
 				layer.open({
 					type: 2,
@@ -179,42 +177,35 @@
 				});
 				
 			}		
-			
-			
-			
-			  // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
-    $(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 = {
@@ -293,10 +284,71 @@
                
             }
         });
+    }	
+    
+    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);
+    				}
+    			}else {
+					layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
+				}
+				console.info(tOptions);
+				var pageNum = data.length;
+				console.info(pageNum);
+				tOptions.limit = pageNum;
+				// 璁剧疆鍒嗛〉淇℃伅
+				$('#total').text(pageNum);
+				table.render(tOptions);
+    			layer.close(loading);
+    		} 
+    	});
+    }
+    
+    $('#search').click(function(){
+    	searchfault();
+    });
+      
+});	
 		
 	
 		
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
index 0a5512f..e9cb1f4 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
@@ -61,7 +61,7 @@
 										<div class="layui-form-item layui-form-text">
 											<label class="layui-form-label" style="text-align:center;">闂鎻忚堪</label>
 											<div class="layui-input-block">
-												<textarea placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+												<textarea placeholder="璇疯緭鍏ュ唴瀹�" id="faultcontex" class="layui-textarea"></textarea>
 											</div>
 										</div>
 										
@@ -70,7 +70,7 @@
 										<div class="layui-form-item">
 										    
 											<div class="layui-input-block tr" >
-												<a class="layui-btn" lay-submit="" lay-filter="sub">绔嬪嵆鎻愪氦</a>
+												<a class="layui-btn" id="falutsubmit" lay-submit="" lay-filter="sub">绔嬪嵆鎻愪氦</a>
 												<a type="reset" class="layui-btn layui-btn-primary">閲嶇疆</a>
 											</div>
 										</div>
@@ -127,8 +127,8 @@
     
      form.on('submit(sub)',function(data){
      $('#addtime').val(getNowFormatDate());
-     console.warn(3333);
-    console.info(data);
+     //console.warn(3333);
+    //console.info(data);
     return false;
 });
     
@@ -248,7 +248,45 @@
             }
         });
     }
-
+    
+    function creatAddFaultAdd(){
+    	var date = new Date().format('yyyy-MM-dd');
+    	var id = 42000570;
+    	var temp = {
+    		stationId:id,
+			record_time:date,
+			error_descript:$('#faultcontex').val(),
+    	}
+    	console.info(temp);
+    	return temp;
+    }
+    
+    function searchFaultAdd(){
+    	var temp = creatAddFaultAdd();
+    	var loading = layer.load();
+		// 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
+		$.ajax({
+			type: 'post',
+			async: true,
+			url: 'Deverror_recordAction!add',
+			data: "json="+JSON.stringify(temp),
+			dataType: 'json',
+			success: function(result) {
+    			layer.close(loading);
+    			console.info(result);
+    			var data = JSON.parse(result);
+    			if(data.code==1){
+    				layer.msg('娣诲姞鎴愬姛锛�', {icon:0, shade: 0.1,shadeClose:true});
+    			}else{
+    				layer.msg('娣诲姞澶辫触锛�', {icon:0, shade: 0.1,shadeClose:true});
+    			}
+    		} 	
+    	});
+    }
+	
+	$('#falutsubmit').click(function(){
+		searchFaultAdd();
+	});
 }); 
 	 </script>
 </body>

--
Gitblit v1.9.1