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

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

@@ -1268,7 +1268,7 @@ export class CollectionToolsComponent implements OnInit {
   }
 
   //获取 建筑 楼层数据
-  getBuildingStorey (e) {
+  async getBuildingStorey (e) {
     let params = {buildingAreaId: e.id}
     this.http.get(`/api/BuildingAreaData`,{params}).subscribe((data:any)=>{
       this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据

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

@@ -1599,7 +1599,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       this.backgroundImage.getChildByName(item).destroy();
     });
     // 创建楼层图形
-    this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
+    // this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data);
     // 创建楼层图形
     this.createFloorShape(this.canvasData.originaleveryStoreyData.data);
     // 创建处置预案图形