[完善] 图例BUG修正, 存储companyId

src/app/key-unit/key-unit-management/key-unit-management.component.ts

@@ -478,6 +478,7 @@ export class KeyUnitManagementComponent implements OnInit {
         if(item.id == selectedunitArr[0]){
           let companyName = item.name
           sessionStorage.setItem("companyName",companyName)
+          sessionStorage.setItem("companyId",item.id)
         }
       });
       sessionStorage.setItem("editable","1")

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

@@ -1502,7 +1502,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
     // }
     for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到   其他   数组
       let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
-      if (!noMatch) {
+      if (!noMatch && storeyData.data[key].Id != "图例") {
         this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
       }
     }
@@ -1706,19 +1706,26 @@ export class CollectionToolsBuildingComponent implements OnInit {
   //新增平面图 楼层/区域
   foundPanel (e) {
     e.stopPropagation()
-    let data = {
+    if (this.beforeOneCheckedBuilding.id) {
-      isBuilding: this.checkedBuildingIndex==-1? false:true,
+      let data = {
-      Panel: this.beforeOneCheckedBuilding,
+        isBuilding: this.checkedBuildingIndex==-1? false:true,
-      order: this.sitePlanData.length? this.sitePlanData[this.sitePlanData.length-1].order+1:0,
+        Panel: this.beforeOneCheckedBuilding,
-    }
+        order: this.sitePlanData.length? this.sitePlanData[this.sitePlanData.length-1].order+1:0,
-    let dialogRef = this.dialog.open(leftFunctionalDomainBuildingComponent,{data});
-    dialogRef.afterClosed().subscribe(data=>{
-      if (data =='总平面图') {
-        this.renovateSitePlan()
-      } else if (data =='建筑') {
-        this.renovateBuilding()
       }
-    })
+      let dialogRef = this.dialog.open(leftFunctionalDomainBuildingComponent,{data});
+      dialogRef.afterClosed().subscribe(data=>{
+        if (data =='总平面图') {
+          this.renovateSitePlan()
+        } else if (data =='建筑') {
+          this.renovateBuilding()
+        }
+      })
+    } else {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('请选择建筑','确定',config);
+    }
   }
 
   //编辑平面图 楼层/区域

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

@@ -1513,7 +1513,7 @@ export class CollectionToolsPlanComponent implements OnInit {
     // }
     // for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到   其他   数组
     //   let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
-    //   if (!noMatch) {
+    //   if (!noMatch && storeyData.data[key].Id != "图例") {
     //     this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
     //   }
     // }