From 714da1862f0b9a5e8b951abb8df3cdb9b8a55bc2 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 25 Feb 2021 14:50:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E9=87=87=E9=9B=86=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=A2=9E=E5=8A=A0=E5=A4=9A=E9=80=89=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/key-unit/basicinfo/basicinfo.component.ts             | 2 +-
 .../collection-tools-building/collection-tools.component.html | 4 +++-
 .../collection-tools-building/collection-tools.component.ts   | 3 ++-
 .../ui/collection-tools-plan/collection-tools.component.html  | 3 +++
 .../ui/collection-tools-plan/collection-tools.component.ts    | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index 1cb5e90..f390739 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -2152,7 +2152,7 @@ export class BasicinfoComponent implements OnInit {
             this.snackBar.open('请检查输入数据是否有误','确定',config);
           })
         }
-        if(item.buildtype == "地铁类"){
+        if(item.buildtype.indexOf('地铁') != -1){
           let newObj = _.cloneDeep(item)
           delete newObj.username
           delete newObj.name
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 2a4a2b1..32b5a8e 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.html
+++ b/src/app/ui/collection-tools-building/collection-tools.component.html
@@ -16,10 +16,12 @@
     <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-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts
index 071ddff..754ba6d 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-building/collection-tools.component.ts
@@ -830,7 +830,8 @@ export class CollectionToolsBuildingComponent implements OnInit {
     this.canvas.paste(companyId,buildingId,floorId)
     this.renovateTreeData(false)
   }
-
+  isMultiSelect:boolean = false; // 多选/单选 切换
+  changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) }
   basicInfo:boolean = true //基本信息名称显隐
   wantToWork: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 c2c2e9f..ec36c3d 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.html
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.html
@@ -20,6 +20,9 @@
     <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 1baff01..0e2ac4f 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -833,7 +833,8 @@ export class CollectionToolsPlanComponent implements OnInit {
     this.canvas.paste(companyId,buildingId,floorId)
     // this.renovateTreeData(false)
   }
-
+  isMultiSelect:boolean = false; // 多选/单选 切换
+  changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) }
   basicInfo:boolean = true //基本信息名称显隐
   wantToWork:boolean = true //想定作业名称显隐
   //点击基本信息名称