From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/Top.jsp | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 38a07a1..25704cc 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -84,7 +84,7 @@
</c:forEach>
<div class="list">
<div class="list-contain">
- 鏍稿娴嬭瘯璁惧:<a href="javascript:void(0);" class="badge default" id="nuclear_test">0</a>
+ 鏍稿娴嬭瘯璁惧鏁�:<a href="javascript:void(0);" class="badge default" id="nuclear_test">0</a>
</div>
</div>
</div>
@@ -127,9 +127,9 @@
<div class="cell-list plan-ele">
<img src="image/webStatus/plan_normal.gif" alt="鏀剧數璁″垝鐩戞祴绾跨▼" title="鏀剧數璁″垝鐩戞祴绾跨▼锛氭甯�">
</div>
- <div class="cell-list break-ele">
+ <!-- <div class="cell-list break-ele">
<img src="image/webStatus/break_ele_normal.gif" alt="鏈烘埧鍋滅數鐩戞祴绾跨▼" title="鏈烘埧鍋滅數鐩戞祴绾跨▼锛氭甯�">
- </div>
+ </div> -->
<div class="cell-list control">
<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
</div>
@@ -583,7 +583,7 @@
window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
}
}else{
- alert("璇ュ憡璀﹀凡缁忚鍒犻櫎");
+ alert("璇ュ憡璀﹀凡缁忔仮澶�");
//window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);
}
}
@@ -615,7 +615,7 @@
window.open("equipHistWarn1.jsp?home="+obj.stationName);
}
}else{
- alert("璇ュ憡璀﹀凡缁忚鍒犻櫎");
+ alert("璇ュ憡璀﹀凡缁忔仮澶�");
}
}
});
@@ -652,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');
@@ -724,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];
@@ -738,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