From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 18 一月 2019 17:30:50 +0800 Subject: [PATCH] 未审批可更改 --- gx_tieta/WebRoot/elewarn.jsp | 40 +++++++++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 9 deletions(-) diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp index 825e842..88c0bc1 100644 --- a/gx_tieta/WebRoot/elewarn.jsp +++ b/gx_tieta/WebRoot/elewarn.jsp @@ -80,9 +80,9 @@ </table> </td> <td> - <table> + <table id="alarm-type-list"> <tr> - <input type="hidden" name="bmd.mainf.usr_id" value="0" class="119001"/> <!-- 鍦ㄧ嚎鐢靛帇 --> + <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> <!-- 缁勭鐢靛帇 --> <td><input type="checkbox" checked="checked" name="bmd.mainf.fault_level" value="119003" class="119003"/><s:text name="Charging_current"/></td> <!-- 鍏呯數鐢垫祦 --> <td><input type="checkbox" checked="checked" name="bmd.mainf.record_uid" value="119004" class="119004"><s:text name="Discharge_current"/></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(); //鑾峰彇鍙鍖栫獥鍙i珮搴� 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,6 +723,7 @@ filterLoad = layer.load(); } var pre_home = getQueryString('home'); + //console.info(pre_home); //var selectvalue=$("#station_name1 option:selected").val(); //alert(selectvalue); $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){ @@ -732,7 +750,7 @@ }else{ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>'); } - isNewLoad = false; + findserchByBattGroupNamebystationname(); }); } @@ -757,6 +775,7 @@ if(isLoad) { filterLoad = layer.load(); } + var pre_battid = getQueryString("battid"); //var station_name1=$("#station_name1 option:selected").val(); //var station_name=$("#station_name option:selected").val(); @@ -778,6 +797,9 @@ }; var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>"; var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr); + if(pre_battid == _data.BattGroupId && isNewLoad){ + tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr,{},true); + } optsList.push(tmp); } @@ -789,7 +811,7 @@ }else{ $("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>'); } - + isNewLoad = false; layer.close(filterLoad); }); } -- Gitblit v1.9.1