From 0cbbb7131e744ba9b8000da3086c5dce635fa582 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期五, 11 一月 2019 09:36:13 +0800
Subject: [PATCH] 修改告警框只在当前页弹出
---
gx_tieta/WebRoot/js/base.js | 9 +++++++--
gx_tieta/WebRoot/ex-battinfo.jsp | 42 +++++++++++++++++++++++++++++-------------
gx_tieta/WebRoot/Top.jsp | 4 ++--
3 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 172f767..1665782 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -214,7 +214,7 @@
}
- var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
+ var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
var onVisibilityChange = function(){
if (!document[hiddenProperty]) {
pageIsVisit = true;
@@ -253,7 +253,7 @@
});
}
});
- searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟(鎴戝湪base.js閲�)
+ searchAlm(pageIsVisit); //鏌ヨ鐢垫睜鍛婅鎬绘暟(鎴戝湪base.js閲�)
searchlowmon(); //鏌ヨ钀藉悗鍗曚綋鎬绘暟
searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟
searchdevalarm(); //鏌ヨ璁惧瀹炴椂鍛婅鎬绘暟
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index 3f28b68..b40fef5 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -714,11 +714,7 @@
if(isUpdateTbl) {
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
-
- // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
- if(tabsIndex != 0) {
- table.render(tOptions);
- }
+ table.render(tOptions);
}
// console.log(456);
// 瀹炴椂鍥炶皟
@@ -856,6 +852,7 @@
,success: function(res) {
var rs = JSON.parse(res.result);
var resData = [];
+ var isUpdateTbl = false; // 鍒ゆ柇鏄惁娣诲姞/鍒犻櫎寰呴獙鏀惰〃鏍�
if(rs.code == 1) {
var data = rs.data;
// 閬嶅巻鏁版嵁鐨勫��
@@ -863,22 +860,41 @@
var _data = data[i];
var _tmp = formaterResData(_data);
resData.push(_tmp);
- acceptPage.setAll(_data.apply_note);
+
+ // 鍒ゆ柇鏄惁娣诲姞/鍒犻櫎寰呴獙鏀惰〃鏍�
+ if(_data.apply_note &&_data.apply_note != Page.all) {
+ acceptPage.setAll(_data.apply_note);
+ isUpdateTbl = true;
+ }
}
//console.log(resData);
}else {
acceptPage.setAll(0);
+ isUpdateTbl = true;
}
layuiTbl.setCache(table.cache.acceptTbl);
- // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
- for(var i=0; i<resData.length; i++) {
- var _resData = resData[i];
- _resData.doThings = '';
- // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
- if(tabsIndex != 1) {
- layuiTbl.updateTr(i, _resData);
+ if(isUpdateTbl) {
+ // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
+ for(var i=0; i<resData.length; i++) {
+ var _resData = resData[i];
+ _resData.doThings = '';
+ }
+ acceptTbl.data = resData; // 璁剧疆琛ㄦ牸鏁版嵁
+ // 鏇存柊琛ㄦ牸
+ table.render(acceptTbl); // 閲嶆柊鍔犺浇琛ㄦ牸
+ layuiTbl.setCache(table.cache.acceptTbl);
+ }else {
+ // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
+ for(var i=0; i<resData.length; i++) {
+ var _resData = resData[i];
+ _resData.doThings = '';
+ // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
+ if(tabsIndex != 1) {
+ layuiTbl.updateTr(i, _resData);
+ }
}
}
+
//console.log(123);
// 瀹炴椂鍥炶皟
updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 3303ef7..0b15d8c 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -616,8 +616,13 @@
var totalAlm_num=Number.POSITIVE_INFINITY;
//鏌ヨ鍛婅鏁�
-function searchAlm(){
- //createEleWarning();
+function searchAlm(isShowVoice){
+ // 鍒ゆ柇鏄惁鏄剧ず鍙充笅瑙掔殑鍛婅鎻愮ず妗�
+ if(!isShowVoice) {
+ self.setTimeout("searchAlm()",10000);
+ return;
+ }
+ // 璇锋眰鍚庡彴鏌ヨ鏈�鏂板嚭鐜扮殑鍛婅涓暟
$.post("Battalarm_dataAction!serchRealTime",null,function(data){
model=eval("("+data.result+")");
if(model.code==1){
--
Gitblit v1.9.1