From 1e2369de8e321bdf7d9ee692aa55d65d8ac560b8 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 十二月 2018 14:36:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele_statistics.jsp | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 32e491d..ba40519 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -267,12 +267,13 @@
var load = layer.load(1);
//console.info($("#search_form").serialize());
var temp = createSearchForm();
+ console.info(temp);
var json = JSON.stringify(temp);
battinfo_list = new Array();
$.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 +530,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 +545,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 +557,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