From cb0f8fbe87ef085470af2a3b925c071065fa0f12 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期六, 03 十一月 2018 09:19:49 +0800
Subject: [PATCH] 页面头部中的核容测试查询用户自己管理的BTS正在处于放电测试的记录
---
gx_tieta/WebRoot/Top.jsp | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 2e5de0f..0e52f03 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -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>
@@ -656,12 +656,15 @@
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 +690,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,10 +719,7 @@
}
});
}
-
-
-
-
+
// 鏍规嵁鏁版嵁鐢熸垚琛ㄦ牸
function createTblByModel(model) {
@@ -726,22 +727,22 @@
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.num)); // 宸叉祴鏃堕棿
}
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 +750,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