From 263ea6e5dc5df6f44cd04a8d5694e4f8f2404312 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.13>
Date: 星期一, 10 十二月 2018 14:02:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/eleHistoryWarn.jsp | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index 1b16135..a6e81a4 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -303,14 +303,6 @@
}
- $(function(){
- //鐐瑰嚮鏌ヨ鎸夐挳
- $('#paging .search').click(function(){
- searchHistalm();
- });
- });
-
-
var formjson;
//鏌ヨ鍘嗗彶鍛婅璁板綍
function searchHistalm(){
@@ -320,7 +312,7 @@
$.post("Battalarm_data_historyAction!serchByInfo","json="+json,function(data){
data=data.result;
data=eval("("+data+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
ArrWarnTb = new Array(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
@@ -403,7 +395,7 @@
master_audit:$('#master_audit').is(':checked')?$('#master_audit').attr('class'):0, //涓夌骇鍛婅
num:$('#num').is(':checked')?$('#num').attr('class'):0, //涓�绾у憡璀�
BattGroupId:$('#BattGroupId').is(':checked')?$('#BattGroupId').attr('class'):0, //浜岀骇鍛婅
- usr_id:$('#usr_id').val(), //鍦ㄧ嚎鐢靛帇 119001
+ usr_id:$('#usr_id').is(':checked')?$('#usr_id').attr('class'):0, //鍦ㄧ嚎鐢靛帇 119001
fault_type_id:$('#fault_type_id').is(':checked')?$('#fault_type_id').attr('class'):0, //缁勭鐢靛帇 119002
fault_level:$('#fault_level').is(':checked')?$('#fault_level').attr('class'):0, //鍏呯數鐢垫祦 119003
record_uid:$('#record_uid').is(':checked')?$('#record_uid').attr('class'):0, //鏀剧數鐢垫祦 119004
@@ -422,6 +414,7 @@
Record_Id:$('#Record_Id').val() //瀹归噺鏇存崲鍛婅
}
};
+ //console.info(temp);
return temp;
}
--
Gitblit v1.9.1