From c007fe5c53a88495130b6c6e5ec9b7fc9ad1c9e1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期四, 11 十月 2018 16:09:27 +0800
Subject: [PATCH] 配组继续修改

---
 gx_tieta/WebRoot/equipWarn1.jsp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 95012b7..a17a5b7 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -171,7 +171,7 @@
         <script type="text/javascript">
         var Page={
 			pageCurr:1,
-			pageSize:14,
+			pageSize:16,
 			pageAll:0,
         };
 		var arrTh = new Array();    // 琛ㄦ牸鐨勫ご閮�
@@ -188,7 +188,7 @@
 		
 		// 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
 		$(function() {
-			searchDevAlarm();
+			//searchDevAlarm();
 		
 		    centerDiv($('#cardOption'));
 		    // 閬嶅巻琛ㄦ牸澶撮儴鐢熸垚鐘舵�佹暟缁�
@@ -574,6 +574,7 @@
 					pageCurr:Page.pageCurr,						//褰撳墠椤�
 				}
         	};
+        	//console.log(temp);
         	return temp;
         }
         
@@ -721,6 +722,7 @@
 					case 618502:return "閫氳鍛婅";
 					case 618503:return "璁惧杩囨俯鍛婅";
 					case 618504:return "浜屾瀬绠1鍛婅";
+					case 119023:return "缁埅涓嶈冻鍛婅";
 				}
 			}
 			return "閫氫俊鏁呴殰";
@@ -966,7 +968,7 @@
 						var _attr = {
 							StationId: __data.StationId
 						};
-						var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+						var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
 						optsList.push(tmp);
 					}
 					

--
Gitblit v1.9.1