[合并]合并代码

debug.log

@@ -2,3 +2,4 @@
 [1225/152100.333:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1226/082525.401:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0104/111348.201:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0104/133113.885:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

src/app/ui/collection-tools-examinee/collection-tools.component.ts

@@ -482,7 +482,7 @@ export class CollectionToolsExamineeComponent implements OnInit {
       arr.push(item.Id)
     })
     this.canvasData.hiddenBasicInfoFacilities = arr
-    this.canvas.loadExamineeData()
+    this.canvas.onExamineeClickFloor()
 
     this.basicAssetLibraries = []
     this.http.get('/api/AssetLibraries').subscribe(async(data:any) => {
@@ -902,24 +902,24 @@ export class CollectionToolsExamineeComponent implements OnInit {
           let allFireElements = JSON.parse(JSON.stringify(this.allFireElements))
 
           if(this.clickedNodeType == 0){
-            this.canvas.loadExaminerData()
+            this.canvas.onExaminerClickFloor()
             this.clickedNodeType = null
           }else{
-            this.canvas.loadExamineeData()
+            this.canvas.onExamineeClickFloor()
             this.clickedNodeType = null
           }
         
           return true 
         } else{
           if(key == this.Facilities.length - 1){
-            this.canvas.loadExaminerData()
+            this.canvas.onExaminerClickFloor()
             return false 
           }
         }
       })
 
     }else{
-      this.canvas.loadExamineeData()
+      this.canvas.onExamineeClickFloor()
     }
     for(let key in storeyData.data){ //筛选数据 
       storeyData.data[key].key = storeyData.data[key].Id

src/app/ui/collection-tools-read/collection-tools.component.ts

@@ -464,7 +464,7 @@ export class CollectionToolsReadComponent implements OnInit {
     this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
     this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
     this.canvasData.hiddenBasicInfoFacilities = iconVisibleArr
-    this.canvas.loadExamineeData()
+    this.canvas.onExamineeClickFloor()
 
   }
 
@@ -604,10 +604,10 @@ export class CollectionToolsReadComponent implements OnInit {
           }, 0);
 
           if(this.clickedNodeType == 0){
-            this.canvas.loadExaminerData()
+            this.canvas.onExaminerClickFloor()
             this.clickedNodeType = null
           }else{
-            this.canvas.loadExamineeData()
+            this.canvas.onExamineeClickFloor()
             this.clickedNodeType = null
           }
          
@@ -615,14 +615,14 @@ export class CollectionToolsReadComponent implements OnInit {
         } else{
           if(key == this.Facilities.length - 1){
             this.renderData = []
-            this.canvas.loadExaminerData()
+            this.canvas.onExaminerClickFloor()
             return false 
           }
         }
       })
 
     }else{
-      this.canvas.loadExamineeData()
+      this.canvas.onExamineeClickFloor()
     }
     for(let key in storeyData.data){ //筛选数据 
       storeyData.data[key].key = storeyData.data[key].Id

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

@@ -1269,10 +1269,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   }
 
   /**
-   * 加载考生数据
+   * 考生点击楼层
    */
-  public loadExamineeData() {
-    console.log('加载考生')
+  public onExamineeClickFloor() {
     // 创建背景图
     this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
     // 创建楼层图形
@@ -1290,10 +1289,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   }
 
   /**
-   * 加载考官数据
+   * 考官点击楼层
    */
-  public loadExaminerData() {
-    console.log('加载考官')
+  public onExaminerClickFloor() {
     // 创建背景图
     this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
     // 创建楼层图形