Merge branch 'master' of http://39.106.78.171:3000/13562321995/ShangHaiAcquisitionPlatform

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

@@ -686,15 +686,23 @@ export class CollectionToolsComponent2 implements OnInit {
     this.canvasData.updateBuildingData()
    
     if (this.selectingSitePlan && this.selectingSitePlan.id) {
+      //遍历 建筑数据 删除多余数据
+      let object = this.canvasData.originalcompanyBuildingData.data
+      let adjoinArr = [] //毗邻数组
+      Object.keys(object).forEach(key=>{
+        let isExist = this.sitePlanData.find(item=>{ return item.id === object[key].FloorId })
+        if (isExist === undefined) {
+          console.log(object[key],'当前楼层已被删除')
+          delete object[key]
+        }
+      })
+      //遍历 建筑数据 删除多余数据
       this.saveNum = []
       let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
       SitePlanData.data = JSON.stringify(SitePlanData.data)
       let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
       CompanyData.data = JSON.stringify(CompanyData.data)
-  
-      let object = this.canvasData.originaleveryStoreyData.data
-      let adjoinArr = [] //毗邻数组
-      
+
       for (const key in object) {
         if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻
           

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

@@ -687,14 +687,22 @@ export class CollectionToolsComponent implements OnInit {
     this.canvasData.updateBuildingData()
    
     if (this.selectingSitePlan && this.selectingSitePlan.id) {
+      //遍历 建筑数据 删除多余数据
+      let object = this.canvasData.originalcompanyBuildingData.data
+      let adjoinArr = [] //毗邻数组
+      Object.keys(object).forEach(key=>{
+        let isExist = this.sitePlanData.find(item=>{ return item.id === object[key].FloorId })
+        if (isExist === undefined) {
+          console.log(object[key],'当前楼层已被删除')
+          delete object[key]
+        }
+      })
+      //遍历 建筑数据 删除多余数据
       this.saveNum = []
       let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
       SitePlanData.data = JSON.stringify(SitePlanData.data)
       let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
       CompanyData.data = JSON.stringify(CompanyData.data)
-  
-      let object = this.canvasData.originaleveryStoreyData.data
-      let adjoinArr = [] //毗邻数组
       
       for (const key in object) {
         if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻

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

@@ -175,7 +175,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
    * 重大调整-主版本号增加
    * 日期变更-日期版本号增加
    */
-  public VERSION = '1.5.1.20210715';
+  public VERSION = '1.5.2.20210719';
   /**
    * 数据初始化
    */
@@ -614,6 +614,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
         }
         (axShape.assetData.PropertyInfos.find(i => i.PropertyName == "名称/编号")).PropertyValue = index;
       }
+      axShape.refresh();
       this.emit('canvasDataChanged');
       this.canvasData.isChange = true;
       this.updateCamera2D();