From 764c32e0c7eedfcdda4567d3e076e994a50502c1 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Thu, 25 Feb 2021 15:09:02 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=98=BE=E9=9A=90=E5=9B=BE=E4=BE=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools.component.html               | 11 ++++++++---
 .../collection-tools.component.ts                 |  6 +++++-
 .../collection-tools.component.html               | 15 +++++++--------
 .../collection-tools.component.ts                 |  6 +++++-
 .../collection-tools.component.html               |  3 ++-
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html
index 32b5a8e..d253c0f 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.html
+++ b/src/app/ui/collection-tools-building/collection-tools.component.html
@@ -12,6 +12,13 @@
       基本信息名称
       <mat-icon>visibility</mat-icon>
     </span>
+
+    <span class="marginLeftRight">
+      <mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
+    </span>
+    <span class="marginLeftRight">
+      <mat-checkbox color="primary" [(ngModel)]="isShowLegend" (change)='changeLegend($event)' [disabled]='this.canvasData.selectPanelPoint.BackgroundImageUrl'></mat-checkbox> 显示图例
+    </span>
   
     <button (click)="copyAsset()" class="copytobutn marginLeftRight" mat-button title="复制" style="margin:0 5px;" *ngIf="isEditPattern">
       复制<mat-icon>library_books</mat-icon>
@@ -19,9 +26,7 @@
     <button (click)="pasteAsset()" class="copytobutn marginLeftRight" mat-button title="粘贴" *ngIf="isEditPattern">
       粘贴<mat-icon>screen_share</mat-icon>
     </button>
-    <span class="marginLeftRight">
-      <mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
-    </span>
+
     <span title="适应缩放" class="zoom" (click)="adaptZoom()">
       <img src="/assets/images/适应缩放.png" alt="">
       适应缩放
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts
index 754ba6d..aeddad8 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-building/collection-tools.component.ts
@@ -830,8 +830,12 @@ export class CollectionToolsBuildingComponent implements OnInit {
     this.canvas.paste(companyId,buildingId,floorId)
     this.renovateTreeData(false)
   }
+
   isMultiSelect:boolean = false; // 多选/单选 切换
   changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) }
+  isShowLegend:boolean = true; //图例是否显示
+  changeLegend (e) { this.canvasData.selectPanelPoint.BackgroundImageUrl? null : this.canvas.setLegendVisible(this.isShowLegend) }
+
   basicInfo:boolean = true //基本信息名称显隐
   wantToWork:boolean = true //想定作业名称显隐
   //点击基本信息名称
@@ -1479,6 +1483,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
     isRefresh? await this.canvas.refresh() : null
     this.canvas.setNameVisible(this.basicInfo,0)
     this.canvas.setNameVisible(this.wantToWork,1)
+    this.canvas.setLegendVisible(this.isShowLegend) //图例显隐
     isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
     isRefresh? this.isShowProperty = true : null
     isRefresh? this.isShowAttribute = true : null
@@ -1508,7 +1513,6 @@ export class CollectionToolsBuildingComponent implements OnInit {
   //陈鹏飞↓↓↓
   //陈鹏飞↓↓↓
   params = {companyId: sessionStorage.getItem('companyId')}
-  // params = {companyId: this.route.snapshot.queryParams.id}
   allFireElements:any = []; //当前 单位/建筑 下的消防要素
 
   isShowAttribute:boolean = true; //属性栏 是否显示 默认数据
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html
index ec36c3d..0fdc889 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.html
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.html
@@ -8,21 +8,20 @@
       <mat-icon style="vertical-align: middle; color: #279FFF;">list</mat-icon>
     </button>
 
-    <!-- <span  [ngClass]="{'icongray': !basicInfo}" title="基本信息名称显示/隐藏" class="marginLeftRight" (click)="basicInfoClick()">
-      基本信息名称
-      <mat-icon>visibility</mat-icon>
-    </span> -->
+    <span class="marginLeftRight">
+      <mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
+    </span>
+    <span class="marginLeftRight">
+      <mat-checkbox color="primary" [(ngModel)]="isShowLegend" (change)='changeLegend($event)' [disabled]='this.canvasData.selectPanelPoint.BackgroundImageUrl'></mat-checkbox> 显示图例
+    </span>
   
     <button (click)="copyAsset()" class="copytobutn marginLeftRight" mat-button title="复制" style="margin:0 5px;" *ngIf="isEditPattern">
       复制<mat-icon>library_books</mat-icon>
     </button>
-
     <button (click)="pasteAsset()" class="copytobutn marginLeftRight" mat-button title="粘贴" *ngIf="isEditPattern">
       粘贴<mat-icon>screen_share</mat-icon>
     </button>
-    <span class="marginLeftRight">
-      <mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
-    </span>
+  
     <span title="适应缩放" class="zoom" (click)="adaptZoom()">
       <img src="/assets/images/适应缩放.png" alt="">
       适应缩放
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index 0e2ac4f..528ba81 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -833,8 +833,12 @@ export class CollectionToolsPlanComponent implements OnInit {
     this.canvas.paste(companyId,buildingId,floorId)
     // this.renovateTreeData(false)
   }
+
   isMultiSelect:boolean = false; // 多选/单选 切换
   changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) }
+  isShowLegend:boolean = true; //图例是否显示
+  changeLegend (e) { this.canvasData.selectPanelPoint.BackgroundImageUrl? null : this.canvas.setLegendVisible(this.isShowLegend) }
+
   basicInfo:boolean = true //基本信息名称显隐
   wantToWork:boolean = true //想定作业名称显隐
   //点击基本信息名称
@@ -1490,6 +1494,7 @@ export class CollectionToolsPlanComponent implements OnInit {
     isRefresh? await this.canvas.refresh() : null
     this.canvas.setNameVisible(this.basicInfo,0)
     this.canvas.setNameVisible(this.wantToWork,1)
+    this.canvas.setLegendVisible(this.isShowLegend) //图例显隐
     isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
     isRefresh? this.isShowProperty = true : null
     isRefresh? this.isShowAttribute = true : null
@@ -1518,7 +1523,6 @@ export class CollectionToolsPlanComponent implements OnInit {
   //陈鹏飞↓↓↓
   //陈鹏飞↓↓↓
   params = {companyId: sessionStorage.getItem('companyId')}
-  // params = {companyId: this.route.snapshot.queryParams.id}
   allFireElements:any = []; //当前 单位/建筑 下的消防要素
 
   isShowAttribute:boolean = true; //属性栏 是否显示 默认数据
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html
index 27b1d13..921ba69 100644
--- a/src/app/ui/collection-tools/collection-tools.component.html
+++ b/src/app/ui/collection-tools/collection-tools.component.html
@@ -7,6 +7,7 @@
     <button mat-button (click)="toggle2()">
       <mat-icon style="vertical-align: middle; color: #279FFF;">list</mat-icon>
     </button>
+
     <span  [ngClass]="{'icongray': !basicInfo}" *ngIf="pattern" title="基本信息名称显示/隐藏" class="marginLeftRight" (click)="basicInfoClick()">
       基本信息名称<mat-icon>visibility</mat-icon>
     </span>
@@ -20,10 +21,10 @@
     <span class="marginLeftRight">
       <mat-checkbox color="primary" [(ngModel)]="isShowLegend" (change)='changeLegend($event)' [disabled]='this.canvasData.selectPanelPoint.BackgroundImageUrl'></mat-checkbox> 显示图例
     </span>
+  
     <button (click)="copyAsset()" class="copytobutn marginLeftRight" mat-button title="复制" *ngIf="isEditPattern">
       复制<mat-icon>library_books</mat-icon>
     </button>
-
     <button (click)="pasteAsset()" class="copytobutn marginLeftRight" mat-button title="粘贴" *ngIf="isEditPattern">
       粘贴<mat-icon>screen_share</mat-icon>
     </button>