From e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 16:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/reports/query2/query2.component.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/reports/query2/query2.component.html b/src/app/routes/reports/query2/query2.component.html
index 27e994a..69fbdeb 100644
--- a/src/app/routes/reports/query2/query2.component.html
+++ b/src/app/routes/reports/query2/query2.component.html
@@ -5,7 +5,7 @@
<ng-template #extra>
<div class="sales-card-extra">
<div class="sales-type-radio">
- <nz-radio-group [(ngModel)]="sensorKey1" (ngModelChange)="changeSensorKey($event)" [nzSize]="'large'">
+ <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>
@@ -19,13 +19,13 @@
<ng-template #body>
<h4 class="margin:8px 0 32px 0;">������������������</h4>
- <nz-table #keyTable [nzDataSource]="_dataSet" [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>
+ <span>������������ {{sensorKey == 'e10'?'mg/m3':'ug/m3'}}</span>
<nz-table-sort (nzValueChange)="sort('avg',$event)"></nz-table-sort>
</th>
</tr>
--
Gitblit v1.8.0