新增加载考生数据

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

@@ -277,7 +277,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
         this.previewImage.position = this.backgroundImage.toLocal(this.mousePosition);
       }
 
-      if (this.backgroundImage !== null) {
+      if (this.circleShadow !== null && this.backgroundImage !== null) {
         this.circleShadow.position = this.backgroundImage.toLocal(this.mousePosition);
         this.refreshPreviewLineSegment(this.currentClickPoint.position, this.circleShadow.position);
       }
@@ -479,30 +479,51 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   //  * 刷新工作区
   //  */
   public async refresh() {
-    this.setPaintMode(PaintMode.endPaint);
-    this.resetCanvas();
-    this.destroyBackgroundImage();
-    if (!this.canvasData.selectStorey.imageUrl) {
+    this.loadExamineeData();
+    // this.setPaintMode(PaintMode.endPaint);
+    // this.resetCanvas();
+    // this.destroyBackgroundImage();
+    // if (!this.canvasData.selectStorey.imageUrl) {
       
-      return;
-    }
+    //   return;
+    // }
 
-    await this.createBackgroundImage(this.canvasData.selectStorey.imageUrl);
-    this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
-    if (this.canvasData.gameMode === GameMode.Assignment) {
-      this.createNodeShape(this.canvasData.selectPanelPoint.Data);
+    // await this.createBackgroundImage(this.canvasData.selectStorey.imageUrl);
+    // this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
+    // if (this.canvasData.gameMode === GameMode.Assignment) {
+    //   this.createNodeShape(this.canvasData.selectPanelPoint.Data);
+    // }
+  }
+    /**
+   * 加载考生数据
+   */
+  public loadExamineeData() {
+    // 等待背景图下载完成并自动设置背景图缩放比例
+    this.createBackground();
+    this.refreshBackgroundImage();
+    // 创建楼层数据图形(基本信息)
+    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) {
+          delete this.canvasData.originaleveryStoreyData.data[key1];
+        }
+      }
     }
-    // await this.createBackground(this.canvasData.selectStorey.imageUrl);
-
+    this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
+    // 创建楼层数据图形(考生信息)
+    this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
+    // 创建节点数据图形(处置节点)
+    this.createNodeShape(this.canvasData.selectPanelPoint.Data);
   }
   /**
    * 异步创建背景图
    */
-  public async createBackground(imageUrl:string) {
+  public createBackground() {
     if (this.backgroundImage !== null) {
-      this.destroyBackgroundImage();
+      this.backgroundImage.destroy();
+      this.backgroundImage = null;
     } 
-    await this.createBackgroundImage(imageUrl)
+    this.createBackgroundImage()
   }
   /**
    * 创建楼层图形
@@ -630,19 +651,16 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   /**
    * 创建背景图
    */
-  public async createBackgroundImage(imageUrl: string): Promise<void> {
-    const image = await PIXI.Texture.fromURL(imageUrl);
-    this.backgroundImage = new PIXI.Sprite(image);
+  public createBackgroundImage(){
+    this.backgroundImage = PIXI.Sprite.from('assets/images/noImg.png')
     this.backgroundImage.anchor.set(0.5);
     this.backgroundImage.x = this.app.view.width / 2;
     this.backgroundImage.y = this.app.view.height / 2;
     this.backgroundImage.interactive = true;
     this.backgroundImage.name = 'background';
     this.backgroundImage.angle = this.canvasData.selectStorey.imageAngle;
-    // const left = this.init.element.nativeElement.querySelector('.functionalDomainLeft').clientWidth;
-    // const right = this.init.element.nativeElement.querySelector('.functionalDomainRight').clientWidth;
-    const imageWidth = this.backgroundImage.texture.width;
-    const imageHeight = this.backgroundImage.texture.height;
+    const imageWidth = 665;
+    const imageHeight = 530;
     const appWidth = this.app.view.width - 470;
     const appHeight = this.app.view.height;
 
@@ -934,14 +952,23 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   /**
    * 刷新背景图
    */
-  public refreshBackgroundImage(): void {
+  public async refreshBackgroundImage(): Promise<void> {
     if (!this.canvasData.selectStorey.imageUrl) {
       this.backgroundImage.visible = false;
     } else {
-      this.backgroundImage.texture = PIXI.Texture.from(this.canvasData.selectStorey.imageUrl);
+      this.backgroundImage.texture = await PIXI.Texture.fromURL(this.canvasData.selectStorey.imageUrl);
+      const imageWidth = this.backgroundImage.texture.width;
+      const imageHeight = this.backgroundImage.texture.height;
+      const appWidth = this.app.view.width - 470;
+      const appHeight = this.app.view.height;
+
+      const wScale = appWidth / imageWidth;
+      const hScale = appHeight / imageHeight;
+
+      const scale = wScale < hScale? wScale: hScale;
+      this.backgroundImage.scale.set(scale);
       this.backgroundImage.angle = this.canvasData.selectStorey.imageAngle;
       this.backgroundImage.visible = true;
-      // this.refresh();
     }
   }
   /**