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

fengxiang

2018-04-16 780f76a3e8dd68abe6b007006f85a76991ea2c54

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

@@ -5,23 +5,43 @@
         <div nz-col [nzSpan]="6" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label>&nbsp;&nbsp;项目</label>
                  <label>项目</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'请选择'" [nzMode]="'multiple'">
                     <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]="'请选择 项目'">
                                <ng-template #suffix>
                                    <i class="anticon anticon-down ant-cascader-picker-arrow "></i>
                                </ng-template>
                            </nz-input>
                            <ng-template #nzTemplate>
                                <div [ngStyle]="{'width': '240px', 'height': '240px', 'overflow-y' :'auto'}">
                                    <nz-tree [nzNodes]="sensorOptions" (nzActivate)="onTreeClickSelect($event)" (nzDeactivate)="onTreeClickSelect($event)" [nzCheckable]="true" (nzCheck)="onSensorSelect($event)"></nz-tree>
                                </div>
                            </ng-template>
                        </nz-popover>
               </div>
            </div>
         </div>
         <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>
                  <label nz-form-item-required>省市区</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" nzAllowClear [nzPlaceHolder]="'请输入'" [nzFilter]="false" [nzSize]="'large'"  
                     (nzSearchChange)="searchChange($event)" [nzNotFoundContent]="'无法找到'" (ngModelChange)="monitorPointChange($event)" nzShowSearch> 
                        <nz-cascader (nzLoad)="areaLazyLoad($event)" [nzPlaceHolder]="'请选择 省/市/区'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event)">
                        </nz-cascader>
               </div>
            </div>
         </div>
         <div nz-col [nzSpan]="6" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label>监测点</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'请选择 监测点'" [nzSize]="'large'"  
                     [nzNotFoundContent]="'无法找到'" (ngModelChange)="monitorPointChange($event)" nzShowSearch nzAllowClear> 
                     <nz-option *ngFor="let option of monitorPointOptions"  [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option> 
                  </nz-select>
               </div>
@@ -33,7 +53,7 @@
                  <label>设备</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.mac" name="mac" [nzSize]="'large'" nzAllowClear [nzPlaceHolder]="'请选择'" >
                  <nz-select [(ngModel)]="query.mac" name="mac" [nzSize]="'large'" [nzPlaceHolder]="'请选择 设备'" [nzNotFoundContent]="'无法找到'" nzShowSearch nzAllowClear>
                     <nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option.mac" ></nz-option>
                     </nz-select>
               </div>
@@ -45,7 +65,7 @@
         <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>
                  <label>类型</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
@@ -60,7 +80,7 @@
                  <label nz-form-item-required>时间从</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-datepicker style="width: 100%;" [(ngModel)]="query.time" name="time" [nzPlaceHolder]="'请选择'"  [nzSize]="'large'" [nzFormat]="timeType.format" 
                  <nz-datepicker style="width: 100%;" [(ngModel)]="query.time" name="time" [nzPlaceHolder]="'请选择 时间'"  [nzSize]="'large'" [nzFormat]="timeType.format" 
                     [nzMode]="timeType.value=='hour'||timeType.value=='day'?'day':'month'" [nzShowTime]="timeType.value=='hour'?true:false"></nz-datepicker>
               </div>
            </div>
@@ -68,10 +88,10 @@
         <div nz-col [nzSpan]="6" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label >&nbsp;&nbsp;&nbsp;&nbsp;到</label>
                  <label >时间至</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-datepicker style="width: 100%;" [(ngModel)]="query.timeb" name="timeb" [nzPlaceHolder]="'请选择'" [nzSize]="'large'" [nzFormat]="timeType.format" 
                  <nz-datepicker style="width: 100%;" [(ngModel)]="query.timeb" name="timeb" [nzPlaceHolder]="'请选择 时间'" [nzSize]="'large'" [nzFormat]="timeType.format" 
                     [nzMode]="timeType.value=='hour'||timeType.value=='day'?'day':'month'" [nzShowTime]="timeType.value=='hour'?true:false"></nz-datepicker>
               </div>
            </div>