From a2bd66a59a51c84100474d1ce3eb79d7ed3b754e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 15:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/operation/device-status/device-status.component.html | 169 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 103 insertions(+), 66 deletions(-)
diff --git a/src/app/routes/operation/device-status/device-status.component.html b/src/app/routes/operation/device-status/device-status.component.html
index 18ebd9e..367d58a 100644
--- a/src/app/routes/operation/device-status/device-status.component.html
+++ b/src/app/routes/operation/device-status/device-status.component.html
@@ -1,72 +1,109 @@
<div class="content__title">
- <h1>
- ������������
- <small>������������������������������������</small>
- </h1>
+ <h1>
+ ������������
+ <small>������������������������������������</small>
+ </h1>
+</div>
+<nz-card [nzBordered]="false">
+ <nz-spin [nzSpinning]="false">
+ <nz-row nzGutter="8">
+ <div nz-col nzXs="24" nzSm="12" nzMd="8" class="mb-md">
+ <div nz-row nzType="flex" nzAlign="middle" class="bg-primary rounded-md">
+ <div nz-col nzSpan="24" class="p-md text-white" style="height: 90px;text-align: center;">
+ <div style="height: 40px;" class="h2 mt0">
+ 2598
+ </div>
+ <p class="text-nowrap mb0">������������</p>
+ </div>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" nzMd="8" class="mb-md">
+ <div nz-row nzType="flex" nzAlign="middle" class="bg-success rounded-md">
+ <div nz-col nzSpan="24" class="p-md text-white" style="height: 90px;text-align: center;">
+ <div style="height: 40px;" class="h2 mt0">
+ 2510
+ </div>
+ <p class="text-nowrap mb0">������������</p>
+ </div>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" nzMd="8" class="mb-md">
+ <div nz-row nzType="flex" nzAlign="middle" class="bg-orange rounded-md">
+ <div nz-col nzSpan="24" class="p-md text-white" style="height: 90px;text-align: center;">
+ <div style="height: 40px;" class="h2 mt0">
+ 88
+ </div>
+ <p class="text-nowrap mb0">������������</p>
+ </div>
+ </div>
+ </div>
+ </nz-row>
+ </nz-spin>
+</nz-card>
+<nz-card [nzBordered]="false">
+ <div nz-row class="mb-sm">
+ <div nz-col [nzSpan]="4">
+ <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
+ <i class="anticon anticon-plus"></i>
+ <span>������</span>
+ </button>
+ <ng-container *ngIf="selectedRows.length > 0">
+ <button nz-button [nzSize]="'large'" (click)="deleteSelected()">������������</button>
+ </ng-container>
+ </div>
+ <div nz-col [nzSpan]="7">
+ <span style="padding: 5px 10px;">
+ ������:
+ </span>
+ <nz-select style="width: 79%;" [(ngModel)]="queryMap.orgId" (ngModelChange)="setOrgId($event)" [nzPlaceHolder]="'������ ������(������������������)'"
+ nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="orgSelectChange($event)" [nzNotFoundContent]="'������������'">
+ <nz-option *ngFor="let option of orgOptions" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
+ </nz-option>
+ </nz-select>
+ </div>
+ <div nz-col [nzSpan]="7">
+ <span style="padding: 5px 10px;">
+ ���������:
+ </span>
+ <nz-select style="width: 75%;" [(ngModel)]="queryMap.mpointId" (ngModelChange)="setMpointId($event)" [nzPlaceHolder]="'������ ���������������(������������������)'"
+ nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'">
+ <nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
+ </nz-option>
+ </nz-select>
+ </div>
+ <div nz-col [nzSpan]="6">
+ <nz-input [ngStyle]="{'width': '240px','float':'right'}" [(ngModel)]="queryText" name="" [nzPlaceHolder]="'������������������������������mac'"
+ (keyup)="queryTextChanged($event)" (change)="queryTextChanged($event)"></nz-input>
+ </div>
</div>
- <nz-card [nzBordered]="false">
- <div nz-row class="mb-sm">
- <div nz-col [nzSpan]="4">
- <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
- <i class="anticon anticon-plus"></i><span>������</span>
- </button>
- <ng-container *ngIf="selectedRows.length > 0">
- <button nz-button [nzSize]="'large'" (click)="deleteSelected()">������������</button>
- </ng-container>
- </div>
- <div nz-col [nzSpan]="7">
- <span style="padding: 5px 10px;">
- ������:
- </span>
- <nz-select style="width: 79%;" [(ngModel)]="queryMap.orgId" (ngModelChange)="setOrgId($event)" [nzPlaceHolder]="'������ ������(������������������)'"
- nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="orgSelectChange($event)" [nzNotFoundContent]="'������������'" >
- <nz-option *ngFor="let option of orgOptions" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
- </nz-option>
- </nz-select>
- </div>
- <div nz-col [nzSpan]="7">
- <span style="padding: 5px 10px;">
- ���������:
- </span>
- <nz-select style="width: 75%;" [(ngModel)]="queryMap.mpointId" (ngModelChange)="setMpointId($event)" [nzPlaceHolder]="'������ ���������������(������������������)'"
- nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
- <nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
- </nz-option>
- </nz-select>
- </div>
- <div nz-col [nzSpan]="6">
- <nz-input [ngStyle]="{'width': '240px','float':'right'}" [(ngModel)]="queryText" name="" [nzPlaceHolder]="'������������������������������mac'"
- (keyup)="queryTextChanged($event)" (change)="queryTextChanged($event)" ></nz-input>
- </div>
- </div>
- <div class="mb-md">
- <nz-alert *ngIf="selectedRows.length > 0" [nzType]="'info'" [nzShowIcon]="true">
- <span alert-body>
- ���������<strong class="text-primary">{{selectedRows.length}}</strong>���
- </span>
- </nz-alert>
- </div>
- <simple-table #simpleTable [data]="listUrl" [extraParams]="extraParams" [columns]="columns" [showTotal]="true"
- [reqReName]="{pi: 'pageIndex',ps: 'pageSize'}" (checkboxChange)="checkboxChange($event)" [ps]="10" [resReName]="{list: 'data',total: 'total'}">
- <ng-template st-row="state-badge" let-item let-index="index">
+ <div class="mb-md">
+ <nz-alert *ngIf="selectedRows.length > 0" [nzType]="'info'" [nzShowIcon]="true">
+ <span alert-body>
+ ���������
+ <strong class="text-primary">{{selectedRows.length}}</strong>���
+ </span>
+ </nz-alert>
+ </div>
+ <simple-table #simpleTable [data]="listUrl" [extraParams]="extraParams" [columns]="columns" [showTotal]="true" [reqReName]="{pi: 'pageIndex',ps: 'pageSize'}"
+ (checkboxChange)="checkboxChange($event)" [ps]="10" [resReName]="{list: 'data',total: 'total'}">
+ <ng-template st-row="state-badge" let-item let-index="index">
<ng-container [ngSwitch]="item.state">
- <span *ngSwitchCase="'0'">
- <nz-badge [nzStatus]="'success'" [nzText]="'������'"></nz-badge>
- </span>
- <span *ngSwitchCase="'1'">
- <nz-badge [nzStatus]="'processing'" [nzText]="'������'"></nz-badge>
- </span>
- <span *ngSwitchCase="'2'">
- <nz-badge [nzStatus]="'warning'" [nzText]="'������'"></nz-badge>
- </span>
- <span *ngSwitchCase="'3'">
- <nz-badge [nzStatus]="'error'" [nzText]="'������'"></nz-badge>
- </span>
- <span *ngSwitchDefault>
- <nz-badge [nzStatus]="'default'" [nzText]="'������'"></nz-badge>
- </span>
+ <span *ngSwitchCase="'0'">
+ <nz-badge [nzStatus]="'success'" [nzText]="'������'"></nz-badge>
+ </span>
+ <span *ngSwitchCase="'1'">
+ <nz-badge [nzStatus]="'processing'" [nzText]="'������'"></nz-badge>
+ </span>
+ <span *ngSwitchCase="'2'">
+ <nz-badge [nzStatus]="'warning'" [nzText]="'������'"></nz-badge>
+ </span>
+ <span *ngSwitchCase="'3'">
+ <nz-badge [nzStatus]="'error'" [nzText]="'������'"></nz-badge>
+ </span>
+ <span *ngSwitchDefault>
+ <nz-badge [nzStatus]="'default'" [nzText]="'������'"></nz-badge>
+ </span>
</ng-container>
</ng-template>
</simple-table>
- </nz-card>
-
+</nz-card>
--
Gitblit v1.8.0