From 9876e29a3ae6fb3d70096f582d0260a59760f9f1 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.4>
Date: 星期一, 24 十二月 2018 14:14:17 +0800
Subject: [PATCH] 添加问题类型

---
 gx_tieta/WebRoot/batt-fault-manage.jsp |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 3db4193..27e1e6f 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -63,6 +63,7 @@
 						</td>
 						<td>
 							<select name="" id="question_name">
+								<option value="-1">鍏ㄩ儴</option>
 								<option value="0">鐢垫睜闂</option>
 								<option value="1">鐢垫簮闂</option>
 								<option value="2">绌鸿皟闂</option>
@@ -126,9 +127,9 @@
 	<script type="text/javascript" src="js/rightmenu.js"></script>
 	<script type="text/javascript" src="js/myConfirm.js"></script>	
 	<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/javascript" src="js/pageUtil.js"></script>
+	<script type="text/javascript" src="pages/js/common.js"></script>
 	<script type="text/html" id="toolBar">
 		<a class="layui-btn layui-btn-xs" lay-event="details">鏁呴殰璇︽儏</a>
 		<a class="layui-btn layui-btn-xs" lay-event="delError">鎺掗櫎鏁呴殰鏂规</a>
@@ -156,6 +157,9 @@
 				,element = layui.element
 				,$=layui.jquery
 				,form = layui.form;
+				
+			var homeQuestion = GLOBAL.HomeQues;			// 鏈烘埧闂鍒楄〃
+			$('#question_name').html(homeQuestion.getOptions(true));
 			var uploadIframe;		// 闈㈡澘
 			// 琛ㄦ牸鏁版嵁閰嶇疆椤�
 			var tOptions = {
@@ -164,6 +168,7 @@
 				,cellMinWidth: 80
 				,cols: [[
 			     {field:'stationName3', title:'鏈烘埧鍚嶇О', align:'center',width:450}
+			    ,{field:'ques_type', title:'鏁呴殰绫诲瀷', align:'center',width:150}
 			    ,{field:'note', title:'鏁呴殰鎻愬嚭鏃ユ湡', align:'center',width:150}
 			    ,{field:'originator', title:'鏁呴殰鎻愬嚭浜�', align:'center',width:150}
 			    ,{field:'error_en', title: '鏁呴殰鎺掗櫎鐘舵��', align: 'center',width:150}
@@ -517,11 +522,14 @@
     		
     		// 鏋勯�犳煡璇㈠悗鍙版暟鎹�
 		    function tempCondition(){
+		    	var sid = $('#station_name3').find('option:selected').attr('stationid');
+		    	sid = sid?sid: "";
 		    	temp ={
-		    		StationId:"",
+		    		StationId: sid,
 					StationName1:$('#station_name1').val(),
 					StationName2:$('#city').val(),
-					StationName5:"",
+					StationName5:$('#county').val(),
+					MonCount: $('#question_name').val(),
 					page:Page,	
 		    	};
 		    	return temp; 
@@ -564,6 +572,7 @@
 								tmp.originator = _data.uname;
 								tmp.solve_user = _data.solve_uname;
 								tmp.solve_record_time = solve_record_time;
+								tmp.ques_type = homeQuestion.getLayuiBtn(_data.error_state);
 								tOptions.data.push(tmp);
 								Page.pageAll = _data.page.pageAll;
 		    				}
@@ -626,6 +635,11 @@
 		    		$('#number').val(Page.pageSize);
 		    	}
 		    });
+		    
+		    // 鍒囨崲闂绫诲瀷閲嶆柊璁剧疆鍒嗛〉淇℃伅
+		    $('#question_name').change(function() {
+		    	Page.pageCurr = 1;
+		    });
 		});	
 	</script>
   </body>

--
Gitblit v1.9.1