From bcde2fd9b878e0149e6a57466e6b0f39f45a3499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com>
Date: Fri, 25 Dec 2020 14:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=80=83=E7=94=9F=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 | 20 ++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 2373856..7a4dbeb 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -498,10 +498,17 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* 加载考生数据
*/
public loadExamineeData() {
- // 等待背景图下载完成并自动设置背景图缩放比例
- this.createBackground();
- this.refreshBackgroundImage();
- // 创建楼层数据图形(基本信息)
+ this.createBackground();// 创建背景图
+ this.refreshBackgroundImage();// 刷新背景图
+ this.processinghiddenData();// 处理数据
+ this.createFloorShape(this.canvasData.originaleveryStoreyData.data);// 基本信息
+ this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);// 考生信息
+ this.createNodeShape(this.canvasData.selectPanelPoint.Data);// 处置节点
+ }
+ /**
+ * 处理隐藏数据
+ */
+ public processinghiddenData() {
for (let key1 in this.canvasData.originaleveryStoreyData.data){
for (let key2 in this.canvasData.hiddenBasicInfoFacilities){
if (this.canvasData.originaleveryStoreyData.data[key1].Id==this.canvasData.hiddenBasicInfoFacilities[key2].Id) {
@@ -509,11 +516,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
}
}
}
- this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
- // 创建楼层数据图形(考生信息)
- this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
- // 创建节点数据图形(处置节点)
- this.createNodeShape(this.canvasData.selectPanelPoint.Data);
}
/**
* 异步创建背景图