From ef5b73ea0b7aed593312f728638d84b5358458ae Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 13 Jul 2018 14:35:00 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/statistics/analysis/analysis.component.ts | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/src/app/routes/statistics/analysis/analysis.component.ts b/src/app/routes/statistics/analysis/analysis.component.ts
index 1640b6e..4426108 100644
--- a/src/app/routes/statistics/analysis/analysis.component.ts
+++ b/src/app/routes/statistics/analysis/analysis.component.ts
@@ -13,7 +13,8 @@
})
export class AnalysisComponent implements OnInit, OnDestroy {
- data: any = {};
+ offlineChartData1: any[] = [];
+ offlineChartData2: any[] = [];
constructor(
private deviceService: DeviceService,
@@ -23,34 +24,24 @@
}
ngOnInit() {
- const searchData = [];
- for (let i = 0; i < 50; i += 1) {
- searchData.push({
- index: i + 1,
- point: `������������-${i}`,
- value: Math.floor(Math.random() * 100)
+ const offlineChartData1 = [];
+ const offlineChartData2 = [];
+ for (let i = 0; i < 20; i += 1) {
+ offlineChartData1.push({
+ x: new Date().getTime() + 1000 * 60 * 30 * i,
+ y1: Math.floor(Math.random() * 100) + 10,
+ y2: Math.floor(Math.random() * 100) + 10
+ });
+ offlineChartData2.push({
+ x: new Date().getTime() + 1000 * 60 * 30 * i,
+ y1: Math.floor(Math.random() * 100) + 10,
+ y2: Math.floor(Math.random() * 100) + 10
});
}
-
- this.data = {
- searchData: searchData
- };
+ this.offlineChartData1 = offlineChartData1;
+ this.offlineChartData2 = offlineChartData2;
}
ngOnDestroy(): void {
- }
-
- sort(sortName, sortValue) {
- this.data.searchData = [
- ...(<any[]>this.data.searchData).sort((a, b) => {
- if (a[sortName] > b[sortName]) {
- return (sortValue === 'ascend') ? 1 : -1;
- } else if (a[sortName] < b[sortName]) {
- return (sortValue === 'ascend') ? -1 : 1;
- } else {
- return 0;
- }
- })
- ];
}
}
--
Gitblit v1.8.0