Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/examSystem-Anxin

src/app/working-area/working-area.component.ts

@@ -488,7 +488,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   //  * 刷新工作区
   //  */
   public async refresh() {
-    this.loadExamineeData();
+    //this.loadExamineeData();
     // this.setPaintMode(PaintMode.endPaint);
     // this.resetCanvas();
     // this.destroyBackgroundImage();
@@ -506,11 +506,24 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     /**
    * 加载考生数据
    */
-  public loadExamineeData() {
+  public loadExamineeData(b: boolean = true) {
-    this.createBackground(this.canvasData.selectStorey.imageUrl,this.canvasData.selectStorey.imageAngle);// 创建背景图
+    this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
-    this.createFloorShape(this.canvasData.originaleveryStoreyData.data);// 基本信息
+    if (b) {
-    this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);// 考生信息
+      this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
-    this.createNodeShape(this.canvasData.selectPanelPoint.Data);// 处置节点
+      this.processinghiddenData();
+    }
+    this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
+    this.createNodeShape(this.canvasData.selectPanelPoint.Data);
+  }
+  /**
+   * 处理隐藏数据
+   */
+  public processinghiddenData() {
+    for (let key in this.canvasData.originaleveryStoreyData.data){
+      if (this.canvasData.hiddenBasicInfoFacilities.indexOf(key)) {
+        delete this.canvasData.originaleveryStoreyData.data[key];
+      }
+    }
   }
   /**
    * 创建背景图
@@ -579,6 +592,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     }
     this.emit('backgroundScale', this.backgroundImage.scale.x);
   }
+  
   /**
    *
    * @param id 图标ID