From 0e722c9f6127ea7a41ca08fd36547e421b79edeb Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 25 Apr 2018 10:26:37 +0800
Subject: [PATCH] 饼图 结论
---
src/app/routes/dashboard/workplace/workplace.component.ts | 180 ++++++++++++++---------------------------------------------
1 files changed, 44 insertions(+), 136 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index d7e7561..968fad1 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -76,25 +76,36 @@
const fakeDC = [60, 135, 70, 112, 80, 170, 200, 140, 52, 119, 164, 230];
for (let i = 0; i < 12; i += 1) {
this.totalDeviceCountList.push({
- x: moment(today).subtract(-1*i, 'months').format(
- "YYYY-MM"
+ x: moment(today).subtract(-1 * i, 'months').format(
+ 'YYYY-MM'
),
y: fakeDC[i]
});
this.totalDeviceCount += fakeDC[i];
}
- this.avgDeviceCount = (this.totalDeviceCount/12).toFixed(0);
+ 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) + 200
- });
+ 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 = [];
+ const alertData_2 = [];
+ const alertData_3 = [];
+ for (let i = 0; i < 7; i += 1) {
+ alertData.push({ x: this.rankingListData[i].title, y: Math.floor(Math.random() * 1000) + 500 });
+ alertData_1.push({ x: this.rankingListData[i].title, y: Math.floor(Math.random() * 1000) + 100 });
+ alertData_2.push({ x: this.rankingListData[i].title, y: Math.floor(Math.random() * 1000) + 200 });
+ alertData_3.push({ x: this.rankingListData[i].title, y: Math.floor(Math.random() * 1000) + 300 });
+ }
const visitData = [];
const beginDay = new Date().getTime();
@@ -103,7 +114,7 @@
for (let i = 0; i < fakeY.length; i += 1) {
visitData.push({
x: moment(new Date(beginDay + 1000 * 60 * 60 * 24 * i)).format(
- "YYYY-MM-DD"
+ 'YYYY-MM-DD'
),
y: fakeY[i]
});
@@ -113,103 +124,9 @@
for (let i = 0; i < fakeY2.length; i += 1) {
visitData2.push({
x: moment(new Date(beginDay + 1000 * 60 * 60 * 24 * i)).format(
- "YYYY-MM-DD"
+ 'YYYY-MM-DD'
),
y: fakeY2[i]
- });
- }
-
-
- const salesTypeData = [
- {
- x: "������������",
- y: 4544
- },
- {
- x: "������������",
- y: 3321
- },
- {
- x: "������������",
- y: 3113
- },
- {
- x: "������������",
- y: 2341
- },
- {
- x: "������������",
- y: 1231
- },
- {
- x: "������",
- y: 1231
- }
- ];
-
- const salesTypeDataOnline = [
- {
- x: "������������",
- y: 244
- },
- {
- x: "������������",
- y: 321
- },
- {
- x: "������������",
- y: 311
- },
- {
- x: "������������",
- y: 41
- },
- {
- x: "������������",
- y: 121
- },
- {
- x: '������',
- y: 111
- }
- ];
-
- const salesTypeDataOffline = [
- {
- x: '������������',
- y: 99
- },
- {
- x: '������������',
- y: 188
- },
- {
- x: '������������',
- y: 344
- },
- {
- x: '������������',
- y: 255
- },
- {
- x: '������',
- y: 65
- }
- ];
-
- const offlineData = [];
- for (let i = 0; i < 10; i += 1) {
- offlineData.push({
- name: `������${i}`,
- cvr: Math.ceil(Math.random() * 9) / 10
- });
- }
- const offlineChartData = [];
- for (let i = 0; i < 20; i += 1) {
- offlineChartData.push({
- x: new Date().getTime() + 1000 * 60 * 30 * i,
- y1: Math.floor(Math.random() * 100) + 10,
- y2: Math.floor(Math.random() * 100) + 10
});
}
@@ -269,40 +186,30 @@
status: Math.floor((Math.random() * 10) % 2)
});
}
- var res = {
+ 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,
+ alertData_3: alertData_3,
visitData: visitData,
visitData2: visitData2,
- salesTypeData: salesTypeData,
- salesTypeDataOnline: salesTypeDataOnline,
- salesTypeDataOffline: salesTypeDataOffline,
- offlineData: offlineData,
- offlineChartData: offlineChartData,
+
radarOriginData: radarOriginData,
radarData: radarData,
searchData: searchData
};
- res.offlineData.forEach((item: any) => {
- item.chart = Object.assign([], res.offlineChartData);
- });
this.data = res;
this.loading = false;
this.changeSaleType();
this.radarData = res.radarData;
-
- const titles = [
- 'Alipay',
- 'Angular',
- 'Ant Design',
- 'Ant Design Pro',
- 'Bootstrap',
- 'React',
- 'Vue',
- 'Webpack'
- ];
const avatars = [
'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png', // Alipay
@@ -315,7 +222,7 @@
'https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png' // Webpack
];
- var activities = [
+ const activities = [
{
id: 'trend-1',
updatedAt: new Date(),
@@ -454,22 +361,23 @@
];
}
- salesType = 'all';
+ salesType = '0';
salesPieData: any;
salesTotal = 0;
changeSaleType() {
- this.salesPieData = this.salesType === 'all' ? this.data.salesTypeData : (
- this.salesType === 'online' ? this.data.salesTypeDataOnline : this.data.salesTypeDataOffline
- );
+ if (this.salesType == '0') {
+ this.salesPieData = this.data.alertData;
+ } else if (this.salesType == '1') {
+ this.salesPieData = this.data.alertData_1;
+ } else if (this.salesType == '2') {
+ this.salesPieData = this.data.alertData_2;
+ } else if (this.salesType == '3') {
+ this.salesPieData = this.data.alertData_3;
+ }
if (this.salesPieData) this.salesTotal = this.salesPieData.reduce((pre, now) => now.y + pre, 0);
}
handlePieValueFormat(value: any) {
- return yuan(value);
- }
-
- _activeTab = 0;
- _tabChange(value: any) {
- console.log('tab', this._activeTab, value);
+ return value + '���';
}
}
--
Gitblit v1.8.0