From b0a7de005f68d59a47a11294c1168c45699f13c9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 20 Jul 2018 16:17:28 +0800
Subject: [PATCH] 站点数据 分析
---
src/app/routes/reports/query2/query2.component.ts | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/src/app/routes/reports/query2/query2.component.ts b/src/app/routes/reports/query2/query2.component.ts
index 3580a3b..3134b45 100644
--- a/src/app/routes/reports/query2/query2.component.ts
+++ b/src/app/routes/reports/query2/query2.component.ts
@@ -1,3 +1,5 @@
+import { environment } from '../../../../environments/environment';
+import { HttpClient } from '@angular/common/http';
import { Component, OnInit, ViewChild } from '@angular/core';
import { _HttpClient } from '@delon/theme';
import { Sensor, Device, DataCondition, MonitorPoint, Organization, LineChartCriteria } from '@business/entity/data';
@@ -204,20 +206,45 @@
private monitorPointService: MonitorPointService,
private msg: NzMessageService,
private dateService: DateService,
+ private http2: HttpClient
) { }
- ngOnInit() {
- const searchData = [];
- for (let i = 0; i < 50; i += 1) {
- searchData.push({
- index: i + 1,
- point: `������������-${i}`,
- value: Math.floor(Math.random() * 100)
- });
- }
+
+ _dataSet = [];
+
+ changeSensorKey(sensorKey) {
+ const params = {sensorKey: sensorKey, dimension: 'monitorPoint', regionCode: '320583', accountId: '1', timeType: 'month'};
+ this.http2.get(environment.SERVER_BASH_URL + 'screen/region_ranking_data', {params: params}).subscribe((res: any) => {
+ this._dataSet = res.data;
+ });
+ }
+ sort(sortName, sortValue) {
+ this._dataSet = [
+ ...(<any[]>this._dataSet).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;
+ }
+ })
+ ];
+ }
- this.data = {
- searchData: searchData
- };
+ ngOnInit() {
+ this.changeSensorKey('e1');
+// const searchData = [];
+// for (let i = 0; i < 50; i += 1) {
+// searchData.push({
+// index: i + 1,
+// point: `������������-${i}`,
+// value: Math.floor(Math.random() * 100)
+// });
+// }
+//
+// this.data = {
+// searchData: searchData
+// };
this.initPage();
// ������������ tree click ������
@@ -514,7 +541,6 @@
public loadGrid(): void {
// ������������
const sensors = Object.values(this._sensors);
- debugger;
if ( sensors.length === 0 ) {
this.msg.error(' ������������ ������������');
return ;
@@ -830,19 +856,6 @@
}
- 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