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); } /** * 异步创建背景图