From 565f5b26ee306966f0b4b9447b7a8f9b04a9fe00 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 15 Jun 2018 09:21:00 +0800
Subject: [PATCH] 改变暂存
---
src/app/routes/dashboard/workplace/workplace.component.ts | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index bc27c03..a3ede59 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -25,9 +25,9 @@
avgDeviceCount = '';
deviceCountLoading = true;
// ������������
- alarmCountList:{x: string,y: number}[] = null;
+ alarmCountList: {x: string, y: number}[] = null;
alarmCountCurrMonth = '';
- alarmCountCurrDay = '';// ������������������
+ alarmCountCurrDay = ''; // ������������������
alarmCountLoading = true;
operationLoading = true;
operNormalPercent = 0;
@@ -160,45 +160,45 @@
// });
// this.totalDeviceCount += fakeDC[i];
// }
- let example1 = new ExampleService();
- let mo = moment();
- example1.or().andGreaterThanOrEqualTo({ name: "createTime", value: mo.format('YYYY-MM-01 00:00:00') });
- let example2 = new ExampleService();
- let example3 = new ExampleService();
- example3.or().andNotEqualTo({name:'state',value:4});
+ const example1 = new ExampleService();
+ const mo = moment();
+ example1.or().andGreaterThanOrEqualTo({ name: 'createTime', value: mo.format('YYYY-MM-01 00:00:00') });
+ const example2 = new ExampleService();
+ const example3 = new ExampleService();
+ example3.or().andNotEqualTo({name: 'state', value: 4});
zip(this.deviceService.countByExample(example1),
this.deviceService.countByExample(example2),
- this.http.get<ResultBean<{time: string,count: number}[]>>('device/count-by-times',{start:mo.format('YYYY-01-01 00:00:00'),end:mo.format('YYYY-12-31 23:59:59')}),
+ this.http.get<ResultBean<{time: string, count: number}[]>>('device/count-by-times', {start: mo.format('YYYY-01-01 00:00:00'), end: mo.format('YYYY-12-31 23:59:59')}),
this.deviceService.countByExample(example3)).subscribe(
- ([rWtihAvg, rWithToltal,rWithList,rWithNormal]) => {
- if (!!rWtihAvg.code && !!rWithToltal&&!!rWithList.code) {
+ ([rWtihAvg, rWithToltal, rWithList, rWithNormal]) => {
+ if (!!rWtihAvg.code && !!rWithToltal && !!rWithList.code) {
this.avgDeviceCount = ToolsService.toThousands(rWtihAvg.data.toString());
this.totalDeviceCount = ToolsService.toThousands(rWithToltal.data.toString());
this.totalDeviceCountList = rWithList.data.map(item => {
- return {x:item.time,y:item.count};
- })
- this.operNormalPercent = Math.round(rWithNormal.data/rWithToltal.data*100);
+ return {x: item.time, y: item.count};
+ });
+ this.operNormalPercent = Math.round(rWithNormal.data / rWithToltal.data * 100);
this.deviceCountLoading = false;
this.operationLoading = false;
}
}
);
zip(
- this.http.get<ResultBean<{time: string,count: number}[]>>("alarm/count-by-times",{start: mo.format('YYYY-MM-01 00:00:00'),end: null,timeUnits: TimeUnits.DAY}),
- this.http.get<ResultBean<{time: string,count: number}[]>>("alarm/count-by-times",{start: mo.format('YYYY-MM-01 00:00:00'),end: null}),
- this.http.get<ResultBean<{time: string,count: number}[]>>("alarm/count-by-times",{start: mo.format('YYYY-MM-DD 00:00:00'),end: null})
+ this.http.get<ResultBean<{time: string, count: number}[]>>('alarm/count-by-times', {start: mo.format('YYYY-MM-01 00:00:00'), end: null, timeUnits: TimeUnits.DAY}),
+ this.http.get<ResultBean<{time: string, count: number}[]>>('alarm/count-by-times', {start: mo.format('YYYY-MM-01 00:00:00'), end: null}),
+ this.http.get<ResultBean<{time: string, count: number}[]>>('alarm/count-by-times', {start: mo.format('YYYY-MM-DD 00:00:00'), end: null})
).subscribe(
- ([rWithList,rWithMonth,rWithDay]) => {
- if(!!rWithList.code&&!!rWithMonth.code&&!!rWithDay.code){
+ ([rWithList, rWithMonth, rWithDay]) => {
+ if (!!rWithList.code && !!rWithMonth.code && !!rWithDay.code) {
this.alarmCountList = rWithList.data.map(
item => {
- return {x:item.time,y:item.count};
+ return {x: item.time, y: item.count};
}
);
- if(!!rWithMonth.data&&rWithMonth.data.length>0){
+ if (!!rWithMonth.data && rWithMonth.data.length > 0) {
this.alarmCountCurrMonth = ToolsService.toThousands(rWithMonth.data[0].count.toString());
}
- if(!!rWithDay.data&&rWithDay.data.length>0) {
+ if (!!rWithDay.data && rWithDay.data.length > 0) {
this.alarmCountCurrDay = ToolsService.toThousands(rWithDay.data[0].count.toString());
}
this.alarmCountLoading = false;
--
Gitblit v1.8.0