From 0deb134d787049b9a097542134116438cff505f2 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 8 Apr 2021 15:58:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=B3=A8=E9=87=8A=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=A5=BC=E5=B1=82=E5=9B=BE=E5=BD=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools.component.ts             | 27 ++++++++++---------
 .../working-area/working-area.component.ts    |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 3e91076..10b85d5 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -1250,12 +1250,12 @@ export class CollectionToolsComponent implements OnInit {
       this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
       this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null
       this.renovateTreeData()
-      // this.canvas.onExaminerClickFloor()
-      this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
-      this.canvas.createFloorShape(this.canvasData.originaleveryStoreyData.data);
-      this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data);
-      // 隐藏基本信息图形
-      this.canvas.setNameVisible(false, 0);
+      this.canvas.onExaminerClickFloor()
+      // this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
+      // this.canvas.createFloorShape(this.canvasData.originaleveryStoreyData.data);
+      // this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data);
+      // // 隐藏基本信息图形
+      // this.canvas.setNameVisible(false, 0);
     })
   }
 
@@ -1273,7 +1273,7 @@ export class CollectionToolsComponent implements OnInit {
   }
 
   //获取 建筑 楼层数据
-  getBuildingStorey (e) {
+  async getBuildingStorey (e) {
     let params = {buildingAreaId: e.id}
     this.http.get(`/api/BuildingAreaData`,{params}).subscribe((data:any)=>{
       this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
@@ -1281,12 +1281,13 @@ export class CollectionToolsComponent implements OnInit {
       this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
       this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null
       this.renovateTreeData()
-      // this.canvas.onExaminerClickFloor()
-      this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
-      this.canvas.createFloorShape(this.canvasData.originaleveryStoreyData.data);
-      this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data);
-      // 隐藏基本信息图形
-      this.canvas.setNameVisible(false, 0);
+      this.canvas.onExaminerClickFloor()
+      // this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
+      // await this.canvas.refreshBackgroundImage();
+      // this.canvas.createFloorShape(this.canvasData.originaleveryStoreyData.data);
+      // this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data);
+      // // 隐藏基本信息图形
+      // this.canvas.setNameVisible(false, 0);
     })
   }
 
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 3e4d492..66749de 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -1347,7 +1347,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       this.backgroundImage.getChildByName(item).destroy();
     })
     // 创建楼层图形
-    this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
+    // this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
     // 创建楼层图形
     this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
     // 创建处置预案图形