|
|
@ -26,13 +26,12 @@ export class RealMonitoringComponent implements OnInit { |
|
|
|
campaignTwo: FormGroup; */ |
|
|
|
campaignTwo: FormGroup; */ |
|
|
|
constructor(private router: Router, public EchartsData: EchartsDataService, private route: ActivatedRoute, public snackBar: MatSnackBar) { } |
|
|
|
constructor(private router: Router, public EchartsData: EchartsDataService, private route: ActivatedRoute, public snackBar: MatSnackBar) { } |
|
|
|
|
|
|
|
|
|
|
|
addtime = String(new Date().getFullYear()) + '-01'//添加时间
|
|
|
|
addtime = String(new Date().getFullYear()) + '-' + String(("0" + (new Date().getMonth() + 1)).slice(-2))//添加时间
|
|
|
|
endtime = String(new Date().getFullYear()) + '-01'
|
|
|
|
endtime = String(new Date().getFullYear()) + '-' + String(("0" + (new Date().getMonth() + 1)).slice(-2)) |
|
|
|
/* addtime=String(new Date().getFullYear()+new Date().getMonth()) |
|
|
|
/* addtime=String(new Date().getFullYear()+new Date().getMonth()) |
|
|
|
endtime=String(new Date().getFullYear()+new Date().getMonth()) */ |
|
|
|
endtime=String(new Date().getFullYear()+new Date().getMonth()) */ |
|
|
|
ngOnInit(): void { |
|
|
|
ngOnInit(): void { |
|
|
|
console.log(String(new Date().getFullYear()),String(new Date().getMonth())); |
|
|
|
console.log(this.addtime,this.endtime,7899) |
|
|
|
console.log(this.addtime,this.endtime) |
|
|
|
|
|
|
|
window.setTimeout(() => { |
|
|
|
window.setTimeout(() => { |
|
|
|
this.getechartsdata(true) |
|
|
|
this.getechartsdata(true) |
|
|
|
}, 0) |
|
|
|
}, 0) |
|
|
@ -89,7 +88,7 @@ export class RealMonitoringComponent implements OnInit { |
|
|
|
|
|
|
|
|
|
|
|
//获取底端柱状图数据
|
|
|
|
//获取底端柱状图数据
|
|
|
|
let paramBottom = { |
|
|
|
let paramBottom = { |
|
|
|
TimeIntervalStart: this.addtime == '0' ? '' : this.endtime, |
|
|
|
TimeIntervalStart: this.addtime == '0' ? '' : this.addtime, |
|
|
|
TimeIntervalEnd: this.endtime == '0' ? '' : this.endtime |
|
|
|
TimeIntervalEnd: this.endtime == '0' ? '' : this.endtime |
|
|
|
} |
|
|
|
} |
|
|
|
if (chushi) { |
|
|
|
if (chushi) { |
|
|
|