From eef69fa1194f6ab215b08a8baaf402d0539362cc Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 15:56:59 +0800
Subject: [PATCH] 日历完善，设备相关功能开发
---
src/app/routes/environment/management/management.component.ts | 94 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 30 deletions(-)
diff --git a/src/app/routes/environment/management/management.component.ts b/src/app/routes/environment/management/management.component.ts
index 68b73fe..d2ced06 100644
--- a/src/app/routes/environment/management/management.component.ts
+++ b/src/app/routes/environment/management/management.component.ts
@@ -1,9 +1,12 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { environment } from '../../../../environments/environment';
+import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
import { _HttpClient } from '@delon/theme';
import { HttpClient } from '@angular/common/http';
import * as moment from 'moment';
import { DeviceService } from '@business/services/http/device.service';
+import * as echarts from 'echarts';
+import * as $ from 'jquery';
@Component({
selector: 'environment-management',
@@ -13,44 +16,75 @@
})
export class EnvironmentManagementComponent implements OnInit, OnDestroy {
- data: any = {};
-
constructor(
private deviceService: DeviceService,
private http: _HttpClient,
public msg: NzMessageService,
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)
- });
+
+ public option = {
+ tooltip: {
+ trigger: 'item',
+ axisPointer: {
+ type: 'cross'
}
-
- this.data = {
- searchData: searchData
- };
+ },
+ legend: {
+ right: '10%',
+ top: '10%',
+ data: ['������������', '������������']
+ },
+ xAxis: {
+ type: 'category'
+ },
+ yAxis: {
+ type: 'value',
+ name: '���������ug/m��'
+ },
+ series: [
+ {
+ type: 'line',
+ smooth: true,
+ name: '������������'
+ }, {
+ type: 'line',
+ smooth: true,
+ name: '������������'
+ }
+ ]
+ };
+
+ ngAfterViewInit() {
+ const PM25 = echarts.init(document.getElementById('PM25'));
+ PM25.showLoading();
+ const params = {
+ type: 'month',
+ sensors: JSON.stringify(['e1']),
+ items: JSON.stringify([
+ {areaCode: 320583, formatTime: moment().format('YYYY-MM')},
+ {areaCode: 320583, formatTime: moment().subtract(1, 'M').format('YYYY-MM')}
+ ])
+ };
+ this.http2.get(environment.SERVER_BASH_URL + 'report/compare', {params: params}).subscribe((res: any) => {
+ const PM25Option = $.extend(true,
+ {
+ xAxis: {data: res.data.times},
+ series: [
+ {data: res.data.datas[0]['e1']},
+ {data: res.data.datas[1]['e1']}
+ ]
+ },
+ this.option);
+ PM25.setOption(PM25Option, false);
+ window.onresize = PM25.resize;
+ PM25.hideLoading();
+ });
+ }
+
+ ngOnInit() {
}
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