From fa669c21647e53946af0e9b768dcab65742eb039 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 27 Mar 2018 10:31:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/reports/query/query.component.html | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/reports/query/query.component.html b/src/app/routes/reports/query/query.component.html
index b9c3f1b..e449992 100644
--- a/src/app/routes/reports/query/query.component.html
+++ b/src/app/routes/reports/query/query.component.html
@@ -18,7 +18,10 @@
</nz-input>
<ng-template #nzTemplate>
<div [ngStyle]="{'width': '240px', 'height': '240px', 'overflow-y' :'auto'}">
- <nz-tree [nzNodes]="sensorOptions" [nzCheckable]="true" (nzCheck)="onSensorSelect($event)"></nz-tree>
+ <nz-tree [nzNodes]="sensorOptions"
+ (nzActivate)="onTreeClickSelect($event)"
+ (nzDeactivate)="onTreeClickSelect($event)"
+ [nzCheckable]="true" (nzCheck)="onSensorSelect($event)"></nz-tree>
</div>
</ng-template>
</nz-popover>
--
Gitblit v1.8.0