From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/eleHistoryWarn.jsp | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index 1e91768..0095f5b 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -71,7 +71,7 @@
</table>
<table class="condi-opt">
<tr>
- <input type="hidden" id="usr_id" name="bmd.mainf.usr_id" value="0" class="119001" /><!-- <s:text name="On-line_voltage" /> 鍦ㄧ嚎鐢靛帇 -->
+ <td><input type="checkbox" id="usr_id" name="bmd.mainf.usr_id" checked="checked" value="0" class="119001" /> <s:text name="On-line_voltage" /></td> <!-- 鍦ㄧ嚎鐢靛帇 -->
<td>
<input type="checkbox" id="fault_type_id" name="bmd.mainf.fault_type_id" checked="checked" value="119002" class="119002" /><s:text name="Group_voltage" /> <!-- 缁勭鐢靛帇 -->
</td>
@@ -96,6 +96,7 @@
<input type="hidden" id="master_id" name="bmd.mainf.master_id" value="0" class="119008" /><!-- 杩炴帴鏉￠樆鎶�-->
<td><input type="checkbox" id="maint_close" name="bmd.mainf.maint_close" checked="checked" value="119007" class="119007"><s:text name="Monomer_resistance" /></td> <!-- 鍗曚綋鍐呴樆 -->
<td><input type="checkbox" id='maint_done' name="bmd.mainf.maint_done" checked="checked" value="119006" class="119006"><s:text name="Temperature_monomer" /></td> <!-- 鍗曚綋娓╁害 -->
+ <td></td>
<!-- <td><input type="checkbox" checked="checked" id="hist_alm" class="1"><s:text name="Historical_alarms" /></td> --> <!-- 鍘嗗彶鍛婅 -->
<td><input type="checkbox" name="bmd.mainf.master_audit" id="master_audit" checked="checked" value="3" class="3"><s:text name="Level_thr_warn" /></td> <!-- 涓夌骇鍛婅 -->
<td><input type="checkbox" name="bmd.mainf.appoint_uid" id="appoint_uid" checked="checked" value="4" class="4"><s:text name="Level_four_warn" /></td> <!-- 鍥涚骇鍛婅 -->
@@ -302,14 +303,6 @@
}
- $(function(){
- //鐐瑰嚮鏌ヨ鎸夐挳
- $('#paging .search').click(function(){
- searchHistalm();
- });
- });
-
-
var formjson;
//鏌ヨ鍘嗗彶鍛婅璁板綍
function searchHistalm(){
@@ -319,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(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
@@ -402,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
@@ -421,6 +414,7 @@
Record_Id:$('#Record_Id').val() //瀹归噺鏇存崲鍛婅
}
};
+ //console.info(temp);
return temp;
}
@@ -592,7 +586,7 @@
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
- createOptions($select, optsList, true);
+ createOptions($select, optsList, false);
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
@@ -651,7 +645,7 @@
createOptions($select, optsList, true);
$select.find('option').eq(0).val(0);
- searchHistalm(); // 鏌ヨ鍘嗗彶鍛婅
+ //searchHistalm(); // 鏌ヨ鍘嗗彶鍛婅
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
--
Gitblit v1.9.1