From a0a4c3f6dec1da75860fa6fcd184773d43bf0645 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.132>
Date: 星期三, 26 十二月 2018 09:56:55 +0800
Subject: [PATCH] SD卡显示逻辑问题
---
gx_tieta/WebRoot/Top.jsp | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 51ebf9e..e9e049e 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -64,24 +64,24 @@
<div class="batt-state">
<div class="list">
- <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 鏈烘埧鍋滅數鏁� -->
+ <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span></a></div> <!-- 鏈烘埧鍋滅數鏁� -->
</div>
<div class="list">
- <div class="list-contain">缁埅涓嶈冻鏈烘埧鏁�:<a href="batt-life-manage.jsp?is_stand=1" class="badge default" id="weak_home"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 鏈烘埧缁埅涓嶈冻鏁� -->
+ <div class="list-contain">缁埅涓嶈冻鏈烘埧鏁�:<a href="batt-life-manage.jsp?is_stand=1" class="badge default" id="weak_home"><span class="num">0</span></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"><span class="num">0</span>/<span class="batt-num">0</span></a></div> <!-- 鐢垫睜鍛婅鏁� -->
+ <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"><span class="num">0</span></a></div> <!-- 鐢垫睜鍛婅鏁� -->
</div>
<div class="list">
- <div class="list-contain"><s:text name="Capacity"/><s:text name="Behind_number_monomer"/>:<a href="taskplan.jsp" class="badge default" id="batt_low_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div> <!-- 钀藉悗鍗曚綋鏁� -->
+ <div class="list-contain"><s:text name="Capacity"/>钀藉悗鍗曚綋鏁�:<a href="taskplan.jsp" class="badge default" id="batt_low_num"><span class="num">0</span></a></div> <!-- 钀藉悗鍗曚綋鏁� -->
</div>
<div class="list">
- <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 璁惧鍛婅鏁� -->
+ <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num"><span class="num">0</span></a></div> <!-- 璁惧鍛婅鏁� -->
</div>
<div class="list">
<div class="list-contain">
- 鏍稿娴嬭瘯璁惧鏁�:<a href="javascript:void(0);" class="badge default" id="nuclear_test"><span class="num">0</span>/<span class="dev-num">0</span></a>
+ 鏍稿娴嬭瘯璁惧鏁�:<a href="javascript:void(0);" class="badge default" id="nuclear_test"><span class="num">0</span></a>
</div>
</div>
</div>
@@ -130,8 +130,16 @@
<div class="cell-list control">
<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
</div>
+ <div class="cell-list voice">
+ <i class="fa fa-bell" title="鍏抽棴璇煶鎾姤"></i>
+ <i class="fa fa-bell-slash" title="寮�鍚闊虫挱鎶�"></i>
+ </div>
<div class="cell-list server-time" style="white-space: nowrap">
2018-11-26 00:00:00
+ </div>
+ <div class="cell-list batt-count" style="white-space: nowrap; color: #FF0000;">
+ 鐢垫睜鎬绘暟锛�<span class="batt-num">0</span> , 鏈烘埧鎬绘暟锛�<span class="dev-num">0</span>
+
</div>
</div>
<div class="international">
@@ -363,7 +371,8 @@
var rs = JSON.parse(res.result);
if(rs.code == 1) {
var sum = rs.sum;
- $('.batt-state .dev-num').text(sum);
+ $('.cell-list.batt-count .dev-num').text(sum);
+ // $('.batt-state .dev-num').text(sum);
}
// 寤舵椂鎵ц
@@ -385,7 +394,8 @@
var rs = JSON.parse(res.result);
if(rs.code == 1) {
var sum = rs.sum;
- $('.batt-state .batt-num').text(sum);
+ $('.cell-list.batt-count .batt-num').text(sum);
+ //$('.batt-state .batt-num').text(sum);
}
// 寤舵椂鎵ц
setTimeout(searchAllEleGroupNum, 5000);
@@ -920,13 +930,13 @@
async: true,
success: function(rs) {
linkNum = 0; // 鍒濆鍖栨祴璇曡繛鎺�
- setTimeout(checkServer, 200);
+ setTimeout(checkServer, 500);
},
error:function() {
// 缃戠粶杩炴帴涓嶆甯�
if(!navigator.onLine) {
linkNum = 0;
- setTimeout(checkServer, 200);
+ setTimeout(checkServer, 500);
}else{
linkNum++;
// 鏈嶅姟鍣ㄨ繛鎺ヤ笉姝ｅ父
--
Gitblit v1.9.1