From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/analysis/query/query.component.html | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/analysis/query/query.component.html b/src/app/routes/analysis/query/query.component.html
index 95712d0..fd684dd 100644
--- a/src/app/routes/analysis/query/query.component.html
+++ b/src/app/routes/analysis/query/query.component.html
@@ -10,14 +10,14 @@
<label>������������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-popover [nzTitle]="'���������'" [(nzVisible)]="visible" [nzPlacement]="'bottomLeft'" [nzTrigger]="'hover'">
+ <nz-popover [nzTitle]="'���������'" [nzPlacement]="'bottomLeft'" [nzTrigger]="'hover'">
<nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorNames" [nzReadonly]="true" [nzPlaceHolder]="'���������������������'">
<ng-template #suffix>
<i class="anticon anticon-plus ant-input-search-icon"></i>
</ng-template>
</nz-input>
<ng-template #nzTemplate>
- <div [ngStyle]="{'width': '200px', 'height': '300px', 'overflow-y' :'auto'}">
+ <div [ngStyle]="{'width': '200px', 'height': '240px', 'overflow-y' :'auto'}">
<nz-tree [nzNodes]="sensorOptions" [nzCheckable]="true" (nzCheck)="onSensorSelect($event)"></nz-tree>
</div>
</ng-template>
@@ -122,13 +122,20 @@
</form>
</nz-card>
<div nz-row [nzGutter]="16">
+ <div nz-col [nzMd]="24">
+ <nz-card>
+ <div echarts [options]="chartOption" [loading]="chartLoading" class="line-chart" (chartInit)="onChartInit($event)"></div>
+ </nz-card>
+ </div>
+</div>
+<div nz-row [nzGutter]="16">
<div nz-col [nzMd]="24">
<nz-card>
- <nz-table #nzTable [nzScroll]="{ x:5000,y:400 }" [nzDataSource]="grid.data" [nzIsPagination]="false" [nzLoading]="grid.loading">
+ <nz-table #nzTable [nzScroll]="{ x:5100,y:360 }" [nzDataSource]="grid.data" [nzIsPagination]="false" [nzLoading]="grid.loading">
<ng-template #nzFixedHeader>
<thead nz-thead>
<tr>
- <th nz-th [nzWidth]="'80px'" >
+ <th nz-th [nzWidth]="'120px'" [ngStyle]="{'position': 'relative','text-align': 'center', 'left':sensorNameScrollLeft}">
<span>������������</span>
</th>
<th nz-th [nzWidth]="'80px'" *ngFor="let col of grid.columns" [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
@@ -138,9 +145,10 @@
</thead>
</ng-template>
<tbody nz-tbody>
- <tr nz-tbody-tr *ngFor="let row of nzTable.data,index as i">
- <td nz-td>
- <span>{{ gridSensorNames[i] }}</span>
+ <tr nz-tbody-tr style="cursor:pointer;" *ngFor="let row of nzTable.data,index as i"
+ (click) = "switchSensor(i)">
+ <td nz-td class='sensor-name' [ngStyle]="{'background-color': '#FFF','position': 'relative','text-align': 'center', 'left':sensorNameScrollLeft}">
+ <span><span>{{ gridSensorNames[i] }}</span> <i *ngIf="chartSelectedIndex==i" class="anticon anticon-line-chart"></i></span>
</td>
<td nz-td *ngFor="let col of grid.columns,index as n" [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
<span [ngSwitch]="col.type">
--
Gitblit v1.8.0