Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-08-03 e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef

 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>