From b03a33da86763413024d44ebaad0b54a78f60e4d Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 22 十一月 2018 14:02:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/elewarn.jsp | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index f93d040..88c0bc1 100644
--- a/gx_tieta/WebRoot/elewarn.jsp
+++ b/gx_tieta/WebRoot/elewarn.jsp
@@ -80,7 +80,7 @@
</table>
</td>
<td>
- <table>
+ <table id="alarm-type-list">
<tr>
<td><input type="checkbox" checked="checked" name="bmd.mainf.usr_id" value="119001" class="119001"/><s:text name="On-line_voltage"/></td> <!-- 鍦ㄧ嚎鐢靛帇 -->
<td><input type="checkbox" checked="checked" name="bmd.mainf.fault_type_id" value="119002" class="119002"/><s:text name="Group_voltage"/></td> <!-- 缁勭鐢靛帇 -->
@@ -231,7 +231,20 @@
}; //鍒嗛〉淇℃伅
//椤甸潰鍔犺浇鍚庡垵濮嬪寲鍐呭
$(document).ready(function(){
- setUserName();
+ var pre_warntype = getQueryString("warntype")?parseInt(getQueryString("warntype")):-1;
+ if(pre_warntype >= 0){
+ var alarmtypelist = $('#alarm-type-list input[type=checkbox]');
+ alarmtypelist.prop('checked',false);
+ alarmtypelist.eq(pre_warntype).prop('checked',true);
+ /* switch(pre_warntype){
+ case 0:{
+
+ }
+ } */
+ initAlarmParam();
+ }
+
+
//鍒濆鍖栭〉闈㈢殑楂樺害
var screenHeight=$(window).height(); //鑾峰彇鍙鍖栫獥鍙ｉ珮搴�
var bodyHeight=$('body').height(); //鑾峰彇椤甸潰楂樺害
@@ -308,6 +321,12 @@
//褰撶偣鍑诲閫夋鏃舵牴鎹槸鍚﹂�変腑璁剧疆涓嶅悓鐨勫��
$('#search_form input[type="checkbox"]').click(function(){
+ initAlarmParam();
+ searchAlarm();
+ });
+
+ //鍒濆鍖栧憡璀﹀弬鏁�
+ function initAlarmParam(){
//console.info(111111);
$('#search_form input[type="checkbox"]').each(function(){
if(this.checked==true){
@@ -326,9 +345,7 @@
$('#low_alm_value').attr('value',$('#low_alm_value').attr('class'));
}
});
- searchAlarm();
- });
-
+ }
//褰撶偣鍑绘煡璇㈡椂瑙﹀彂鏌ヨ浜嬩欢
@@ -345,7 +362,7 @@
$.post("Battalarm_dataAction!serchByCondition",$('#search_form').serialize(),function(data){
data=data.result;
data=eval("("+data+")");
- console.info(data);
+ //console.info(data);
var pagecurr=parseInt($('#pageCurr').attr('value'));
var pagesize=parseInt($('#pageSize').attr('value'));
if(data.code==1 && data.data.length>0){
@@ -706,7 +723,7 @@
filterLoad = layer.load();
}
var pre_home = getQueryString('home');
- console.info(pre_home);
+ //console.info(pre_home);
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
--
Gitblit v1.9.1