From 69e41a0824b0a4737360a5e19929555279e7c292 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Sun, 08 Apr 2018 11:25:47 +0800
Subject: [PATCH] 报表优化
---
src/app/routes/reports/query/query.component.ts | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/reports/query/query.component.ts b/src/app/routes/reports/query/query.component.ts
index 4162c8d..0a782de 100644
--- a/src/app/routes/reports/query/query.component.ts
+++ b/src/app/routes/reports/query/query.component.ts
@@ -49,10 +49,10 @@
* @memberof QueryComponent
*/
public timeUnitOptions = [
- {label: '������', value: TimeUnits.MONTH},
- {label: '������', value: TimeUnits.DAY},
- {label: '������', value: TimeUnits.HOUR},
- {label: '������', value: TimeUnits.MINUTE},
+ {label: '���', value: TimeUnits.MONTH},
+ {label: '���', value: TimeUnits.DAY},
+ {label: '���', value: TimeUnits.HOUR},
+ {label: '���', value: TimeUnits.MINUTE},
];
public timeUnit: {label: string, value: TimeUnits} = this.timeUnitOptions[2];
// ���������������������������������������
@@ -503,6 +503,7 @@
this.reloadChartTitle();
// ������������
this.grid.data = [];
+ console.log(lineChartCriteria);
this.http.post(environment.SERVER_BASH_URL + '/report/line-chart', lineChartCriteria).subscribe(
(res: ResultBean<{[key: string]: Array<Array<number>>}>) => {
if (res.code === 1) {
@@ -526,7 +527,7 @@
weight = !!value ? weight : weight + 1;
}
// ���������������������2���
- return !!value ? String(Math.round(value * 100) / 100) : '-';
+ return value != null ? String(Math.round(value * 100) / 100) : '-';
}
);
this.grid.data.push({sensor: sensor, data: sensorData, weight: weight});
--
Gitblit v1.8.0