From 89ba2c7490a743e383f3c991d993291dc9120b4c Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 30 Jul 2018 08:49:40 +0800
Subject: [PATCH] 风向风速 功能展现
---
src/app/routes/reports/query2/query2.component.html | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/app/routes/reports/query2/query2.component.html b/src/app/routes/reports/query2/query2.component.html
index 150b578..69fbdeb 100644
--- a/src/app/routes/reports/query2/query2.component.html
+++ b/src/app/routes/reports/query2/query2.component.html
@@ -1,17 +1,17 @@
<div nz-row [nzGutter]="24" style="padding-top: 25px">
<div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
- <nz-card [nzLoading]="loading" [nzBordered]="false" nzTitle="������������������" [nzBodyStyle]="{'padding.px': 24}" class="sales-card" style="min-height: 482px;">
+ <nz-card [nzBordered]="false" nzTitle="������������������" [nzBodyStyle]="{'padding.px': 24}" class="sales-card" style="min-height: 482px;">
<ng-template #extra>
<div class="sales-card-extra">
<div class="sales-type-radio">
- <nz-radio-group [(ngModel)]="salesType" (ngModelChange)="changeSaleType()" [nzSize]="'large'">
- <label nz-radio-button [nzValue]="'1'"><span>PM2.5</span></label>
- <label nz-radio-button [nzValue]="'2'"><span>PM10</span></label>
- <label nz-radio-button [nzValue]="'3'"><span>SO2</span></label>
- <label nz-radio-button [nzValue]="'4'"><span>NO3</span></label>
- <label nz-radio-button [nzValue]="'5'"><span>O3</span></label>
- <label nz-radio-button [nzValue]="'6'"><span>CO</span></label>
+ <nz-radio-group [(ngModel)]="sensorKey" (ngModelChange)="changeSensorKey($event)" [nzSize]="'large'">
+ <label nz-radio-button [nzValue]="'e1'"><span>PM2.5</span></label>
+ <label nz-radio-button [nzValue]="'e2'"><span>PM10</span></label>
+ <label nz-radio-button [nzValue]="'e11'"><span>SO2</span></label>
+ <label nz-radio-button [nzValue]="'e16'"><span>NO2</span></label>
+ <label nz-radio-button [nzValue]="'e15'"><span>O3</span></label>
+ <label nz-radio-button [nzValue]="'e10'"><span>CO</span></label>
</nz-radio-group>
</div>
</div>
@@ -19,22 +19,22 @@
<ng-template #body>
<h4 class="margin:8px 0 32px 0;">������������������</h4>
- <nz-table #keyTable [nzDataSource]="data.searchData" [nzPageSize]="5" nzSize="small">
+ <nz-table #keyTable [nzDataSource]="_dataSet" [nzPageSize]="5" nzSize="small" [nzLoading]="loading">
<thead nz-thead>
<tr>
<th nz-th><span>������</span></th>
<th nz-th><span>������������</span></th>
<th nz-th class="text-right">
- <span>������������ mg/m3</span>
- <nz-table-sort (nzValueChange)="sort('count',$event)"></nz-table-sort>
+ <span>������������ {{sensorKey == 'e10'?'mg/m3':'ug/m3'}}</span>
+ <nz-table-sort (nzValueChange)="sort('avg',$event)"></nz-table-sort>
</th>
</tr>
</thead>
<tbody nz-tbody>
- <tr nz-tbody-tr *ngFor="let i of keyTable.data">
- <td nz-td>{{i.index}}</td>
- <td nz-td><a (click)="msg.success(i.point)">{{i.point}}</a></td>
- <td nz-td class="text-right">{{i.value}}</td>
+ <tr nz-tbody-tr *ngFor="let i of keyTable.data;let index = index">
+ <td nz-td>{{index + 1}}</td>
+ <td nz-td><a>{{i.name}}</a></td>
+ <td nz-td class="text-right">{{i.avg}}</td>
</tr>
</tbody>
</nz-table>
--
Gitblit v1.8.0