From 8d576aaf23412bd2b0fd83aa77e91f0ed359a9d8 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期四, 10 一月 2019 10:48:58 +0800
Subject: [PATCH] 修改线程监控异常显示逻辑 已服务器时间为准
---
gx_tieta/WebRoot/nav.jsp | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/nav.jsp b/gx_tieta/WebRoot/nav.jsp
index eb53930..5e412d7 100644
--- a/gx_tieta/WebRoot/nav.jsp
+++ b/gx_tieta/WebRoot/nav.jsp
@@ -143,7 +143,7 @@
updataWebStatus(diskData, cpuData, memoryData, linkNum);
- var nowtime = new Date();
+ var nowtime = new Date(model.data[i].note.replace(/\-/g, "/"));
var sertime = new Date((model.data[i].server_datetime).replace(/\-/g, "/"));
var timelong = Math.abs(parseInt(sertime-nowtime));
if((timelong/(1000*60))>2){
@@ -205,13 +205,13 @@
if(model.data[i].ServerFlag == 0){
alarm_batt = 0;
}else{
- alarm_batt = checkTimeOut(model.data[i]);
+ alarm_batt = checkTimeOut2(model.data[i]);
}
}else if(model.data[i].ProcessName == 'BMS_FBSDEV_ALARM_DEV'){
if(model.data[i].ServerFlag == 0){
alarm_dev = 0;
}else{
- alarm_dev = checkTimeOut(model.data[i]);
+ alarm_dev = checkTimeOut2(model.data[i]);
}
}
if(Alarm_flag ==2 || model.data[i].ServerFlag == 2){
@@ -226,14 +226,14 @@
if(model.data[i].ServerFlag == 0){
badmon = 0;
}else{
- badmon = checkTimeOut(model.data[i]);
+ badmon = checkTimeOut2(model.data[i]);
}
}else if(model.data[i].ProcessName == 'BMS_FBSDEV_BADBATT_CAP'){
//瀹归噺鍛婅绾跨▼
if(model.data[i].ServerFlag == 0){
alarm_cap = 0;
}else{
- alarm_cap = checkTimeOut(model.data[i]);
+ alarm_cap = checkTimeOut2(model.data[i]);
}
}
if(Behind_flag == 2 || model.data[i].ServerFlag == 2){
@@ -247,7 +247,7 @@
if(model.data[i].ServerFlag == 0){
Displan_flag = 0;
}else{
- Displan_flag = checkTimeOut(model.data[i]);
+ Displan_flag = checkTimeOut2(model.data[i]);
}
}
if(Displan_flag == 2 || model.data[i].ServerFlag == 2){
@@ -260,7 +260,7 @@
if(model.data[i].ServerFlag == 0){
Power_flag = 0;
}else{
- Power_flag = checkTimeOut(model.data[i]);
+ Power_flag = checkTimeOut2(model.data[i]);
}
}
if(Power_flag == 2 || model.data[i].ServerFlag == 2){
@@ -274,7 +274,7 @@
if(model.data[i].ServerFlag == 0){
Control_flag = 0;
}else{
- Control_flag = checkTimeOut(model.data[i]);
+ Control_flag = checkTimeOut2(model.data[i]);
}
}
if(Control_flag == 2 || model.data[i].ServerFlag == 2){
@@ -363,6 +363,21 @@
return flag;
}
+ // 鍒ゆ柇鏈嶅姟鍣ㄦ湇鍔℃槸鍚﹁秴鏃�2.0
+ function checkTimeOut2(temp){
+ var serverTime = temp.note.replace(/\-/g, "/"); // 鏈嶅姟鍣ㄦ椂闂�
+ var flag = 0;
+ if(temp!=undefined){
+ var startTime = new Date(temp.ProcessTime.replace(/\-/g, "/"));
+ var endTime = new Date(serverTime);
+ var totalms = Math.abs((endTime.getTime()-startTime.getTime())/1000);
+ if(totalms<temp.OutTime){
+ flag = 1;
+ }
+ }
+ return flag;
+ }
+
// 鏇存柊web骞冲彴鏈嶅姟鍣ㄧ姸鎬佹煡鐪�
function updataWebStatus(diskData, cpuData, memoryData, linkNum) {
/* diskData.ele.progressbar("value", diskData.value);
--
Gitblit v1.9.1