From 39ea49edce74ae063ca0afd9b2966f861e256a3e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Apr 2018 13:18:36 +0800
Subject: [PATCH] ts fix,组织报警间隔时间设置
---
src/app/routes/dashboard/workplace/workplace.component.ts | 50 ++++++++++++--------------------------------------
1 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index a2a21a6..968fad1 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -76,14 +76,14 @@
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 = [];
@@ -114,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]
});
@@ -124,25 +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 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
});
}
@@ -202,7 +186,7 @@
status: Math.floor((Math.random() * 10) % 2)
});
}
- var res = {
+ const res = {
alarmData: alarmData,
alarmData_1: alarmData_1,
alarmData_2: alarmData_2,
@@ -216,16 +200,11 @@
visitData: visitData,
visitData2: visitData2,
- 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();
@@ -243,7 +222,7 @@
'https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png' // Webpack
];
- var activities = [
+ const activities = [
{
id: 'trend-1',
updatedAt: new Date(),
@@ -386,24 +365,19 @@
salesPieData: any;
salesTotal = 0;
changeSaleType() {
- if(this.salesType == '0') {
+ if (this.salesType == '0') {
this.salesPieData = this.data.alertData;
- } else if(this.salesType == '1') {
+ } else if (this.salesType == '1') {
this.salesPieData = this.data.alertData_1;
- } else if(this.salesType == '2') {
+ } else if (this.salesType == '2') {
this.salesPieData = this.data.alertData_2;
- } else if(this.salesType == '3') {
+ } 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 value + "���";
- }
-
- _activeTab = 0;
- _tabChange(value: any) {
- console.log('tab', this._activeTab, value);
+ return value + '���';
}
}
--
Gitblit v1.8.0