From 91ebc29db754494aef8ce055c288b0aeedf08fcf Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期二, 06 十一月 2018 09:09:06 +0800
Subject: [PATCH] 从实时监测跳转到电池组统计分析查询和电池组单体统计分析查询页面选中指定的电池组
---
gx_tieta/WebRoot/control.jsp | 18 +++++++++++++++---
gx_tieta/WebRoot/pages/js/common.js | 2 +-
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 02536cb..190b60c 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -2462,7 +2462,11 @@
$('#echarts_menu .batt-mon-search').click(function() {
var batt = getBatt();
- window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num);
+
+ var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId,battmon_num);
+ //console.info(url);
+ window.open(url);
+ //window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num);
});
$('#echarts_menu .batt-attention').click(function() {
@@ -3118,7 +3122,10 @@
//璺宠浆鍒版寚瀹氱殑鐢垫睜缁勭粺璁″垎鏋愭煡璇�
function targetBattReport(){
var batt = getBatt();
- window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
+ var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ //console.info(url);
+ window.open(url);
+ //window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
}
// 浣跨敤jquery瀹炵幇宸﹀鑸殑鏄剧ず鍜岄殣钘�
$(document).ready(function(){
@@ -4000,7 +4007,12 @@
$('#monLineGraphPopup .control-popupClose .fa-file-text-o').click(function() {
var batt = getBatt();
var type = getPopupTabNum(getPopupTab());
- window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num+'&test_type='+type);
+
+ var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId,battmon_num);
+ url += '&test_type='+type;
+ //console.info(url);
+ window.open(url);
+ //window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num+'&test_type='+type);
});
// 鐐瑰嚮閫夐」鍗℃洿鏂板浘琛�
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 70d5536..ab36427 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -528,7 +528,7 @@
str += '&battid='+battid;
}
if(monnum){
- str += '&monnum'+monnum;
+ str += '&monnum='+monnum;
}
//var str = page+'?province='+province+'&city='+city+'&county='+county+'&home='+home;
return str;
--
Gitblit v1.9.1