From f56747bc3692cd591892f836eafa5a6b848e5c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com>
Date: Mon, 4 Jan 2021 17:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8A=A0=E8=BD=BD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../working-area/working-area.component.ts    | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index f915aca..8808298 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -529,17 +529,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     }
     this.emit('backgroundScale', this.backgroundImage.scale.x);
   }
-  
-  /**
-   *
-   * @param id 图标ID
-   * @param b 显示/隐藏
-   */
-  public setIconVisible(ids: string[], b: boolean) {
-    ids.forEach(item => {
-      this.backgroundImage.getChildByName(item).visible = b;
-    });
-  }
   /**
    * 创建确认绘制结束按钮
    */
@@ -1178,7 +1167,17 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     });
     this.emit('backgroundScale', this.backgroundImage.scale.x);
   }
-
+  ////////////////////////////////////////////////////////////////////////通过/////////////////////////////////////////////////////////////////////////////
+  /**
+   *
+   * @param id 图标ID
+   * @param b 显示/隐藏
+   */
+  public setIconVisible(ids: string[], b: boolean) {
+    ids.forEach(item => {
+      this.backgroundImage.getChildByName(item).visible = b;
+    });
+  }
   ////////////////////////////////////////////////////////////////////////采集平台加载逻辑///////////////////////////////////////////////////////////////////////
   public onBasicInformationClickFloor() {
     
@@ -1205,20 +1204,31 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
    * 考生点击楼层
    */
   public onExamineeClickFloor() {
+    // // 创建背景图
+    // this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
+    // // 创建楼层图形
+    // this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
+    // // 处理共享数据中考官隐藏的数据
+    // this.processinghiddenData();
+    // // 建楼层图形
+    // this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
+    // // 创建处置预案图形
+    // this.createNodeShape(this.canvasData.selectPanelPoint.Data);
+    // // 隐藏基本信息图形
+    // this.setNameVisible(false, 0);
+    // // 隐藏想定作业图形
+    // this.setNameVisible(false, 1);
+    // console.log("考生加载................................")
     // 创建背景图
     this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
     // 创建楼层图形
     this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
-    // 处理共享数据中考官隐藏的数据
-    this.processinghiddenData();
-    // 建楼层图形
+    // 创建楼层图形
     this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
     // 创建处置预案图形
     this.createNodeShape(this.canvasData.selectPanelPoint.Data);
-    // 隐藏基本信息图形
-    this.setNameVisible(false, 0);
-    // 隐藏想定作业图形
-    this.setNameVisible(false, 1);
+    // 隐藏图标
+    this.setIconVisible(this.canvasData.hiddenBasicInfoFacilities, false);
   }
 
   /**
@@ -1228,9 +1238,13 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     // 创建背景图
     this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
     // 创建楼层图形
+    this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
+    // 创建楼层图形
     this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
     // 创建处置预案图形
     this.createNodeShape(this.canvasData.selectPanelPoint.Data);
+    // 隐藏图标
+    this.setIconVisible(this.canvasData.hiddenBasicInfoFacilities, false);
   }
 }