From f29ad417607d9213ec17c633648b011bc61bcc59 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 16:13:52 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equipHistWarn1.jsp | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/equipHistWarn1.jsp b/gx_tieta/WebRoot/equipHistWarn1.jsp
index c632628..e46a54e 100644
--- a/gx_tieta/WebRoot/equipHistWarn1.jsp
+++ b/gx_tieta/WebRoot/equipHistWarn1.jsp
@@ -531,10 +531,12 @@
});
}
+ var isNewLoad = true;
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
var filterLoad;
$(document).ready(function(){
filterLoad = layer.load();
+ var pre_province = getQueryString('province');
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -550,7 +552,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);
}
@@ -570,6 +575,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_city = getQueryString('city');
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -587,6 +593,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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -609,6 +618,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_county = getQueryString('county');
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -628,6 +638,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);
}
@@ -667,6 +680,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_home = getQueryString('home');
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -682,6 +696,9 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -690,6 +707,7 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+ isNewLoad = false;
layer.close(filterLoad);
seachDevHisAlarm();
});
@@ -746,6 +764,7 @@
case 119025:return "鍩虹珯鍙戠數鍛婅";
case 119026:return "鍩虹珯鎺夌珯鍛婅";
case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
+ case 119028:return "璁惧楂樻俯鍛婅";
}
}
return "閫氫俊鏁呴殰";
--
Gitblit v1.9.1