From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 10:12:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/elewarn.jsp | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index 825e842..be53d63 100644
--- a/gx_tieta/WebRoot/elewarn.jsp
+++ b/gx_tieta/WebRoot/elewarn.jsp
@@ -706,6 +706,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 +733,7 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
- isNewLoad = false;
+
findserchByBattGroupNamebystationname();
});
}
@@ -757,6 +758,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 +780,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 +794,7 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
-
+ isNewLoad = false;
layer.close(filterLoad);
});
}
--
Gitblit v1.9.1