From 1e2369de8e321bdf7d9ee692aa55d65d8ac560b8 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 十二月 2018 14:36:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equipWarn1.jsp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 2c56ccb..75e4f7a 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -124,6 +124,8 @@
<option value="119026">鍩虹珯鎺夌珯鍛婅</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