From fa669c21647e53946af0e9b768dcab65742eb039 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Tue, 27 Mar 2018 10:31:55 +0800 Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop --- src/app/routes/reports/demo/demo.component.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html index 2b7f51f..0d55022 100644 --- a/src/app/routes/reports/demo/demo.component.html +++ b/src/app/routes/reports/demo/demo.component.html @@ -38,7 +38,7 @@ </div> </div> </div> - <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length < 4"> + <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length < 2"> <button nz-button type="button" [nzType]="'primary'" [nzSize]="'large'" (click)="addItem()"> <!-- <i class="anticon anticon-plus"></i> --> <i class="anticon anticon-plus-circle-o"></i> @@ -96,7 +96,7 @@ <div nz-row [nzGutter]="24"> <div nz-col [nzSpan]="6" class="mb-md"> <button nz-button type="submit" [nzType]="'primary'" [nzSize]="'large'">������</button> - <button nz-button type="reset" [nzSize]="'large'" class="mx-sm">������</button> + <!-- <button nz-button type="reset" [nzSize]="'large'" class="mx-sm" (click)="load()">������</button> --> </div> </div> </form> -- Gitblit v1.8.0