页面 优化

xufenglei

2018-08-03 46d4905467aeaf1979613a156753b6625608820b

页面 优化

 src/app/routes/pollution/management/management.component.html

@@ -1,45 +1,49 @@

<div nz-row [nzGutter]="24">
    <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
        <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)]="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>
            </ng-template>
            <ng-template #body>
                <h4 class="margin:8px 0 32px 0;">站点排序结果</h4>

                <nz-table #keyTable [nzAjaxData]="_dataSet" nzSize="small" [nzIsPagination]="false">
                    <thead nz-thead>
                    <tr>
                        <th nz-th><span>序号</span></th>
                        <th nz-th><span>站点名称</span></th>
                        <th nz-th class="text-right">
                            <span>警报次数</span>
                            <nz-table-sort (nzValueChange)="sort('sum',$event)"></nz-table-sort>
                        </th>
                    </tr>
                    </thead>
                    <tbody nz-tbody>
                    <tr nz-tbody-tr *ngFor="let i of keyTable.data;let j = index">
                        <td nz-td>{{j + 1}}</td>
                        <td nz-td><a>{{i.name}}</a></td>
                        <td nz-td class="text-right">{{i.sum}}</td>
                    </tr>
                    </tbody>
                </nz-table>
            </ng-template>
        </nz-card>
    </div>
<div class="content__title">
    <h1>警报类别占比</h1>
</div>

<nz-card [nzBordered]="false">
    <div nz-row [nzGutter]="24">
        <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
            <div class="sales-card-extra">
                <div class="sales-type-radio">
                    <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>
        </div>
    </div>
</nz-card>

<nz-card [nzBordered]="false">
    <div nz-row [nzGutter]="24">
        <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
            <h4 class="margin:8px 0 32px 0;">站点排序结果</h4>
            <nz-table #keyTable [nzAjaxData]="_dataSet" nzSize="small" [nzIsPagination]="false">
                <thead nz-thead>
                <tr>
                    <th nz-th><span>序号</span></th>
                    <th nz-th><span>站点名称</span></th>
                    <th nz-th class="text-right">
                        <span>警报次数</span>
                        <nz-table-sort (nzValueChange)="sort('sum',$event)"></nz-table-sort>
                    </th>
                </tr>
                </thead>
                <tbody nz-tbody>
                <tr nz-tbody-tr *ngFor="let i of keyTable.data;let j = index">
                    <td nz-td>{{j + 1}}</td>
                    <td nz-td><a>{{i.name}}</a></td>
                    <td nz-td class="text-right">{{i.sum}}</td>
                </tr>
                </tbody>
            </nz-table>
        </div>
    </div>
</nz-card>

 src/app/routes/reports/query2/query2.component.html

@@ -1,5 +1,57 @@
<div class="content__title">
    <h1>监控站点排名</h1>
</div>

<div nz-row [nzGutter]="24" style="padding-top: 25px">
<nz-card [nzBordered]="false">
    <div nz-row [nzGutter]="24">
        <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
            <div class="sales-card-extra">
                <div class="sales-card-extra">
                    <div class="sales-type-radio">
                        <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>
            </div>
        </div>
    </div>
</nz-card>

<nz-card [nzBordered]="false">
    <div nz-row [nzGutter]="24">
        <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
            <h4 class="margin:8px 0 32px 0;">站点排序结果</h4>
	
            <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>因子数值 {{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;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>
        </div>
    </div>
</nz-card>

<!-- <div nz-row [nzGutter]="24" style="padding-top: 25px">
    <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
        <nz-card [nzBordered]="false" nzTitle="监控站点排名" [nzBodyStyle]="{'padding.px': 24}" class="sales-card" style="min-height: 482px;">
            <ng-template #extra>
@@ -42,7 +94,7 @@
        </nz-card>
    </div>
</div>

 -->
<nz-card [nzBordered]="false">
    <form nz-form  [nzLayout]="'inline'">
        <div nz-row [nzGutter]="24">