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

fengxiang

2018-05-28 f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e

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

@@ -4,17 +4,17 @@
      <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="5" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label>&nbsp;&nbsp;&nbsp;项&nbsp;&nbsp;&nbsp;目</label>
               <div nz-form-label class="label-width-70">
                  <label>项目</label>
               </div>
               <div nz-form-control class="flex-1">
                  <!-- <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKeys" name="sensorKeys" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
                     <nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey + '-' + option.name + '-' + option.unit"></nz-option>
                     </nz-select> -->
                        <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'hover'">
                            <nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorKeys" [nzReadonly]="true" [nzPlaceHolder]="'请选择 项目'">
                        <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'click'">
                            <nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorKeys" [nzReadonly]="true" [nzPlaceHolder]="'请选择 项目'" [nzSize]="'large'">
                                <ng-template #suffix>
                                    <i class="anticon anticon-down ant-cascader-picker-arrow "></i>
                                    <i class="anticon anticon-down ant-cascader-picker-arrow" style="right: 1px;"></i>
                                </ng-template>
                            </nz-input>
                            <ng-template #nzTemplate>
@@ -28,8 +28,20 @@
         </div>
         <div nz-col [nzSpan]="5" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label nz-form-item-required>类&nbsp;型</label>
               <div nz-form-label class="label-width-70">
                  <label>维度</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.dimension" name="dimension" [nzSize]="'large'" [nzPlaceHolder]="'请选择'" (ngModelChange)="dimensionChange($event)">
                     <nz-option *ngFor="let option of dimensionOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
                     </nz-select>
               </div>
            </div>
         </div>
         <div nz-col [nzSpan]="5" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label class="label-width-70">
                  <label>类型</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
@@ -40,8 +52,8 @@
         </div>
         <div nz-col [nzSpan]="5" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label nz-form-item-required>图型</label>
               <div nz-form-label class="label-width-70">
                  <label>图型</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.reportType" name="reportType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
@@ -50,7 +62,7 @@
               </div>
            </div>
         </div>
         <div nz-col [nzSpan]="5" class="mb-md" *ngIf="items.length < 2">
         <div nz-col [nzSpan]="4" 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>
@@ -63,33 +75,45 @@
      <div nz-row [nzGutter]="24" *ngFor="let item of items;let i = index">
         <div nz-col [nzSpan]="5" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
               <div nz-form-label class="label-width-70">
                  <label nz-form-item-required>省市区</label>
               </div>
               <div nz-form-control class="flex-1">
                        <nz-cascader (nzLoad)="areaLazyLoad($event,i)" [nzPlaceHolder]="'请选择 省/市/区'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event,i)">
                        <nz-cascader [nzSize]="'large'" (nzLoad)="areaLazyLoad($event,i)" [nzPlaceHolder]="'请选择 省/市/区'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event,i)">
                        </nz-cascader>
               </div>
            </div>
         </div>

         <div nz-col [nzSpan]="5" class="mb-md">
         <div nz-col [nzSpan]="5" class="mb-md" [ngStyle]="{'display':monitorPointShow ? 'block' : 'none' }">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label>监测点</label>
               <div nz-form-label class="label-width-70">
                  <label>监测站点</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" [nzPlaceHolder]="'请选择 监测点'" [nzSize]="'large'"  
                     [nzNotFoundContent]="'无法找到'" (ngModelChange)="monitorPointChange($event,i)" nzShowSearch nzAllowClear> 
                  <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" [nzPlaceHolder]="'请选择 监测站点'" [nzSize]="'large'"  
                     [nzNotFoundContent]="'无法找到'" (ngModelChange)="getDevices(i)" nzShowSearch nzAllowClear> 
                     <nz-option *ngFor="let option of item.monitorPointOptions"  [nzLabel]="option['name']" [nzValue]="option"> </nz-option> 
                  </nz-select>
               </div>
            </div>
         </div>
         <div nz-col [nzSpan]="5" class="mb-md" [ngStyle]="{'display':professionShow ? 'block' : 'none' }">
            <div nz-form-item class="d-flex">
               <div nz-form-label class="label-width-70">
                  <label >行业</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="item.profession" name="profession{{item.id}}" [nzSize]="'large'" [nzPlaceHolder]="'请选择 行业'" nzAllowClear (ngModelChange)="getDevices(i)" >
                     <nz-option *ngFor="let option of professionOptions" [nzLabel]="option.name" [nzValue]="option" ></nz-option>
                     </nz-select>
               </div>
            </div>
         </div>
         <div nz-col [nzSpan]="5" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label>&nbsp;&nbsp;设&nbsp;备</label>
               <div nz-form-label class="label-width-70">
                  <label>设备</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="item.device" name="mac{{item.id}}" [nzSize]="'large'" [nzPlaceHolder]="'请选择 设备'" [nzNotFoundContent]="'无法找到'" nzShowSearch nzAllowClear>
@@ -100,11 +124,11 @@
         </div>
         <div nz-col [nzSpan]="5" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label nz-form-item-required>时间</label>
               <div nz-form-label class="label-width-70">
                  <label>时间</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-datepicker style="width: 100%;" [(ngModel)]="item.time" name="time{{item.id}}" [nzPlaceHolder]="'请选择 时间'" [nzFormat]="timeType.format" [nzDisabledDate]="_disabledDate"
                  <nz-datepicker style="width: 100%;" [(ngModel)]="item.time" name="time{{item.id}}" [nzFormat]="timeType.format" [nzDisabledDate]="_disabledDate" [nzAllowClear]="false"
                     [nzMode]="timeType.value=='hour'||timeType.value=='day'?'day':'month'" [nzShowTime]="timeType.value=='hour'?true:false" [nzSize]="'large'"></nz-datepicker>
               </div>
            </div>