From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/eleAssess.jsp | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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);
}
}
--
Gitblit v1.9.1