报表 优化

xufenglei

2018-03-22 a439eed077c3a157ed3b9096cf8e793671fe8cdf

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

@@ -8,8 +8,8 @@
                  <label>&nbsp;&nbsp;&nbsp;项&nbsp;&nbsp;&nbsp;&nbsp;目</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'请选择'" nzAllowClear>
                     <nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey" ></nz-option>
                  <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
                     <nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option"></nz-option>
                     </nz-select>
               </div>
            </div>
@@ -26,7 +26,21 @@
               </div>
            </div>
         </div>
         <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length!=5">
         <div nz-col [nzSpan]="6" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label nz-form-item-required>图型</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.reportType" name="reportType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
                     <!-- <nz-option [nzLabel]="'柱状图'" [nzValue]="'bar'" selected></nz-option>
                     <nz-option [nzLabel]="'折线图'" [nzValue]="'line'" ></nz-option> -->
                     <nz-option *ngFor="let option of reportOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
                     </nz-select>
               </div>
            </div>
         </div>
         <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length < 4">
            <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>
@@ -57,7 +71,7 @@
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="item.mac" name="mac{{item.id}}" [nzSize]="'large'" nzAllowClear [nzPlaceHolder]="'请选择'" (ngModelChange)="deviceChange($event,i)">
                     <nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option.mac" ></nz-option>
                     <nz-option *ngFor="let option of item.deviceOptions" [nzLabel]="option.name" [nzValue]="option.mac" ></nz-option>
                     </nz-select>
               </div>
            </div>
@@ -68,11 +82,11 @@
                  <label nz-form-item-required>时间</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-datepicker style="width: 100%;" value="" [(ngModel)]="item.time" name="time{{item.id}}" id="{{item.time}}" [nzPlaceHolder]="'请选择'" [nzFormat]="time.format" [nzMode]="time.mode" [nzSize]="'large'" nzShowTime [nzDisabledDate]="_disabledDate"></nz-datepicker>
                  <nz-datepicker style="width: 100%;" [(ngModel)]="item.time" name="time{{item.id}}" [nzPlaceHolder]="'请选择'" [nzFormat]="time.format" [nzMode]="query.type=='hour'||query.type=='day'?'day':'month'" [nzSize]="'large'" [nzShowTime]="query.type=='hour'?true:false" [nzDisabledDate]="_disabledDate"></nz-datepicker>
               </div>
            </div>
         </div>
         <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length!=1">
         <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length > 1">
            <button nz-button type="button" [nzType]="'danger'" [nzSize]="'large'" (click)="items.splice(i, 1)" nzGhost>
               <i class="anticon anticon-minus-circle-o dynamic-delete-button"></i>
               <span>删除查询条目</span>