Commit f8da9b2d authored by wangqinghua's avatar wangqinghua

update

parent 71b0c734
......@@ -137,13 +137,13 @@ export class FlowTrendComponent implements OnInit {
}
};
this.chartOption = {
this.chartOption = {
backgroundColor: '#eee',
tooltip: {},
xAxis: {
data: this.inEchartData.map(e=>{
return e.clockDate;
}),
return e.clock;
}),
name: '时间',
silent: false,
axisLine: {onZero: true},
......@@ -178,21 +178,21 @@ export class FlowTrendComponent implements OnInit {
},
series: [
{
name: 'bar3',
name: '进口流量',
type: 'bar',
stack: 'one',
itemStyle: itemStyle,
data: this.inEchartData.map(e=>{
return e.value_avg;
return e.avg;
})
},
{
name: 'bar3',
name: '出口流量',
type: 'bar',
stack: 'two',
itemStyle: itemStyle,
data: this.outEchartData.map(e=>{
return -e.value_avg;
return -e.avg;
})
}
]
......@@ -317,13 +317,13 @@ export class FlowTrendComponent implements OnInit {
//搜索
search(){
if(this.timeType == '5'){
this.obj.startTime = this.datePipe.transform(this.timeBegin,'yyyy-MM-dd HH:mm:ss');
this.obj.endTime = this.datePipe.transform(this.timeEnd,'yyyy-MM-dd HH:mm:ss');
}
this.getEcharts(null);
this.getInList();
this.getOutList();
if(this.timeType == '5'){
this.obj.startTime = this.datePipe.transform(this.timeBegin,'yyyy-MM-dd HH:mm:ss');
this.obj.endTime = this.datePipe.transform(this.timeEnd,'yyyy-MM-dd HH:mm:ss');
}
this.getEcharts(null);
this.getInList();
this.getOutList();
}
}
......@@ -7,7 +7,7 @@ import { Component, OnInit } from '@angular/core';
})
export class WorkHandleComponent implements OnInit {
timeFormatL = 'yyyy-MM-dd';
timeFormat = 'yyyy-MM-dd';
eventList;
timeBegin;
timeEnd;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment