From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/reports/demo/demo.component.ts | 84 ++++++++++++++++++++----------------------
1 files changed, 40 insertions(+), 44 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 1189314..755551b 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -12,14 +12,35 @@
})
export class DemoComponent implements OnInit {
+ constructor(
+ public http: HttpClient,
+ public dateSrv: DateService,
+ public router: Router,
+ public msgSrv: NzMessageService
+ ) {
+ const timeType = this.timeType = this.typeOptions[1];
+ this.query.type = timeType.value;
+ this.time.format = timeType.format.toUpperCase();
+ this.query.reportType = this.reportOptions[1].value;
+ }
[x: string]: any;
- query: any = {
- };
- time: any = {
- format: 'YYYY',
- mode: 'month'
- };
- items = [{
+ public query: any = {};
+ public sensorOptions = [];
+ public typeOptions = [
+ {value: 'year', label: '���', xAxisName: '���', format: 'yyyy', typeFormat: '%Y-%m', timeLength: 12},
+ {value: 'month', label: '���', xAxisName: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d', timeLength: 28},
+ {value: 'day', label: '���', xAxisName: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H', timeLength: 24},
+ {value: 'hour', label: '���', xAxisName: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i', timeLength: 60}
+ ];
+ public reportOptions = [
+ {value: 'bar', label: '���������'},
+ {value: 'line', label: '���������'}
+ ];
+ public monitorPointOptions = [];
+ public deviceOptions = [];
+ public time: any = {};
+ public timeType: any = {};
+ public items = [{
id: 0,
monitorPoint: null,
mac: '',
@@ -29,20 +50,7 @@
deviceName: '',
monitorPointAddress: '',
deviceCount: ''
-
}];
-
- public sensorOptions = [];
- public monitorPointOptions = [];
- public deviceOptions = [];
-
- constructor(
- public http: HttpClient,
- public dateSrv: DateService,
- public router: Router,
- public msgSrv: NzMessageService
- ) {
- }
ngOnInit() {
this.http.get(environment.SERVER_BASH_URL + 'sensor/all').subscribe((res: any) => {
@@ -50,6 +58,15 @@
this.msgSrv.error(res.message);
} else {
this.sensorOptions = res.data;
+ }
+ });
+ }
+
+ typeChange(searchText) {
+ this.typeOptions.forEach(types => {
+ if (types.value === searchText) {
+ this.timeType = types;
+ this.time.format = types.format.toUpperCase();
}
});
}
@@ -68,7 +85,6 @@
deviceCount: ''
});
}
-
searchChange(searchText, i) {
if (searchText) {
@@ -121,23 +137,8 @@
}
}
- public typeOptions = [
- {value: 'year', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy', typeFormat: '%Y-%m', timeLength: 12},
- {value: 'month', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d', timeLength: 28},
- {value: 'day', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H', timeLength: 24},
- {value: 'hour', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i', timeLength: 60}
- ];
-
- timeType = this.typeOptions[0];
-
- typeChange(searchText) {
- this.typeOptions.forEach(types => {
- if (types.value === searchText) {
- this.timeType = types;
- this.time.format = types.format.toUpperCase();
- this.time.mode = types.mode;
- }
- });
+ _disabledDate(current: Date): boolean {
+ return current && current.getTime() > Date.now();
}
reportQuery() {
@@ -152,18 +153,13 @@
break;
}
}
- if (validate && query.type) {
+ if (validate && query.type && query.reportType) {
query.timeType = JSON.stringify(this.timeType);
query.items = JSON.stringify(this.items);
- console.info(this.items);
this.router.navigate(['report'], {queryParams: query});
} else {
this.msgSrv.error('���������������������������������������');
}
- }
-
- _disabledDate(current: Date): boolean {
- return current && current.getTime() > Date.now() ;
}
}
--
Gitblit v1.8.0