From 4ee28b36ef681b9bc10a49df319803dddfba8e74 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 12:02:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/eleAssess.jsp | 24 +++++++----
gx_tieta/WebRoot/eleMonomer.jsp | 44 +++++++++++++++++-----
gx_tieta/WebRoot/ele_statistics.jsp | 15 +++++--
3 files changed, 60 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/eleAssess.jsp b/gx_tieta/WebRoot/eleAssess.jsp
index 219e08e..cf5ad4f 100644
--- a/gx_tieta/WebRoot/eleAssess.jsp
+++ b/gx_tieta/WebRoot/eleAssess.jsp
@@ -208,9 +208,9 @@
</div>
<!-- 鍙抽敭鑿滃崟鍐呭 -->
<div id="right-menu">
- <a href="" onclick="jumpPage()" target="_blank"><s:text name='Check_battery_test_record'/><!-- 鏌ョ湅鐢垫睜娴嬭瘯璁板綍 --></a>
- <a href="" onclick="jumpBattgroupStatic(this)" target="_blank"><s:text name='Check_battery_statistical_analysis_queries'/><!-- 鏌ョ湅鐢垫睜缁勭粺璁″垎鏋愭煡璇� --></a>
- <a href="" onclick="jumpBattmonomertatic(this)" target="_blank"><s:text name='Check_battery_monomer_record_behind'/><!-- 鏌ョ湅鐢垫睜钀藉悗鍗曚綋璁板綍 --></a>
+ <a href="javascript:void(0);" onclick="jumpPage()" target="_blank"><s:text name='Check_battery_test_record'/><!-- 鏌ョ湅鐢垫睜娴嬭瘯璁板綍 --></a>
+ <a href="javascript:void(0);" onclick="jumpBattgroupStatic(this)" target="_blank"><s:text name='Check_battery_statistical_analysis_queries'/><!-- 鏌ョ湅鐢垫睜缁勭粺璁″垎鏋愭煡璇� --></a>
+ <a href="javascript:void(0);" onclick="jumpBattmonomertatic(this)" target="_blank"><s:text name='Check_battery_monomer_record_behind'/><!-- 鏌ョ湅鐢垫睜钀藉悗鍗曚綋璁板綍 --></a>
<a href="eleBrdwMaint.jsp" target="_blank"><s:text name='Check_abnormal_battery_maintenance_record'/><!-- 鏌ョ湅寮傚父鐢垫睜缁存姢璁板綍 --></a>
</div>
@@ -545,10 +545,12 @@
//鏍规嵁鍙抽敭閫変腑鐨勭數姹犵粍璺宠浆鍒扮數姹犳祴璇曢〉闈�
function jumpPage(){
if(Page!=undefined){
- var batt = battinfo_list[trIndex];
+ var batt = battinfo_list[trIndex].data;
console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId);
+ //$('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId);
+ var url = skipUrl('charge-test.jsp',batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
}
}
@@ -556,20 +558,24 @@
//鏍规嵁鍙抽敭閫変腑鐨勭數姹犵粍璺宠浆鍒扮數姹犵粍缁熻鍒嗘瀽鏌ヨ椤甸潰
function jumpBattgroupStatic(dom){
if(battinfo_list!=undefined && battinfo_list.length>0){
- var batt = battinfo_list[trIndex];
+ var batt = battinfo_list[trIndex].data;
//console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId);
+ //$(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId);
+ var url = skipUrl('eleAnalyse.jsp',batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
}
}
//鏍规嵁鍙抽敭閫変腑鐨勭數姹犵粍璺宠浆鍒扮數姹犲崟浣撶粺璁″垎鏋愭煡璇㈤〉闈�
function jumpBattmonomertatic(dom){
if(battinfo_list!=undefined && battinfo_list.length>0){
- var batt = battinfo_list[trIndex];
+ var batt = battinfo_list[trIndex].data;
//console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId+"&battmon_num=0");
+ //$(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId+"&battmon_num=0");
+ var url = skipUrl('eleMonomer.jsp',batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
}
}
diff --git a/gx_tieta/WebRoot/eleMonomer.jsp b/gx_tieta/WebRoot/eleMonomer.jsp
index 6f897d6..749f2ae 100644
--- a/gx_tieta/WebRoot/eleMonomer.jsp
+++ b/gx_tieta/WebRoot/eleMonomer.jsp
@@ -627,10 +627,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;
@@ -646,7 +648,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);
}
@@ -666,6 +671,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_city = getQueryString("city");
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -683,6 +689,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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -706,7 +715,7 @@
if(isLoad) {
filterLoad = layer.load();
}
-
+ var pre_county = getQueryString("county");
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -726,6 +735,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);
}
@@ -765,6 +777,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){
@@ -780,6 +793,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);
}
@@ -812,6 +828,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();
@@ -833,6 +850,10 @@
};
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);
}
@@ -842,7 +863,6 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
-
searchBattMonNum();
});
}
@@ -864,11 +884,12 @@
OSingle_number.append($option);
layer.close(filterLoad);
}else{
- console.info(battgroup_id);
+ var pre_monnum = getQueryString("monnum");
+ //console.info(battgroup_id);
$.post("BattInfAction!serchByMonNum","bif.BattGroupId="+battgroup_id,function(data){
data=data.result;
data=eval("("+data+")");
- console.log(data);
+ //console.log(data);
if(data.code==1 && data.data.length>0){
data=data.data[0];
OSingle_number.text('');
@@ -877,8 +898,9 @@
if(i!=0){
$option.html(i);
$option.attr("value", i);
- if(mon_num == i && isNewload){
- isNewload = false;
+ //console.info(pre_monnum +"==="+ i +"***"+isNewLoad);
+ if(pre_monnum == i && isNewLoad){
+
$option.attr('selected','selectted');
}
}else{
@@ -889,9 +911,11 @@
}
}
layer.close(filterLoad);
+ isNewLoad = false;
searchMonomer();
});
}
+
}
$('#container .search').click(function(){
@@ -938,7 +962,7 @@
//鍒涘缓绛夊緟鐨勬妗�
loading.showLoading($('#main'));
var monNum = $('#Single_number').val()?$('#Single_number').val():0;
- console.log($("#search_form").serialize());
+ //console.log($("#search_form").serialize());
var temp ={
binf:{
StationName1:$('#station_name1').val(),
@@ -960,7 +984,7 @@
data=data.result;
var model = eval("("+data+")");
//alert(battgroupid);
- console.info(model);
+ //console.info(model);
var totalcount = 0;
if(model.code==1 && model.data.length>0){
data = model.data;
@@ -1137,7 +1161,7 @@
}else{
noContent.showNoContent("鏆傛棤鏌ヨ鏁版嵁");
}
- console.info(Conductpercentlist);
+ //console.info(Conductpercentlist);
$('#total').text(totalcount);
var tblScroll=$('#eleInforTab').scrollLeft();
$('#tbHead table').css('left',-tblScroll);
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 32e491d..41aaa58 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -272,7 +272,7 @@
$.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
//alert(123);
data=eval("("+data.result+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
battinfo_list = data;
@@ -529,7 +529,10 @@
function jumpPage(){
if(Page!=undefined){
var batt = battinfo_list[trIndex];
- console.info(batt);
+ //console.info(batt);
+ var url = skipUrl("charge-test.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ //console.info(url);
+ window.open(url);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
//$('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
}
@@ -541,7 +544,9 @@
var batt = battinfo_list[trIndex];
//console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
+ var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
+ //$(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
}
}
@@ -551,7 +556,9 @@
var batt = battinfo_list[trIndex];
//console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId+"&battmon_num=0");
+ var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
+ //$(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId+"&battmon_num=0");
}
}
--
Gitblit v1.9.1