From 8815d4c3d666cbc96988087e9c21f9e1a9f64a06 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 14:09:39 +0800
Subject: [PATCH] 安装用户密码修改
---
src/app/routes/dashboard/workplace/workplace.component.ts | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index a208c4e..bc27c03 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -20,7 +20,7 @@
})
export class DashboardWorkplaceComponent implements OnInit, OnDestroy {
- totalDeviceCountList: any[] = [];
+ totalDeviceCountList = null;
totalDeviceCount = '';
avgDeviceCount = '';
deviceCountLoading = true;
@@ -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) {
@@ -168,14 +174,9 @@
if (!!rWtihAvg.code && !!rWithToltal&&!!rWithList.code) {
this.avgDeviceCount = ToolsService.toThousands(rWtihAvg.data.toString());
this.totalDeviceCount = ToolsService.toThousands(rWithToltal.data.toString());
- rWithList.data.forEach( item =>{
- this.totalDeviceCountList.push(
- {
- x:item.time,
- y:item.count
- }
- );
- });
+ this.totalDeviceCountList = rWithList.data.map(item => {
+ return {x:item.time,y:item.count};
+ })
this.operNormalPercent = Math.round(rWithNormal.data/rWithToltal.data*100);
this.deviceCountLoading = false;
this.operationLoading = false;
--
Gitblit v1.8.0