From a86aed1d459024ab2a97d98115ef57f8dce808e6 Mon Sep 17 00:00:00 2001
From: admin:huo123456@qq <496960745@qq.com>
Date: 星期一, 21 一月 2019 09:15:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/elewarn.jsp | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index d30dc3a..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(); //鑾峰彇鍙鍖栫獥鍙ｉ珮搴�
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){
@@ -554,9 +571,13 @@
eleform.submit();
}
+
+ var isNewLoad = true;
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
var filterLoad;
$(document).ready(function(){
+
+ var pre_province = getQueryString("province");
filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -573,7 +594,10 @@
$option.attr("value", "");
}else{
$option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
+ $option.attr("value",data.data[i-1]);
+ if(pre_province == data.data[i-1] && isNewLoad){
+ $option.attr('selected',true);
+ }
}
$select.append($option);
}
@@ -593,6 +617,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_city = getQueryString("city");
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -610,6 +635,9 @@
for(var i=0;i<_data.length;i++){
var __data = _data[i];
var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ if(pre_city == __data.StationName2 && isNewLoad){
+ tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+ }
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -632,6 +660,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_county = getQueryString("county");
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -651,6 +680,9 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ if(pre_county == __data.StationName5 && isNewLoad){
+ tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -690,6 +722,8 @@
if(isLoad) {
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){
@@ -705,6 +739,9 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -713,6 +750,7 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+
findserchByBattGroupNamebystationname();
});
}
@@ -737,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();
@@ -758,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);
}
@@ -769,7 +811,7 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
-
+ isNewLoad = false;
layer.close(filterLoad);
});
}
--
Gitblit v1.9.1