From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/eleAnalyse.jsp | 71 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/gx_tieta/WebRoot/eleAnalyse.jsp b/gx_tieta/WebRoot/eleAnalyse.jsp
index 7ae0033..59e65a7 100644
--- a/gx_tieta/WebRoot/eleAnalyse.jsp
+++ b/gx_tieta/WebRoot/eleAnalyse.jsp
@@ -312,10 +312,14 @@
eleform.submit();
}
+
+ 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;
@@ -330,13 +334,16 @@
$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
$option.attr("value", "");
}else{
+ if(pre_province == data.data[i-1] && isNewLoad){
+ $option.attr('selected',true);
+ }
$option.text(data.data[i-1]);
$option.attr("value",data.data[i-1]);
}
$select.append($option);
}
}else{
- $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭渷</option>');
}
findCity();
});
@@ -347,7 +354,7 @@
var data = {
StationName1: $("#station_name1").val()
};
-
+ var pre_city = getQueryString('city');
// 鏄惁娣诲姞绛夊緟
if(isLoad) {
filterLoad = layer.load();
@@ -369,9 +376,14 @@
var optsList = [];
for(var i=0;i<_data.length;i++){
var __data = _data[i];
- var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{});
+ //console.info(pre_city + '=='+ __data.StationName2);
+ if(pre_city == __data.StationName2 && isNewLoad){
+ tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+ }
optsList.push(tmp);
}
+ //console.info(optsList);
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
createOptions($select, optsList, true);
}else {
@@ -393,7 +405,7 @@
if(isLoad) {
filterLoad = layer.load();
}
-
+ var pre_county = getQueryString('county');
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -413,6 +425,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);
}
@@ -453,6 +468,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){
@@ -468,9 +484,13 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ //console.info(pre_home +'=='+ __data.StationName);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
-
+ //console.info(optsList);
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
createOptions($select, optsList, true);
}else{
@@ -500,6 +520,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();
@@ -521,6 +542,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);
}
@@ -530,7 +554,7 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
-
+ isNewLoad = false;
layer.close(filterLoad);
});
}
@@ -545,6 +569,24 @@
});
createPictable();
+
+ //鐐瑰嚮鏇茬嚎閫夋嫨澶嶉�夋瀵硅〃鏍煎唴鐨勫閫夋鍏ㄩ儴閫変腑
+ $('#tabEchartCon .tbFixed').on('click','table thead input',function(){
+ if($(this).is(':checked'))
+ {
+ console.info($('#tabEchartCon .secCured table tbody input[type="checkbox"]').length);
+ $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',true);
+ }else{
+ console.info(false);
+ $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',false);
+ }
+ });
+
+ $('#tabEchartCon .left .secCurve').on('click', 'input[type="checkbox"]', function(){
+ createPicByTable();
+ createMyTable(tbl_data);
+ });
+
//鐢熸垚鏇茬嚎琛ㄦ牸閫夐」
function createPictable(){
var ArrLineTh=["<s:text name='BatteryID'/>","<input type='checkbox' checked='checked'/><s:text name='Curve_to_choose'/>"]; /* 鐢垫睜缁処D 鏇茬嚎閫夋嫨 */
@@ -559,21 +601,8 @@
}
createCard($('#tabEchartCon .tbFixed'),ArrLineTh,ArrLineTd);
createCard($('#tabEchartCon .secCurve'),ArrLineTh,ArrLineTd);
- //鐐瑰嚮鏇茬嚎閫夋嫨澶嶉�夋瀵硅〃鏍煎唴鐨勫閫夋鍏ㄩ儴閫変腑
- $('#tabEchartCon .tbFixed').on('click','table thead input',function(){
- if($(this).is(':checked'))
- {
- console.info($('#tabEchartCon .secCured table tbody input[type="checkbox"]').length);
- $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',true);
- }else{
- console.info(false);
- $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',false);
- }
- });
- $('#tabEchartCon .left .secCurve input[type="checkbox"]').click(function(){
- createPicByTable();
- createMyTable(tbl_data);
- });
+
+ setTblWidth($('#tabEchartCon .tbFixed'), $('#tabEchartCon .secCurve'));
}
--
Gitblit v1.9.1