From c673a0b9ffe1f1239f596dfd88c0a76c735b3d43 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.106>
Date: 星期五, 28 十二月 2018 09:24:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/Top.jsp | 90 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 16 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index db953c2..d0863f8 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>
@@ -131,11 +131,15 @@
<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
</div>
<div class="cell-list voice">
- <i class="fa fa-bell"></i>
- <i class="fa fa-bell-slash"></i>
+ <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">
@@ -201,7 +205,7 @@
<script type="text/javascript" src="js/rightmenu.js"></script>
<script type="text/javascript">
$(document).ready(function(){
- setUserName(); //璁剧疆鐢ㄦ埛鍚嶇О
+ //setUserName(); //璁剧疆鐢ㄦ埛鍚嶇О
searchRecentlyAlarm(); //鏌ヨ鏈�杩�30绉掔殑璁惧鍜岀數姹犲憡璀�
@@ -367,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);
}
// 寤舵椂鎵ц
@@ -389,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);
@@ -913,7 +919,7 @@
// 鍒ゆ柇褰撳墠椤甸潰涓嶆槸鐧婚檰椤甸潰寮�濮嬫墽琛屾娴嬫湇鍔″櫒鐘舵��
if(!loginPatt.test(url)) {
- checkServer();
+ //checkServer();
}
var linkNum = 0; // 娴嬭瘯鏈嶅姟鍣ㄨ繛鎺ヨ鏁� =3 璺宠浆鍒扮櫥闄嗛〉闈�
@@ -924,17 +930,17 @@
async: true,
success: function(rs) {
linkNum = 0; // 鍒濆鍖栨祴璇曡繛鎺�
- setTimeout(checkServer, 500);
+ setTimeout(checkServer, 200);
},
error:function() {
- // 缃戠粶杩炴帴涓嶆甯�
+ // 缃戠粶杩炴帴涓嶆甯�
if(!navigator.onLine) {
linkNum = 0;
- setTimeout(checkServer, 500);
+ setTimeout(checkServer, 200);
}else{
linkNum++;
// 鏈嶅姟鍣ㄨ繛鎺ヤ笉姝ｅ父
- if(linkNum == 2) {
+ if(linkNum == 3) {
console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛佽烦杞埌鐧婚檰");
// 缃戠粶姝ｅ父浣嗘湇鍔″櫒杩炵画澶氭妫�娴嬩笉姝ｅ父璺宠浆鍒扮櫥闄嗛〉闈�
alert('缃戠粶杩炴帴寮傚父锛岃妫�鏌ョ綉缁滆繛鎺ユ槸鍚︽甯革紒');
@@ -948,5 +954,57 @@
});
}
})(jQuery);
+
+ // 鐩戞祴鍚庡彴session鏄惁瀛樺垽鏂綋鍓嶇敤鎴疯繛鎺ユ槸鍚﹀悎娉�
+ ;(function ($) {
+ var url = window.location.href;
+ var loginPatt = /\/login.jsp/;
+
+ // 鍒ゆ柇褰撳墠椤甸潰涓嶆槸鐧婚檰椤甸潰寮�濮嬫墽琛屾娴嬫湇鍔″櫒鐘舵��
+ if(!loginPatt.test(url)) {
+ checkServer();
+ }
+
+ var linkNum = 0; // 娴嬭瘯鏈嶅姟鍣ㄨ繛鎺ヨ鏁� =3 璺宠浆鍒扮櫥闄嗛〉闈�
+ function checkServer() {
+ $.ajax({
+ url:'LoginAction_check',
+ type: 'post',
+ async: true,
+ success: function(res) {
+ //console.log(res);
+ var rs = JSON.parse(res.result);
+ if(rs.code==0) {
+ linkNum = 0; // 鍒濆鍖栨祴璇曡繛鎺�
+ setTimeout(checkServer, 100);
+ }else {
+ alert(rs.msg);
+ window.location.replace("login.jsp");
+ }
+
+ },
+ error: function() {
+ // 缃戠粶杩炴帴涓嶆甯�
+ if(!navigator.onLine) {
+ linkNum = 0;
+ setTimeout(checkServer, 100);
+ }else{
+ linkNum++;
+ // 鏈嶅姟鍣ㄨ繛鎺ヤ笉姝ｅ父
+ if(linkNum == 3) {
+ console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛佽烦杞埌鐧婚檰");
+ // 缃戠粶姝ｅ父浣嗘湇鍔″櫒杩炵画澶氭妫�娴嬩笉姝ｅ父璺宠浆鍒扮櫥闄嗛〉闈�
+ alert('缃戠粶杩炴帴寮傚父锛岃妫�鏌ョ綉缁滆繛鎺ユ槸鍚︽甯革紒');
+ window.location.replace("login.jsp");
+ }else {
+ console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛�");
+ checkServer();
+ }
+ }
+ }
+ });
+ }
+ })(jQuery);
+
</script>
</html>
--
Gitblit v1.9.1