From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 19 十月 2018 14:15:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equipWarn1.jsp | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 24490ce..e2fa7c9 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -116,6 +116,13 @@
<option value="618502">閫氳鍛婅</option>
<option value="618503">璁惧杩囨俯鍛婅</option>
<option value="618504">浜屾瀬绠1鍛婅</option>
+
+ <option value="119023">缁埅涓嶈冻鍛婅</option>
+ <option value="119024">鍩虹珯鍋滅數鍛婅</option>
+ <option value="119025">鍩虹珯鍙戠數鍛婅</option>
+ <option value="119026">鍩虹珯鎺夌珯鍛婅</option>
+ <option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option>
+
</select>
</td>
</tr>
@@ -171,7 +178,7 @@
<script type="text/javascript">
var Page={
pageCurr:1,
- pageSize:14,
+ pageSize:16,
pageAll:0,
};
var arrTh = new Array(); // 琛ㄦ牸鐨勫ご閮�
@@ -188,7 +195,7 @@
// 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
$(function() {
- searchDevAlarm();
+ //searchDevAlarm();
centerDiv($('#cardOption'));
// 閬嶅巻琛ㄦ牸澶撮儴鐢熸垚鐘舵�佹暟缁�
@@ -574,7 +581,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
- console.log(temp);
+ //console.log(temp);
return temp;
}
@@ -722,6 +729,11 @@
case 618502:return "閫氳鍛婅";
case 618503:return "璁惧杩囨俯鍛婅";
case 618504:return "浜屾瀬绠1鍛婅";
+ case 119023:return "缁埅涓嶈冻鍛婅";
+ case 119024:return "鍩虹珯鍋滅數鍛婅";
+ case 119025:return "鍩虹珯鍙戠數鍛婅";
+ case 119026:return "鍩虹珯鎺夌珯鍛婅";
+ case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
}
}
return "閫氫俊鏁呴殰";
--
Gitblit v1.9.1