From 5de347e1a4dc3b32b230e092cd12cac9af75bda0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期四, 11 十月 2018 14:15:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equipWarn1.jsp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 6e84fff..a17a5b7 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -188,7 +188,7 @@
// 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
$(function() {
- searchDevAlarm();
+ //searchDevAlarm();
centerDiv($('#cardOption'));
// 閬嶅巻琛ㄦ牸澶撮儴鐢熸垚鐘舵�佹暟缁�
@@ -574,7 +574,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
- console.log(temp);
+ //console.log(temp);
return temp;
}
--
Gitblit v1.9.1