Merge remote-tracking branch 'origin/master'

src/main/webapp/app/netTopology/flow-trend/flow-trend.component.ts

@@ -68,7 +68,7 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
            if(this.obj.hostid){
                this.findByTime();
            }
-       },5000)
+       },1000*60*4)
 
     }
 
@@ -128,6 +128,7 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
                     if (this.hostList) {
                         this.obj.hostid = this.hostList[0].hostid + '';
                         this.getEcharts(null);
+                        this.findByTime();
                         this.setNowEchart();
                     } else {
                         this.message.warning('当前资源组无资源');
@@ -208,7 +209,7 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
                     stack: 'one',
                     itemStyle: itemStyle,
                     data: this.inNowEchartData.map(e => {
-                        return e.avg;
+                        return e.sumValue;
                     })
                 },
                 {
@@ -217,7 +218,7 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
                     stack: 'one',
                     itemStyle: itemStyle,
                     data: this.outNowEchartData.map(e => {
-                        return -e.avg;
+                        return -e.sumValue;
                     })
                 }
             ]
@@ -229,16 +230,16 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
         this.topologySer.findByTime(this.obj.hostid).subscribe(
             (res) => {
                 if (res.errCode == 10000) {
-                    const inData = {
-                        clock:this.datePipe.transform(res.data.time,"HH:mm:ss"),
-                        avg:(res.data.in)
-                    };
-                    this.inNowEchartData.push(inData);
-                    const outData = {
-                        clock:this.datePipe.transform(res.data.time,"HH:mm:ss"),
-                        avg:(res.data.out)
-                    };
-                    this.outNowEchartData.push(outData);
+                    // const inData = {
+                    //     clock:this.datePipe.transform(res.data.time,"HH:mm:ss"),
+                    //     avg:(res.data.in)
+                    // };
+                    this.inNowEchartData=res.data.in;
+                    // const outData = {
+                    //     clock:this.datePipe.transform(res.data.time,"HH:mm:ss"),
+                    //     avg:(res.data.out)
+                    // };
+                    this.outNowEchartData=res.data.out;
                     this.flashEcharts();
                 } else {
                     this.message.warning(res.errMsg);
@@ -329,7 +330,7 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
                     stack: 'one',
                     itemStyle: itemStyle,
                     data: this.inNowEchartData.map(e => {
-                        return e.avg;
+                        return e.sumValue;
                     })
                 },
                 {
@@ -338,7 +339,7 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
                     stack: 'one',
                     itemStyle: itemStyle,
                     data: this.outNowEchartData.map(e => {
-                        return -e.avg;
+                        return -e.sumValue;
                     })
                 }
             ]

src/main/webapp/content/javascript/jtopo/js/jtopo-editor.js

@@ -88,13 +88,34 @@ TopologyPanel.prototype.loadTopologyByJson = function (topologyJson, backImg) {
             var alarmList = editor.utils.getAllNodes();
             for(var i = 0;i < alarmList.length;i++){
                 (function (i) {
-                    setInterval(function(){
-                        if(alarmList[i].alarm == '危险'){
-                            alarmList[i].alarm = '';
-                        }else if(alarmList[i].alarm == ''){
-                            alarmList[i].alarm  = '危险'
-                        }
-                    }, 2000);
+                    if (alarmList[i].alarm == '危险'){
+                        setInterval(function(){
+                            if(alarmList[i].alarm == '危险'){
+                                alarmList[i].alarm = '';
+                            }else if(alarmList[i].alarm == ''){
+                                alarmList[i].alarm  = '危险'
+                            }
+                        }, 2000);
+                    }
+                    if (alarmList[i].alarm == '主机被删除，请及时清理'){
+                        setInterval(function(){
+                            if(alarmList[i].alarm == '主机被删除，请及时清理'){
+                                alarmList[i].alarm = '';
+                            }else if(alarmList[i].alarm == ''){
+                                alarmList[i].alarm  = '主机被删除，请及时清理'
+                            }
+                        }, 2000);
+                    }
+                    if (alarmList[i].alarm == '故障'){
+                        setInterval(function(){
+                            if(alarmList[i].alarm == '故障'){
+                                alarmList[i].alarm = '';
+                            }else if(alarmList[i].alarm == ''){
+                                alarmList[i].alarm  = '故障'
+                            }
+                        }, 1000);
+                    }
+
                 })(i);
             }