From 401a044107202a74dd87408dd43d38cc2ab80fe6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 12 Mar 2018 09:25:59 +0800
Subject: [PATCH] 报表管理 优化
---
src/app/routes/report/report.component.html | 27 ++++++++++++++++++++++++---
src/app/routes/report/report.component.ts | 4 ++++
src/app/routes/reports/demo/demo.component.ts | 6 +++++-
src/app/routes/reports/demo/demo.component.html | 2 +-
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index c779396..db89772 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -1,5 +1,26 @@
+<html>
+ <body>
+ <nz-spin [nzTip]="'������������������...'"[nzSize]="'large'" [nzSpinning]="spinning">
+ </nz-spin>
+
+ <div >
+ <div id="head" style="height: 486px; width: 1000px" *ngIf="! spinning">
+ <h1>
+ ������������������������
+ </h1>
+ </div>
-<div *ngFor="let i of sensorArr">
- <div id ="mydiv{{i}}" style="height: 486px; width: 1000px"></div>
-</div>
+ <div id="content" style="display: none;">
+ <div *ngFor="let i of sensorArr">
+ <div id ="mydiv{{i}}" style="height: 487px; width: 1000px"></div>
+ </div>
+ </div>
+ <div id="foot" style="height: 486px; width: 1000px" *ngIf="! spinning">
+ <h1>
+ ������������������
+ </h1>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index f898999..25e5f9c 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -14,6 +14,7 @@
export class ReportComponent implements OnInit {
[x: string]: any;
+ spinning: boolean = true;
constructor(
public injector: Injector,
public http: HttpClient,
@@ -82,6 +83,7 @@
sensorArr: any = [];
ngOnInit() {
+
this.activeRoute.queryParams.subscribe(params => {
const items = JSON.parse(params.items);
const query = params;
@@ -123,7 +125,9 @@
$('#mydiv' + i).remove();
}
});
+ $('#content').attr({style:"display: inline;"});
}
+ this.spinning = false;
});
});
}
diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html
index ed8b01c..dc25358 100644
--- a/src/app/routes/reports/demo/demo.component.html
+++ b/src/app/routes/reports/demo/demo.component.html
@@ -68,7 +68,7 @@
<label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-datepicker style="width: 100%;" value="" [(ngModel)]="item.time" name="time{{item.id}}" id="{{item.time}}" [nzPlaceHolder]="'���������'" [nzFormat]="time.format" [nzMode]="time.mode" [nzSize]="'large'" nzShowTime></nz-datepicker>
+ <nz-datepicker style="width: 100%;" value="" [(ngModel)]="item.time" name="time{{item.id}}" id="{{item.time}}" [nzPlaceHolder]="'���������'" [nzFormat]="time.format" [nzMode]="time.mode" [nzSize]="'large'" nzShowTime [nzDisabledDate]="_disabledDate"></nz-datepicker>
</div>
</div>
</div>
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 0e3fa7e..ad81b13 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -121,7 +121,8 @@
{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) {
@@ -158,4 +159,7 @@
}
+ _disabledDate(current: Date): boolean {
+ return current && current.getTime() > Date.now() ;
+ }
}
--
Gitblit v1.8.0