Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-29 87393cfec0e482f1d0c1d36196a4788b104df859

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

@@ -1,4 +1,4 @@
<pro-header [title]="'报表示例'"></pro-header>
<pro-header [title]="'报表展示'"></pro-header>
<nz-card [nzBordered]="false">
   <form nz-form  (ngSubmit)="reportQuery()" [nzLayout]="'inline'">
      <div nz-row [nzGutter]="24">
@@ -9,7 +9,7 @@
               </div>
               <div nz-form-control class="flex-1">
                  <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-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey + '-' + option.name + '-' + option.unit"></nz-option>
                     </nz-select>
               </div>
            </div>
@@ -20,8 +20,8 @@
                  <label nz-form-item-required>类型</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.type" name="type" [nzSize]="'large'" [nzPlaceHolder]="'请选择'" (ngModelChange)="typeChange($event)">
                     <nz-option *ngFor="let option of typeOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
                  <nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
                     <nz-option *ngFor="let option of typeOptions" [nzLabel]="option.label" [nzValue]="option" ></nz-option>
                     </nz-select>
               </div>
            </div>
@@ -33,14 +33,12 @@
               </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">
         <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>
@@ -59,7 +57,7 @@
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" nzAllowClear [nzPlaceHolder]="'请输入'" [nzFilter]="false" [nzSize]="'large'"  
                     (nzSearchChange)="searchChange($event,i)" [nzNotFoundContent]="'无法找到'" (ngModelChange)="monitorPointChange($event,i)" nzShowSearch> 
                     <nz-option *ngFor="let option of monitorPointOptions"  [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option> 
                     <nz-option *ngFor="let option of monitorPointOptions"  [nzLabel]="option['name']" [nzValue]="option"> </nz-option> 
                  </nz-select>
               </div>
            </div>
@@ -70,8 +68,8 @@
                  <label>&nbsp;&nbsp;设备</label>
               </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 item.deviceOptions" [nzLabel]="option.name" [nzValue]="option.mac" ></nz-option>
                  <nz-select [(ngModel)]="item.device" name="mac{{item.id}}" [nzSize]="'large'" nzAllowClear [nzPlaceHolder]="'请选择'">
                     <nz-option *ngFor="let option of item.deviceOptions" [nzLabel]="option.name" [nzValue]="option" ></nz-option>
                     </nz-select>
               </div>
            </div>
@@ -82,12 +80,13 @@
                  <label nz-form-item-required>时间</label>
               </div>
               <div nz-form-control class="flex-1">
                  <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>
                  <nz-datepicker style="width: 100%;" [(ngModel)]="item.time" name="time{{item.id}}" [nzPlaceHolder]="'请选择'" [nzFormat]="timeType.format" [nzDisabledDate]="_disabledDate"
                     [nzMode]="timeType.value=='hour'||timeType.value=='day'?'day':'month'" [nzShowTime]="timeType.value=='hour'?true:false" [nzSize]="'large'"></nz-datepicker>
               </div>
            </div>
         </div>
         <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>
            <button nz-button type="button" [nzType]="'danger'" [nzSize]="'large'" (click)="items.splice(i, 1)">
               <i class="anticon anticon-minus-circle-o dynamic-delete-button"></i>
               <span>删除查询条目</span>
            </button>
@@ -97,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>