From e82d7ca41418b94a9e5d487ac4e3497ccf54e277 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 09 May 2018 14:05:26 +0800
Subject: [PATCH] 三级警报优化
---
src/app/routes/dashboard/workplace/workplace.component.html | 85 ++----------------------------------------
src/app/routes/dashboard/workplace/workplace.component.ts | 10 ++++-
2 files changed, 13 insertions(+), 82 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index 8b5dcdf..5566b14 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.html
+++ b/src/app/routes/dashboard/workplace/workplace.component.html
@@ -110,12 +110,12 @@
<nz-card [nzLoading]="loading" [nzBordered]="false" nzNoPadding class="sales-card">
<ng-template #body>
<nz-tabset (nzSelectedIndexChange)=selectedIndexChange($event) >
- <nz-tab>
- <ng-template #nzTabHeading>������������</ng-template>
+ <nz-tab *ngFor="let alarmData of alarmDatas">
+ <ng-template #nzTabHeading>{{alarmData.title}}������</ng-template>
<div nz-row>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
<div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="alarmData._0" color="purple"></bar>
+ <bar height="295" [title]="alarmData.title+'������������������'" [data]="alarmData.data" color="{{alarmData.color}}"></bar>
</div>
</div>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
@@ -123,86 +123,11 @@
<h4 class="rank-title">������������������</h4>
<ul>
<li *ngFor="let i of rankingListData; let idx = index">
- <div>
+ <div *ngIf="idx < 7">
<span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
{{i.title}}
</div>
- <span>{{i.total | number: '1.0'}}</span>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </nz-tab>
-
- <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]="alarmData._1" color="yellow"></bar>
- </div>
- </div>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
- <div class="rank-list">
- <h4 class="rank-title">������������������</h4>
- <ul>
- <li *ngFor="let i of rankingListData; let idx = index">
- <div>
- <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
- {{i.title}}
- </div>
- <span>{{i.total | number: '1.0'}}</span>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </nz-tab>
-
- <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]="alarmData._2" color="orange"></bar>
- </div>
- </div>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
- <div class="rank-list">
- <h4 class="rank-title">������������������</h4>
- <ul>
- <li *ngFor="let i of rankingListData; let idx = index">
- <div>
- <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
- {{i.title}}
- </div>
- <span>{{i.total | number: '1.0'}}</span>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </nz-tab>
-
- <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]="alarmData._3" color="red"></bar>
- </div>
- </div>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
- <div class="rank-list">
- <h4 class="rank-title">������������������</h4>
- <ul>
- <li *ngFor="let i of rankingListData; let idx = index">
- <div>
- <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
- {{i.title}}
- </div>
- <span>{{i.total | number: '1.0'}}</span>
+ <span *ngIf="idx < 7">{{i.total | number: '1.0'}}</span>
</li>
</ul>
</div>
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index a208c4e..d8d79af 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -35,6 +35,12 @@
radarData: any[] = [];
loading = true;
public alarmData: any = {};
+ public alarmDatas = [
+ { title: '������', color: 'purple', data: [] },
+ { title: '������', color: 'yellow', data: [] },
+ { title: '������', color: 'orange', data: [] },
+ { title: '������', color: 'red', data: [] }
+ ];
public alertData = [[], [], [], []];
salesType = '0';
salesTotal = 0;
@@ -84,13 +90,13 @@
selectedIndexChange(index) {
this.rankingListData = [];
- if (!this.alarmData['_' + index]) {
+ if (this.alarmDatas[index].data.length < 1) {
this.http2.get(environment.SERVER_BASH_URL + 'report/alarm-year', { params: { state: index > 0 ? index : null } }).subscribe((res: any) => {
const data = [];
for (let i = 0; i < res.data.length; i += 1) {
data.push({ x: `${i + 1}���`, y: !!res.data[i] ? res.data[i] : 0 });
}
- this.alarmData['_' + index] = data;
+ this.alarmDatas[index].data = data;
});
}
if (this.alertData[index].length > 0) {
--
Gitblit v1.8.0