Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-03-13 9c9b8250b973eea72f6970e1ceb46facca9f0a99

 src/app/routes/analysis/query/query.component.html

@@ -39,12 +39,15 @@
        </div>
        <div *ngIf="_timePeriodUnitValue!='YEAR'; else elseBlock" nz-col [nzSm]="8" class="header-info">
            <p class="text-grey-dark">横坐标时间区间</p>
            <nz-datepicker style="width: 42%;" [(ngModel)]="lineChartCriteria.timePeriod.startTime" [nzDisabledDate]="_disabledStartDate"
                nzShowTime="{{ !!timeType.timePickerOption?timeType.timePickerOption:false }}" [nzMode]="timeType.mode" [nzFormat]="timeType.dateFormat"
            <nz-datepicker style="width: 42%;" [ngModel]="lineChartCriteria.timePeriod.startTime" 
                (ngModelChange) ="_timeChange($event,'start')"
                [nzDisabledDate]="_disabledStartDate"
                [nzShowTime]="_startShowTime" [nzMode]="timeType.mode" [nzFormat]="timeType.dateFormat"
                [nzPlaceHolder]="'Start date'"></nz-datepicker>
            <span>-</span>
            <nz-datepicker style="width: 42%;" [nzDisabledDate]="_disabledEndDate" [(ngModel)]="lineChartCriteria.timePeriod.endTime"
                nzShowTime="{{ !!timeType.timePickerOption?timeType.timePickerOption:false }}" [nzMode]="timeType.mode" [nzFormat]="timeType.dateFormat"
            <nz-datepicker style="width: 42%;" [nzDisabledDate]="_disabledEndDate" [ngModel]="lineChartCriteria.timePeriod.endTime"
            (ngModelChange) ="_timeChange($event,'end')"
                 [nzShowTime]="_endShowTime" [nzMode]="timeType.mode" [nzFormat]="timeType.dateFormat"
                [nzPlaceHolder]="'End date'"></nz-datepicker>
        </div>
        <ng-template #elseBlock>
@@ -57,77 +60,97 @@
        </ng-template>
    </div>
</nz-card>
<form nz-form  [nzLayout]="'vertical'">
<nz-card [nzBordered]="true" title="数据取样">
     <form>
            <div nz-row [nzGutter]="16">
                    <div nz-col nzMd="6" nzSm="12" nzXs="24">
                            <div nz-form-item nz-row>
                                    <div nz-form-label nz-col><label>省市区</label></div>
                                    <div nz-form-control nz-col nzHasFeedback>
                                            <nz-cascader [class.class123]="true" (nzChange)="setAreaCodes($event)"  (nzLoad)="areaLazyLoad($event)"
                                            [nzPlaceHolder]="'选择 省/市/区'" 
                                            [nzAllowClear]="false"
                                            [nzChangeOnSelect] ="true"
                                            [(ngModel)]="_areas" name="_areas">
                                            </nz-cascader>
                                    </div>                                    
                            </div>                            

        <div nz-row [nzGutter]="16">
            <div nz-col nzMd="6" nzSm="12" nzXs="24">
                <div nz-form-item nz-row>
                    <div nz-form-label nz-col>
                        <label>省市区</label>
                    </div>
                    <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
                            <div nz-form-item nz-row>
                                    <div nz-form-label nz-col><label>监控点</label></div>
                                    <div nz-form-control nz-col nzHasFeedback>
                                            <nz-select 
                                              name="_monitorPoint"
                                              style="width: 100%;" (click)="monitorPointChange(null)" 
                                              [ngModel]="_monitorPoint"
                                              nzAllowClear
                                              (ngModelChange)="setMonitorPoint($event)" 
                                              [nzPlaceHolder]="'选择 监控点(输入名称搜索)'"
                                                 nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'无法找到'" >
                                              <nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option.id">
                                              </nz-option>
                                            </nz-select>
                                    </div>
                                    
                            </div>                            
                    <div nz-form-control nz-col >
                        <nz-cascader [class.class123]="true" (nzChange)="setAreaCodes($event)" (nzLoad)="areaLazyLoad($event)" [nzPlaceHolder]="'选择 省/市/区'"
                            [nzAllowClear]="false" [nzChangeOnSelect]="true" [(ngModel)]="_areas" name="_areas">
                        </nz-cascader>
                    </div>
                    <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
                            <div nz-form-item nz-row>
                                    <div nz-form-label nz-col><label>设备</label></div>
                                    <div nz-form-control nz-col nzHasFeedback>
                                          11111111111111111
                                    </div>
                                    
                            </div>                            
                    </div>
                </div>
            </div>
            <div style="margin-top: 20px;" nz-row [nzGutter]="16">
                    <div nz-col nzMd="6" nzSm="12" nzXs="24">
                            <div nz-form-item nz-row>
                                    <div nz-form-label nz-col><label>时间单位</label></div>
                                    <div  nz-form-control nz-col nzHasFeedback>
                                        222222222
                                    </div>
                                    
                            </div>                            
            <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
                <div nz-form-item nz-row>
                    <div nz-form-label nz-col>
                        <label>监控点</label>
                    </div>
                    <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
                            <div nz-form-item nz-row>
                                    <div nz-form-label nz-col><label>具体时间</label></div>
                                    <div nz-form-control nz-col nzHasFeedback>
                                        2222222222
                                    </div>                                    
                            </div>                            
                    <div nz-form-control nz-col>
                        <nz-select name="_monitorPoint" style="width: 100%;" [ngModel]="_monitorPoint" (ngModelChange)="setMonitorPoint($event)"
                            nzAllowClear [nzPlaceHolder]="'选择 监控点(输入名称搜索)'" nzShowSearch (nzSearchChange)="monitorPointChange($event)"
                            [nzNotFoundContent]="'无法找到'">
                            <nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option">
                            </nz-option>
                        </nz-select>
                    </div>
                    <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
                            <div nz-form-item nz-row>
                                    <div nz-form-label nz-col><label>设备</label></div>
                                    <div nz-form-control nz-col nzHasFeedback>
                                        2222222222
                                    </div>                                    
                            </div>                            
                    </div>

                </div>
            </div>
     </form>
            <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
                <div nz-form-item nz-row>
                    <div nz-form-label nz-col>
                        <label>设备 ( 先选择监控点 )</label>
                    </div>
                    <div nz-form-control nz-col>
                        <nz-select name="_device" style="width: 100%;" [ngModel]="_device" (ngModelChange)="setDevice($event)" nzAllowClear [nzPlaceHolder]="'选择 监控点(输入名称搜索)'"
                            nzShowSearch (nzSearchChange)="deviceChange($event)" [nzNotFoundContent]="'无法找到'">
                            <nz-option *ngFor="let option of devices" [nzLabel]="option.name" [nzValue]="option">
                            </nz-option>
                        </nz-select>
                    </div>
                </div>
            </div>
        </div>
        <div nz-row [nzGutter]="16">
            <div nz-col nzMd="6" nzSm="12" nzXs="24">
                <div nz-form-item nz-row>
                    <div nz-form-label nz-col>
                        <label>时间单位</label>
                    </div>
                    <div nz-form-control nz-col >
                        <nz-select name="_dataTimeUnits" style="width: 100%;" [ngModel]="_dataTimeUnits" (ngModelChange)="setDataTimeUnits($event)" [nzPlaceHolder]="'选择 时间单位'">
                            <nz-option *ngFor="let option of dataTimeUnitsList" [nzLabel]="option.label" [nzValue]="option">
                            </nz-option>
                        </nz-select>
                    </div>

                </div>
            </div>
            <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
                <div nz-form-item nz-row>
                    <div nz-form-label nz-col>
                        <label>具体时间</label>
                    </div>
                    <div nz-form-control nz-col >
                            <nz-select name="_actualTime" style="width: 100%;" [ngModel]="_actualTime" (ngModelChange)="setActualTime($event)"  [nzPlaceHolder]="'默认取 当前单位平均值'"
                            [nzDisabled]="actualTimeDisabled">
                                    <nz-option *ngFor="let option of actualTimes" [nzLabel]="option" [nzValue]="option">
                                    </nz-option>
                            </nz-select>
                    </div>
                </div>
            </div>
            <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
                <div nz-form-item nz-row>
                    <div nz-form-label nz-col>
                            <span>&nbsp;</span>
                    </div>
                    <div nz-form-control nz-col >                  
                        <button nz-button [nzType]="'primary'"
                        (click) = "search($event)" [disabled]="false" class="mr-sm">
                            <i class="anticon anticon-search"></i>
                            <span>查询</span>
                        </button>
                    </div>
                </div>
            </div>
        </div>      
</nz-card>
</form>
<div echarts [options]="chartOption" [loading]="chartLoading" class="line-chart" (chartInit)="onChartInit($event)"></div>