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.html | 10 +-
src/app/routes/dashboard/workplace/workplace.component.ts | 39 +++++++-----
src/app/routes/reports/alarm/alarm.component.ts | 2
src/app/routes/reports/alarm/alarm.component.html | 24 ++++----
src/styles/index.less | 5 +
src/app/routes/reports/excel/excel.component.html | 18 +++---
src/app/routes/reports/demo/demo.component.html | 24 ++++----
7 files changed, 65 insertions(+), 57 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index f39e81c..8b5dcdf 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.html
+++ b/src/app/routes/dashboard/workplace/workplace.component.html
@@ -109,13 +109,13 @@
</div>
<nz-card [nzLoading]="loading" [nzBordered]="false" nzNoPadding class="sales-card">
<ng-template #body>
- <nz-tabset>
+ <nz-tabset (nzSelectedIndexChange)=selectedIndexChange($event) >
<nz-tab>
<ng-template #nzTabHeading>������������</ng-template>
<div nz-row>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
<div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="data.alarmData" color="purple"></bar>
+ <bar height="295" [title]="'������������������������'" [data]="alarmData._0" color="purple"></bar>
</div>
</div>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
@@ -140,7 +140,7 @@
<div nz-row>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
<div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="data.alarmData_1" color="yellow"></bar>
+ <bar height="295" [title]="'������������������������'" [data]="alarmData._1" color="yellow"></bar>
</div>
</div>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
@@ -165,7 +165,7 @@
<div nz-row>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
<div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="data.alarmData_2" color="orange"></bar>
+ <bar height="295" [title]="'������������������������'" [data]="alarmData._2" color="orange"></bar>
</div>
</div>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
@@ -190,7 +190,7 @@
<div nz-row>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
<div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="data.alarmData_3" color="red"></bar>
+ <bar height="295" [title]="'������������������������'" [data]="alarmData._3" color="red"></bar>
</div>
</div>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
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
diff --git a/src/app/routes/reports/alarm/alarm.component.html b/src/app/routes/reports/alarm/alarm.component.html
index 63d6e19..ac26de6 100644
--- a/src/app/routes/reports/alarm/alarm.component.html
+++ b/src/app/routes/reports/alarm/alarm.component.html
@@ -5,8 +5,8 @@
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label> ��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label>������</label>
</div>
<div nz-form-control class="flex-1">
<nz-select [(ngModel)]="query.dimension" name="dimension" [nzSize]="'large'" [nzPlaceHolder]="'���������'" (ngModelChange)="dimensionChange($event)">
@@ -20,8 +20,8 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label> ��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label>������</label>
</div>
<div nz-form-control class="flex-1" style="width: 300px">
<nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'click'">
@@ -42,8 +42,8 @@
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label> ��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label>������</label>
</div>
<div nz-form-control class="flex-1">
<nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
@@ -55,7 +55,7 @@
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label >������</label>
</div>
<div nz-form-control class="flex-1">
@@ -71,7 +71,7 @@
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>���������</label>
</div>
<div nz-form-control class="flex-1">
@@ -83,11 +83,11 @@
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label>���������</label>
+ <div nz-form-label class="label-width-70">
+ <label>������������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'��������� ���������'" [nzSize]="'large'"
+ <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'��������� ������������'" [nzSize]="'large'"
[nzNotFoundContent]="'������������'" (ngModelChange)="monitorPointChange($event)" nzShowSearch nzAllowClear [nzDisabled]="isDisable">
<nz-option *ngFor="let option of monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option>
</nz-select>
@@ -97,7 +97,7 @@
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label>������</label>
</div>
<div nz-form-control class="flex-1">
diff --git a/src/app/routes/reports/alarm/alarm.component.ts b/src/app/routes/reports/alarm/alarm.component.ts
index 606ce17..d337dd7 100644
--- a/src/app/routes/reports/alarm/alarm.component.ts
+++ b/src/app/routes/reports/alarm/alarm.component.ts
@@ -43,7 +43,7 @@
];
public dimensionOptions = [
{value: 'sensor', label: '������'},
- {value: 'monitorPoint', label: '���������'}
+ {value: 'monitorPoint', label: '������������'}
];
isDisable = false;
private treeClickStream: Subject<any> = new Subject<any>();
diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html
index c584b66..c0089fb 100644
--- a/src/app/routes/reports/demo/demo.component.html
+++ b/src/app/routes/reports/demo/demo.component.html
@@ -4,8 +4,8 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label> ��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label>������</label>
</div>
<div nz-form-control class="flex-1">
<!-- <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKeys" name="sensorKeys" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
@@ -28,8 +28,8 @@
</div>
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label nz-form-item-required>��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
<nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
@@ -40,7 +40,7 @@
</div>
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
@@ -63,7 +63,7 @@
<div nz-row [nzGutter]="24" *ngFor="let item of items;let i = index">
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>���������</label>
</div>
<div nz-form-control class="flex-1">
@@ -75,11 +75,11 @@
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label>���������</label>
+ <div nz-form-label class="label-width-70">
+ <label>������������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" [nzPlaceHolder]="'��������� ���������'" [nzSize]="'large'"
+ <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" [nzPlaceHolder]="'��������� ������������'" [nzSize]="'large'"
[nzNotFoundContent]="'������������'" (ngModelChange)="monitorPointChange($event,i)" nzShowSearch nzAllowClear>
<nz-option *ngFor="let option of item.monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option"> </nz-option>
</nz-select>
@@ -88,8 +88,8 @@
</div>
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label> ��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label>������</label>
</div>
<div nz-form-control class="flex-1">
<nz-select [(ngModel)]="item.device" name="mac{{item.id}}" [nzSize]="'large'" [nzPlaceHolder]="'��������� ������'" [nzNotFoundContent]="'������������'" nzShowSearch nzAllowClear>
@@ -100,7 +100,7 @@
</div>
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
diff --git a/src/app/routes/reports/excel/excel.component.html b/src/app/routes/reports/excel/excel.component.html
index 357faf4..dfd4b34 100644
--- a/src/app/routes/reports/excel/excel.component.html
+++ b/src/app/routes/reports/excel/excel.component.html
@@ -4,7 +4,7 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label>������</label>
</div>
<div nz-form-control class="flex-1">
@@ -25,7 +25,7 @@
</div>
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>���������</label>
</div>
<div nz-form-control class="flex-1">
@@ -36,11 +36,11 @@
</div>
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label>���������</label>
+ <div nz-form-label class="label-width-70">
+ <label>������������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'��������� ���������'" [nzSize]="'large'"
+ <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'��������� ������������'" [nzSize]="'large'"
[nzNotFoundContent]="'������������'" (ngModelChange)="monitorPointChange($event)" nzShowSearch nzAllowClear>
<nz-option *ngFor="let option of monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option>
</nz-select>
@@ -49,7 +49,7 @@
</div>
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label>������</label>
</div>
<div nz-form-control class="flex-1">
@@ -64,7 +64,7 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label>������</label>
</div>
<div nz-form-control class="flex-1">
@@ -76,7 +76,7 @@
</div>
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>���������</label>
</div>
<div nz-form-control class="flex-1">
@@ -87,7 +87,7 @@
</div>
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label >���������</label>
</div>
<div nz-form-control class="flex-1">
diff --git a/src/styles/index.less b/src/styles/index.less
index dcd9331..bb8ef6d 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -1 +1,4 @@
-// ������������������������������������������������������
+// ������������������������������������������������������
+.label-width-70 {
+ width: 70px;
+ }
\ No newline at end of file
--
Gitblit v1.8.0