修改线程监控异常显示逻辑 已服务器时间为准

hdw

2019-01-10 8d576aaf23412bd2b0fd83aa77e91f0ed359a9d8

修改线程监控异常显示逻辑 已服务器时间为准

 gx_tieta/WebRoot/control.jsp

@@ -1982,8 +1982,7 @@
                        //console.info("上一次核容测试停止原因："+lastStopReason);

                        //console.info("通信计数："+_data.dev_commcount);

                        //console.info("通信丢包率："+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));                        

						
                        var nowTime = new Date().getTime();        //当前时间

                        var nowTime = new Date(model.data[0].note).getTime();        //当前时间

                        var record = new Date(model.data[0].record_datetime).getTime();

                        

                        //console.info(Math.abs(nowTime-record)/1000);


 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);