From 926097f9307e13aa224538dc263d78d84613e98e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 17:11:48 +0800
Subject: [PATCH] 企业数据 页面 响应
---
src/app/routes/reports/query2/query2.component.html | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/app/routes/reports/query2/query2.component.html b/src/app/routes/reports/query2/query2.component.html
index be20c17..f156dee 100644
--- a/src/app/routes/reports/query2/query2.component.html
+++ b/src/app/routes/reports/query2/query2.component.html
@@ -5,13 +5,13 @@
<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>
@@ -46,7 +46,7 @@
<nz-card [nzBordered]="false">
<form nz-form [nzLayout]="'inline'">
<div nz-row [nzGutter]="24">
- <div nz-col [nzSpan]="6" class="mb-md">
+ <div nz-col [nzXs]="24" [nzSm]="6" class="mb-md">
<div nz-form-item class="d-flex">
<div [ngStyle]="{'width': '100px'}" nz-form-label>
<label>������������</label>
@@ -72,7 +72,7 @@
</div>
</div>
</div>
- <div nz-col [nzSpan]="4" class="mb-md">
+ <div nz-col [nzXs]="24" [nzSm]="4" class="mb-md">
<div nz-form-item class="d-flex">
<div [ngStyle]="{'width': '128px'}" nz-form-label>
<label>������</label>
@@ -85,7 +85,7 @@
</div>
</div>
</div>
- <div nz-col [nzSpan]="7" class="mb-md">
+ <div nz-col [nzXs]="24" [nzSm]="7" class="mb-md">
<div nz-form-item class="d-flex">
<div [ngStyle]="{'width': '128px'}" nz-form-label>
<label>������������</label>
@@ -99,7 +99,7 @@
</div>
</div>
</div>
- <div nz-col [nzSpan]="5" class="mb-md">
+ <div nz-col [nzXs]="24" [nzSm]="5" class="mb-md">
<div nz-form-item class="d-flex">
<div nz-form-label>
<label>������:</label>
@@ -119,7 +119,7 @@
</ng-template>
</div>
</div>
- <div nz-col [nzSpan]="2" class="mb-md">
+ <div nz-col [nzXs]="24" [nzSm]="2" class="mb-md" style="text-align: right;">
<button nz-button [nzType]="'primary'" (click)="loadGrid()">
<i class="anticon anticon-search"></i>
<span>������</span>
--
Gitblit v1.8.0