From a30626715268611ba20b5c37870c19ffbd60c25f Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期三, 26 十二月 2018 20:26:44 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/Top.jsp | 161 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 141 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 93433a6..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">0</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="javascript:;" class="badge default" id="weak_home">0</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">0</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">0</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">0</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">0</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 server-time">
+ <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">
@@ -197,7 +205,7 @@
<script type="text/javascript" src="js/rightmenu.js"></script>
<script type="text/javascript">
$(document).ready(function(){
- setUserName(); //璁剧疆鐢ㄦ埛鍚嶇О
+ //setUserName(); //璁剧疆鐢ㄦ埛鍚嶇О
searchRecentlyAlarm(); //鏌ヨ鏈�杩�30绉掔殑璁惧鍜岀數姹犲憡璀�
@@ -216,12 +224,12 @@
});
}
});
- searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟
+ searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟(鎴戝湪base.js閲�)
searchlowmon(); //鏌ヨ钀藉悗鍗曚綋鎬绘暟
searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟
searchdevalarm(); //鏌ヨ璁惧瀹炴椂鍛婅鎬绘暟
searchnotcomplan(); //鏌ヨ鏈斁鐢电殑璁″垝鎬绘暟
-
+ searchWeakHome(); //鏌ヨ鏈烘埧缁埅涓嶈冻鐨勪釜鏁�
/* setInterval(function(){
searchlowmon(); //鏌ヨ钀藉悗鍗曚綋鎬绘暟
searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟
@@ -244,7 +252,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#batt_low_num').text(model.sum);
+ $('#batt_low_num .num').text(model.sum);
setTimeout(searchlowmon, 5000);
},
error:function() {
@@ -264,7 +272,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#poweroff_num').text(model.sum);
+ $('#poweroff_num .num').text(model.sum);
setTimeout(searchpoweroff, 5000);
},
error:function() {
@@ -284,7 +292,7 @@
success: function(data){
var model = eval("("+data.result+")");
//console.info(model);
- $('#poweroff_num').text(model.newsum);
+ $('#poweroff_num .num').text(model.newsum);
setTimeout(searchpoweroff, 5000);
},
error:function() {
@@ -304,7 +312,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#dev_alarm_num').text(model.sum);
+ $('#dev_alarm_num .num').text(model.sum);
setTimeout(searchdevalarm, 5000);
},
error:function() {
@@ -330,6 +338,68 @@
error:function() {
setTimeout(searchnotcomplan, 5000);
}
+ });
+ }
+
+ // 鏈烘埧缁埅涓嶈冻涓暟
+ function searchWeakHome() {
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'Batt_enduranceAction!serchxuhangNotInThree'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ $('#weak_home .num').text(rs.sum);
+
+ setTimeout(searchWeakHome, 5000);
+ }
+ });
+ }
+
+ // 鏌ヨ鎵�鏈夌殑璁惧鏁�
+ searchAllDevNum();
+ function searchAllDevNum() {
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!serchByDeviceId'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var sum = rs.sum;
+ $('.cell-list.batt-count .dev-num').text(sum);
+ // $('.batt-state .dev-num').text(sum);
+ }
+
+ // 寤舵椂鎵ц
+ setTimeout(searchAllDevNum, 5000);
+ }
+ });
+ }
+
+ // 鏌ヨ鎵�鏈夌殑鐢垫睜缁勬暟
+ searchAllEleGroupNum();
+ function searchAllEleGroupNum() {
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!serchByInstall_count'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var sum = rs.sum;
+ $('.cell-list.batt-count .batt-num').text(sum);
+ //$('.batt-state .batt-num').text(sum);
+ }
+ // 寤舵椂鎵ц
+ setTimeout(searchAllEleGroupNum, 5000);
+ }
});
}
@@ -361,7 +431,6 @@
// 娣诲姞澶╂皵鎻掍欢鍜岀數姹犱俊鎭暱搴︽帶鍒�
$(function() {
limitWidth();
- //addWeather();
});
// 闄愬埗鏄剧ず涓暟
@@ -581,7 +650,7 @@
//鏌ヨ鐢垫睜鍛婅淇℃伅
function searchBattAlarm(data){
- console.info(data);
+ //console.info(data);
$.ajax({
type:"post",
url: "Battalarm_dataAction!serchBatt_alarm",
@@ -757,7 +826,7 @@
var model = eval('('+data.result+')');
//console.info(model);
if(model.code == 1){
- $('#nuclear_test').text(model.data.length);
+ $('#nuclear_test .num').text(model.data.length);
if(model.data.length != 0) {
if(!$('#navNuclearTest').hasClass('hide') || isNew) {
createTblByModel(model);
@@ -765,7 +834,7 @@
isNew=false;
}
}else {
- $('#nuclear_test').text(0);
+ $('#nuclear_test .num').text(0);
createFullTbl(eleTh, eleTd, arrTh, []);
}
},
@@ -850,7 +919,7 @@
// 鍒ゆ柇褰撳墠椤甸潰涓嶆槸鐧婚檰椤甸潰寮�濮嬫墽琛屾娴嬫湇鍔″櫒鐘舵��
if(!loginPatt.test(url)) {
- checkServer();
+ //checkServer();
}
var linkNum = 0; // 娴嬭瘯鏈嶅姟鍣ㄨ繛鎺ヨ鏁� =3 璺宠浆鍒扮櫥闄嗛〉闈�
@@ -864,7 +933,7 @@
setTimeout(checkServer, 200);
},
error:function() {
- // 缃戠粶杩炴帴涓嶆甯�
+ // 缃戠粶杩炴帴涓嶆甯�
if(!navigator.onLine) {
linkNum = 0;
setTimeout(checkServer, 200);
@@ -885,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