From b2ef49bf8f4fb47a0bb5e2efd37d44f3f1acad61 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 09 十一月 2018 14:19:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/Top.jsp | 77 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 22a3b2e..886263b 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -64,7 +64,7 @@
<div class="batt-state">
<div class="list">
- <div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp" class="badge default" id="poweroff_num">0</a></div> <!-- 鏈烘埧鍋滅數鏁� -->
+ <div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div> <!-- 鏈烘埧鍋滅數鏁� -->
</div>
<div class="list">
<div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num">0</a></div> <!-- 鐢垫睜鍛婅鏁� -->
@@ -175,7 +175,7 @@
<div class="navNuclearTest-header clearfix">
<span class="navNuclearTest-title"><i class="fa fa-navicon mr5"></i>鏍稿娴嬭瘯</span>
<div class="navNuclearTest-close fr mr10">
- <i class="fa fa-file-text-o mr10" title="鏇村璇︽儏"></i>
+ <!-- <i class="fa fa-file-text-o mr10" title="鏇村璇︽儏"></i> -->
<i class="fa fa-close" title="鍏抽棴"></i>
</div>
</div>
@@ -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,17 +652,20 @@
// 鏍稿娴嬭瘯妯″潡
$(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');
var timer = new GLOBAL.Timer.timer({
- fun:search61850Nuclear_cap,
+ fun:searchNuclear_cap,
times: 4000
});
var isNew = true;
var dev61850Alarms = GLOBAL.DEV61850.alarmstates;
var dev61850Work = GLOBAL.DEV61850.workstates;
+ var BTS_workstates = GLOBAL.BTS9100.workstates;
+ var BTS_alarmstates = GLOBAL.BTS9100.alarmstates
+
timer.start();
// 鐐瑰嚮鏍稿娴嬭瘯鏉℃暟
@@ -687,16 +691,17 @@
alert('褰撳墠涓鸿鎯呴〉锛屼笉鐢ㄨ烦杞紒');
}
});
- //鏌ヨ褰撳墠鐢ㄦ埛绠＄悊鐨�61850姝ｅ湪澶勪簬鏍稿娴嬭瘯鐨勮澶囪褰�
- function search61850Nuclear_cap(){
+ //鏌ヨ褰撳墠鐢ㄦ埛绠＄悊鐨凚TS姝ｅ湪澶勪簬鏍稿娴嬭瘯鐨勮澶囪褰�
+ function searchNuclear_cap(){
$.ajax({
type:"post",
- url: "Fbs9100_stateAction_action_seach6185Nuclear_cap",
+ url: "Fbs9100_stateAction_action_seachNuclear_cap",
async:true,
dataType:'json',
data:null,
success: function(data){
var model = eval('('+data.result+')');
+ //console.info(model);
if(model.code == 1){
$('#nuclear_test').text(model.data.length);
if(model.data.length != 0) {
@@ -715,33 +720,30 @@
}
});
}
-
-
-
-
+
// 鏍规嵁鏁版嵁鐢熸垚琛ㄦ牸
function createTblByModel(model) {
- //console.log(model);
+ console.log(model);
arrTd = [];
for(var i=0; i<model.data.length; i++) {
var data = model.data[i];
- arrTd.push(data.stationName); // 鏈烘埧鍚嶇О
- arrTd.push(data.dev_id); // 璁惧ID
- arrTd.push(data.deviceName); // 璁惧鍚嶇О
- arrTd.push(dev61850Work[data.dev_workstate]); // 璁惧鍚嶇О
- arrTd.push(data.dev_captest_onlinevol); // 鍦ㄧ嚎鐢靛帇
- arrTd.push(data.dev_captest_groupvol); // 缁勭鐢靛帇
- arrTd.push(data.dev_captest_curr); // 缁勭鐢垫祦
- arrTd.push(data.dev_temp); // 璁惧娓╁害
- arrTd.push(data.dev_captest_cap); // 宸叉祴瀹归噺
- arrTd.push(getAlarmsText(data.dev_61850alarms)); // 璁惧鍛婅
- arrTd.push(formatSeconds(data.num)); // 宸叉祴鏃堕棿
+ arrTd.push(data.stationName); // 鏈烘埧鍚嶇О
+ arrTd.push(data.dev_id); // 璁惧ID
+ arrTd.push(data.deviceName); // 璁惧鍚嶇О
+ arrTd.push(getStateByArray(data.dev_workstate,BTS_workstates)); // 璁惧鍚嶇О
+ arrTd.push(data.dev_captest_onlinevol); // 鍦ㄧ嚎鐢靛帇
+ arrTd.push(data.dev_captest_groupvol); // 缁勭鐢靛帇
+ arrTd.push(data.dev_captest_curr); // 缁勭鐢垫祦
+ arrTd.push(data.dev_temp); // 璁惧娓╁害
+ arrTd.push(data.dev_captest_cap); // 宸叉祴瀹归噺
+ arrTd.push(getStateByArray(data.dev_alarmstate,BTS_alarmstates)); // 璁惧鍛婅
+ arrTd.push(formatSeconds(data.dev_captest_timelong)); // 宸叉祴鏃堕棿
}
createFullTbl(eleTh, eleTd, arrTh, arrTd);
// 鏍规嵁鍛婅鍊艰缃俯搴︼紝k1鐢甸樆锛屽閫氬帇闄嶇殑瀛椾綋棰滆壊
- var trList = eleTd.find('tbody tr');
+ /* var trList = eleTd.find('tbody tr');
for(var i=0; i<model.data.length; i++) {
var alarms = model.data[i].dev_61850alarms.split(','); // ['k1鐢甸樆', '閫氳', '娓╁害', '瀵奸�氬帇闄�']
@@ -749,7 +751,16 @@
if(alarms[2] == 'true') {
trList.eq(i).find('td').eq(7).addClass('red');
}
- }
+ } */
+ }
+
+ //鏍规嵁鐘舵�佽幏鍙栬澶囩殑鐘舵��
+ function getStateByArray(state,statearr){
+ var str = "鏈煡";
+ if(statearr && state < statearr.length){
+ str = statearr[state];
+ }
+ return str;
}
// 鑾峰彇鍛婅鍙傛暟
--
Gitblit v1.9.1