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/equipWarn1.jsp |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 2c56ccb..9efbf68 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -114,7 +114,7 @@
                                 <select id="alarm_type">
                                 	<option value="0">鍏ㄩ儴</option>
                                 	<option value="119020">閫氫俊鏁呴殰</option>
-                                	<option value="618501">缁х數鍣ㄥ憡璀�</option>
+                                	<!-- <option value="618501">缁х數鍣ㄥ憡璀�</option>
                                 	<option value="618502">閫氳鍛婅</option>
                                 	<option value="618503">璁惧杩囨俯鍛婅</option>
                                 	<option value="618504">浜屾瀬绠1鍛婅</option>
@@ -122,8 +122,10 @@
                                 	<option value="119024">鍩虹珯鍋滅數鍛婅</option>
                                 	<option value="119025">鍩虹珯鍙戠數鍛婅</option>
                                 	<option value="119026">鍩虹珯鎺夌珯鍛婅</option>
-                                	<option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option>
+                                	<option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option> -->
                                 	<option value ="119028">璁惧楂樻俯鍛婅</option>
+                                	<option value ="119032">璁惧SD鍗℃晠闅�</option>
+                                	<option value ="119033">閲囬泦绾垮憡璀�</option>
                                 	
                                 </select>
                             </td>
@@ -509,7 +511,7 @@
 		        success: function(data){ 
 		        	data = eval("("+data+")");
 		        	var model = eval("("+data.result+")");
-		        	console.info(model);
+		        	//console.info(model);
 		        	alarm_list = new Array();
 		        	if(model.code==1){
 		        		alarm_list = model.data;
@@ -740,6 +742,8 @@
 					case 119026:return "鍩虹珯鎺夌珯鍛婅";
 					case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
 					case 119028:return "璁惧楂樻俯鍛婅";
+					case 119032:return "璁惧SD鍗℃晠闅�";
+					case 119033:return "閲囬泦绾垮憡璀�";
 				}
 			}
 			return "閫氫俊鏁呴殰";

--
Gitblit v1.9.1