From f00e29da5403532e172051e81aae83589ef75cec Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 14:47:54 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equip-charge-param.jsp | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/equip-charge-param.jsp b/gx_tieta/WebRoot/equip-charge-param.jsp
index 4d2d88d..4c2354b 100644
--- a/gx_tieta/WebRoot/equip-charge-param.jsp
+++ b/gx_tieta/WebRoot/equip-charge-param.jsp
@@ -245,7 +245,7 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- console.info(model);
+ //console.info(model);
if(model.code == 1){
for(var i = 0;i<model.data.length;i++){
data = model.data;
@@ -356,10 +356,13 @@
});
}
+
+ 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;
@@ -376,6 +379,9 @@
}else{
$option.text(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);
}
@@ -395,6 +401,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_city = getQueryString("city");
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -412,6 +419,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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -434,6 +444,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_county = getQueryString('county');
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -453,6 +464,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);
}
@@ -492,6 +506,9 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_home = getQueryString('home');
+
+ var auto_seach = false;
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -509,6 +526,11 @@
'dev_name': __data.FBSDeviceName
};
var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr,{},true);
+ auto_seach = true;
+
+ }
optsList.push(tmp);
}
@@ -517,7 +539,11 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
-
+ if(auto_seach){
+ var temp = createSearchParam();
+ searchModelParam(temp);
+ }
+ isNewLoad = false;
layer.close(filterLoad);
});
}
@@ -536,7 +562,7 @@
$("#pre").click(function(){
if(Page!=undefined){
var currentPage = Page.pageCurr;
- console.info(Page);
+ //console.info(Page);
if(Page != undefined && currentPage>1){
//console.info(Pmodel.data);
Page.pageCurr = currentPage - 1;
--
Gitblit v1.9.1