From 062df3fdc8a7309c23e3ec8add778a5982977647 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 04 May 2018 14:19:01 +0800
Subject: [PATCH] 三级警报数据
---
src/app/routes/dashboard/workplace/workplace.component.ts | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index c0a64c4..a01248d 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -1,3 +1,4 @@
+import { environment } from "../../../../environments/environment";
import { zip } from 'rxjs/observable/zip';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
@@ -33,7 +34,7 @@
activities: any[] = [];
radarData: any[] = [];
loading = true;
-
+ public alarmData:any = {};
members = [
{
id: 'members-1',
@@ -85,7 +86,25 @@
private http2: HttpClient) {
}
+ selectedIndexChange(index) {
+ if (!this.alarmData['_' + index]) {
+ this.http2.get(environment.SERVER_BASH_URL + 'report/alarm-year', {params: {state: index > 0 ? index : null}}).subscribe((res: any) => {
+ let data = [];
+ for (let i = 0; i < res.data.length; i += 1) {
+ let y = 0;
+ if (!!res.data[i]) {
+ y = res.data[i];
+ }
+ data.push({x: `${i + 1}���`, y: y});
+ }
+ this.alarmData['_' + index] = data;
+ });
+ }
+ }
+
ngOnInit() {
+ this.selectedIndexChange(0);
+
// const today = new Date().getTime();
// const fakeDC = [60, 135, 70, 112, 80, 170, 200, 140, 52, 119, 164, 230];
// for (let i = 0; i < 12; i += 1) {
@@ -148,17 +167,6 @@
}
);
// this.avgDeviceCount = (this.totalDeviceCount / 12).toFixed(0);
-
- const alarmData = [];
- const alarmData_1 = [];
- const alarmData_2 = [];
- const alarmData_3 = [];
- for (let i = 0; i < 12; i += 1) {
- alarmData.push({ x: `${i + 1}���`, y: Math.floor(Math.random() * 1000) + 500 });
- alarmData_1.push({ x: `${i + 1}���`, y: Math.floor(Math.random() * 1000) + 100 });
- alarmData_2.push({ x: `${i + 1}���`, y: Math.floor(Math.random() * 1000) + 200 });
- alarmData_3.push({ x: `${i + 1}���`, y: Math.floor(Math.random() * 1000) + 300 });
- }
const alertData = [];
const alertData_1 = [];
@@ -251,11 +259,7 @@
});
}
const res = {
- alarmData: alarmData,
- alarmData_1: alarmData_1,
- alarmData_2: alarmData_2,
- alarmData_3: alarmData_3,
-
+
alertData: alertData,
alertData_1: alertData_1,
alertData_2: alertData_2,
@@ -275,6 +279,7 @@
this.radarData = res.radarData;
+
const avatars = [
'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png', // Alipay
'https://gw.alipayobjects.com/zos/rmsportal/zOsKZmFRdUtvpqCImOVY.png', // Angular
--
Gitblit v1.8.0