screen_demo2.git

			@@ -62,7 +62,6 @@
			</nz-card>
			<form nz-form [nzLayout]="'vertical'">
			<nz-card [nzBordered]="true" title="数据取样">

			<div nz-row [nzGutter]="16">
			<div nz-col nzMd="6" nzSm="12" nzXs="24">
			<div nz-form-item nz-row>
			@@ -83,7 +82,7 @@
			</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)"
			nzAllowClear [nzPlaceHolder]="'选择监控点(输入名称搜索)'" nzShowSearch (nzSearchChange)="monitorPointsChange($event)"
			[nzNotFoundContent]="'无法找到'">
			<nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option">
			</nz-option>
			@@ -99,7 +98,7 @@
			</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]="'无法找到'">
			nzShowSearch (nzSearchChange)="devicesChange($event)" [nzNotFoundContent]="'无法找到'">
			<nz-option *ngFor="let option of devices" [nzLabel]="option.name" [nzValue]="option">
			</nz-option>
			</nz-select>
			@@ -119,7 +118,6 @@
			</nz-option>
			</nz-select>
			</div>

			</div>
			</div>
			<div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
			@@ -153,4 +151,6 @@
			</div>
			</nz-card>
			</form>
			<div echarts [options]="chartOption" class="line-chart" (chartInit)="onChartInit($event)"></div>
			<nz-card [nzBordered]="true">
			<div echarts [options]="chartOption" [loading]="chartLoading" class="line-chart" (chartInit)="onChartInit($event)"></div>
			</nz-card>