Commit 19156f89 authored by wangqinghua's avatar wangqinghua

update

parent 539dd9ab
...@@ -34,31 +34,33 @@ ...@@ -34,31 +34,33 @@
</ng-container> </ng-container>
</nz-select> </nz-select>
</div> </div>
<div nz-col nzSpan="7"> <ng-container *ngIf="echartType == 'history'">
<nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()" <div nz-col nzSpan="7">
[nzButtonStyle]="'solid'"> <nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()"
<label nz-radio-button nzValue="1">今天</label> [nzButtonStyle]="'solid'">
<label nz-radio-button nzValue="2">昨天</label> <label nz-radio-button nzValue="1">今天</label>
<label nz-radio-button nzValue="3">三天</label> <label nz-radio-button nzValue="2">昨天</label>
<label nz-radio-button nzValue="4">一周</label> <label nz-radio-button nzValue="3">三天</label>
<label nz-radio-button nzValue="5">自定义</label> <label nz-radio-button nzValue="4">一周</label>
</nz-radio-group> <label nz-radio-button nzValue="5">自定义</label>
</div> </nz-radio-group>
<div nz-col nzSpan="8" > </div>
<ng-container *ngIf="timeType == '5'"> <div nz-col nzSpan="8" >
<nz-date-picker <ng-container *ngIf="timeType == '5'">
nzShowTime <nz-date-picker
[(ngModel)]="timeBegin" nzShowTime
nzPlaceHolder="开始时间" [(ngModel)]="timeBegin"
></nz-date-picker> nzPlaceHolder="开始时间"
<nz-date-picker ></nz-date-picker>
nzShowTime <nz-date-picker
nzFormat="yyyy-MM-dd HH:mm:ss" nzShowTime
[(ngModel)]="timeEnd" nzFormat="yyyy-MM-dd HH:mm:ss"
nzPlaceHolder="结束时间" [(ngModel)]="timeEnd"
></nz-date-picker> nzPlaceHolder="结束时间"
</ng-container> ></nz-date-picker>
</div> </ng-container>
</div>
</ng-container>
<div nz-col nzSpan="3" class="search-input text-right"> <div nz-col nzSpan="3" class="search-input text-right">
<button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button> <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
</div> </div>
...@@ -71,49 +73,52 @@ ...@@ -71,49 +73,52 @@
<div echarts [options]="chartOption"style="height: 400px;width: 100%"></div> <div echarts [options]="chartOption"style="height: 400px;width: 100%"></div>
</ng-container> </ng-container>
</nz-spin> </nz-spin>
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'"> <ng-container *ngIf="echartType == 'history'">
<nz-tab nzTitle="接收流量排行"> <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)"> <nz-tab nzTitle="接收流量排行">
<thead> <nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)">
<tr> <thead>
<th nzWidth="20%">监测点名称</th> <tr>
<th>最大值</th> <th nzWidth="20%">监测点名称</th>
<th>最小值</th> <th>最大值</th>
<th>平均值</th> <th>最小值</th>
</tr> <th>平均值</th>
</thead>
<tbody>
<ng-container *ngFor="let item of inList">
<tr class="cursor" (click)="getEcharts(item.itemid)">
<td>{{item.itemName}}</td>
<td>{{item.max | toUtil}}</td>
<td>{{item.min | toUtil}}</td>
<td>{{item.avg | toUtil}}</td>
</tr> </tr>
</ng-container> </thead>
</tbody> <tbody>
</nz-table> <ng-container *ngFor="let item of inList">
</nz-tab> <tr class="cursor" (click)="getEcharts(item.itemid)">
<nz-tab nzTitle="发送流量排行"> <td>{{item.itemName}}</td>
<nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum" [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)"> <td>{{item.max | toUtil}}</td>
<thead> <td>{{item.min | toUtil}}</td>
<tr> <td>{{item.avg | toUtil}}</td>
<th nzWidth="20%">监测点名称</th> </tr>
<th>最大值</th> </ng-container>
<th>最小值</th> </tbody>
<th>平均值</th> </nz-table>
</tr> </nz-tab>
</thead> <nz-tab nzTitle="发送流量排行">
<tbody> <nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum" [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">
<ng-container *ngFor="let data of outList"> <thead>
<tr class="cursor" (click)="getEcharts(data.itemid)"> <tr>
<td>{{data.itemName}}</td> <th nzWidth="20%">监测点名称</th>
<td>{{data.max | toUtil}}</td> <th>最大值</th>
<td>{{data.min | toUtil}}</td> <th>最小值</th>
<td>{{data.avg | toUtil}}</td> <th>平均值</th>
</tr> </tr>
</ng-container> </thead>
</tbody> <tbody>
</nz-table> <ng-container *ngFor="let data of outList">
</nz-tab> <tr class="cursor" (click)="getEcharts(data.itemid)">
</nz-tabset> <td>{{data.itemName}}</td>
<td>{{data.max | toUtil}}</td>
<td>{{data.min | toUtil}}</td>
<td>{{data.avg | toUtil}}</td>
</tr>
</ng-container>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
</ng-container>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment