From dfca6976f11cd8310c07108ef96aa68246c18a93 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 09 十一月 2018 15:07:08 +0800
Subject: [PATCH] 添加地图机房的权限
---
gx_tieta/WebRoot/Top.jsp | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index f130bd6..886263b 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("璇ュ憡璀﹀凡缁忚鍒犻櫎");
+ alert("璇ュ憡璀﹀凡缁忔仮澶�");
+ //window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
}
}
});
@@ -609,12 +610,12 @@
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("璇ュ憡璀﹀凡缁忚鍒犻櫎");
+ alert("璇ュ憡璀﹀凡缁忔仮澶�");
}
}
});
@@ -651,7 +652,7 @@
// 鏍稿娴嬭瘯妯″潡
$(function() {
- var arrTh = ['鏈烘埧鍚嶇О', '璁惧ID', '璁惧鍚嶇О','璁惧鐘舵��', '鍦ㄧ嚎鐢靛帇锛圴锛�', '缁勭鐢靛帇锛圴锛�', '缁勭鐢垫祦锛坢A锛�','璁惧娓╁害锛堚剝锛�', '宸叉祴瀹归噺锛圓H锛�', '璁惧鍛婅', '宸叉祴鏃堕棿'];
+ var arrTh = ['鏈烘埧鍚嶇О', '璁惧ID', '璁惧鍚嶇О','璁惧鐘舵��', '鍦ㄧ嚎鐢靛帇锛圴锛�', '缁勭鐢靛帇锛圴锛�', '缁勭鐢垫祦锛圓锛�','璁惧娓╁害锛堚剝锛�', '宸叉祴瀹归噺锛圓H锛�', '璁惧鍛婅', '宸叉祴鏃堕棿'];
var arrTd = [];
var eleTh = $('#navNuclearTest-data .nuclearTest-tbl-header');
var eleTd = $('#navNuclearTest-data .nuclearTest-tbl-body');
@@ -723,7 +724,7 @@
// 鏍规嵁鏁版嵁鐢熸垚琛ㄦ牸
function createTblByModel(model) {
- //console.log(model);
+ console.log(model);
arrTd = [];
for(var i=0; i<model.data.length; i++) {
var data = model.data[i];
@@ -737,7 +738,7 @@
arrTd.push(data.dev_temp); // 璁惧娓╁害
arrTd.push(data.dev_captest_cap); // 宸叉祴瀹归噺
arrTd.push(getStateByArray(data.dev_alarmstate,BTS_alarmstates)); // 璁惧鍛婅
- arrTd.push(formatSeconds(data.num)); // 宸叉祴鏃堕棿
+ arrTd.push(formatSeconds(data.dev_captest_timelong)); // 宸叉祴鏃堕棿
}
createFullTbl(eleTh, eleTd, arrTh, arrTd);
--
Gitblit v1.9.1