From b75b274264d2f738243076854a1b0a0d2770b7ea Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期三, 07 十一月 2018 16:27:39 +0800
Subject: [PATCH] 设备历史告警页面中，选中下方的告警记录，如果是历史告警，进入到历史告警页面并且选中当前告警的机房
---
gx_tieta/WebRoot/Top.jsp | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 0e52f03..38a07a1 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -557,7 +557,7 @@
//鏌ヨ鐢垫睜鍛婅淇℃伅
function searchBattAlarm(data){
- //console.info(data);
+ console.info(data);
$.ajax({
type:"post",
url: "Battalarm_dataAction!serchBatt_alarm",
@@ -574,16 +574,17 @@
var model = eval('('+data.result+')');
if(model.code == 1){
var obj = model.data[0];
- //console.info(obj);
+ console.info(obj);
if(obj.alm_cleared_type == 0){
//瀹炴椂鍛婅
- window.open("elewarn.jsp?stationId="+obj.stationid+"&battgroupId="+obj.BattGroupId);
+ window.open("elewarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
}else{
//鍘嗗彶鍛婅
- window.open("eleHistoryWarn.jsp?stationId="+obj.stationid+"&battgroupId="+obj.BattGroupId);
+ window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
}
}else{
alert("璇ュ憡璀﹀凡缁忚鍒犻櫎");
+ //window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
}
}
});
@@ -609,9 +610,9 @@
var obj = model.data[0];
console.info(obj);
if(obj.alm_cleared_type == 0){
- window.open("equipWarn1.jsp");
+ window.open("equipWarn1.jsp?home="+obj.stationName);
}else{
- window.open("equipHistWarn1.jsp?stationId="+obj.stationId);
+ window.open("equipHistWarn1.jsp?home="+obj.stationName);
}
}else{
alert("璇ュ憡璀﹀凡缁忚鍒犻櫎");
@@ -700,7 +701,7 @@
data:null,
success: function(data){
var model = eval('('+data.result+')');
- console.info(model);
+ //console.info(model);
if(model.code == 1){
$('#nuclear_test').text(model.data.length);
if(model.data.length != 0) {
--
Gitblit v1.9.1