[新增]新增楼层颜色显示

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

@@ -20,6 +20,9 @@
       <!-- H5Canvas -->
       <app-working-area #canvas [init]='this'></app-working-area>
       <!-- H5Canvas -->
+
+
+      <!-- 拖拽窗口 -->
       <div class="centerBuildingDiv" style="user-select: none;" cdkDrag>
         <div class="centerTotal">
           <div class="centerTotalHeader overflowText">
@@ -27,7 +30,7 @@
             <label (click)='togglebeforeOneCheckedBuilding()'>{{beforeOneCheckedBuilding.name}}</label>
           </div>
           <div class="everyTotal overflowText" *ngFor="let item of sitePlanData;let key = index"
-            [ngClass]="{'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
+            [ngClass]="{'selectSitePlan': selectSitePlanIndex==key,'selectSitePlanColor':item.isLabel}" (click)='selectSitePlan(item,key)'>
             {{item.name}}
           </div>
         </div>
@@ -39,6 +42,9 @@
           </div>
         </div>
       </div>
+
+
+
       <div id="leftDiv" class='functionalDomainLeft publicCss scenarioAssignment' [ngClass]="{'togglePanel': toggleExpandPanel==true}" style="user-select: none;">
 
         <!-- 处置预案 -->
@@ -101,7 +107,7 @@
         </div>
         <!-- 素材库 -->
         <!-- 消防设施 -->
-        <div class="planarGraph">
+        <div class="planarGraph" style="display: none;">
           <div class="planarGraphHeader" (click)='togglePlanarGraph()'>
             <mat-icon *ngIf="togglePlane">keyboard_arrow_up</mat-icon>
             <mat-icon *ngIf="!togglePlane">keyboard_arrow_down</mat-icon>

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

@@ -463,6 +463,7 @@ export class CollectionToolsExamineeComponent implements OnInit {
       let questions = JSON.parse(this.planData.examDisposalNodesData) 
       this.handleHybridTree(questions,'题目')
       this.Facilities = JSON.parse(this.planData.examFacilityAssetsData) 
+      console.log('预案设定',this.Facilities)
     })
   }
 
@@ -677,19 +678,19 @@ export class CollectionToolsExamineeComponent implements OnInit {
         return true
       }else{//如果是想定作业编辑模式
         console.log(SitePlanData)
-        // const dialogRef = this.dialog.open(saveOneDialogExaminee, {
-        //   data: {
-        //         allDisposalNode: this.canvasData.allDisposalNode,
-        //         selectedBuildingData:this.beforeOneCheckedBuilding,
-        //         selectedSiteData:this.selectingSitePlan,
-        //         siteOrbuilding:this.checkedBuildingIndex,
-        //         disasterId: this.allFirePlan[0].id || ''
-        //         }
-        // });
+        const dialogRef = this.dialog.open(saveOneDialogExaminee, {
+          data: {
+                allDisposalNode: this.canvasData.allDisposalNode,
+                selectedBuildingData:this.beforeOneCheckedBuilding,
+                selectedSiteData:this.selectingSitePlan,
+                siteOrbuilding:this.checkedBuildingIndex,
+                disasterId: this.allFirePlan[0].id || ''
+                }
+        });
     
-        // dialogRef.afterClosed().subscribe(result => {
-        //   console.log('The dialog was closed');
-        // });
+        dialogRef.afterClosed().subscribe(result => {
+          console.log('The dialog was closed');
+        });
       }
 
     } else { //if
@@ -1006,7 +1007,16 @@ export class CollectionToolsExamineeComponent implements OnInit {
     let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
     let planData = this.getSitePlanCompanyData() //获取 单位 数据
     this.http.get('/api/SitePlans',{params:this.params}).subscribe(data=>{
+      
       this.sitePlanData = data
+      console.log('楼层数据',this.sitePlanData)
+      this.sitePlanData.forEach(item => {
+        this.Facilities.forEach(i =>{
+          if(item.id == i.key){
+            item.isLabel = true 
+          }
+        })
+      })
       this.selectingSitePlan = this.sitePlanData[0] || {}
       this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
       this.selectSitePlanIndex = 0
@@ -1024,7 +1034,9 @@ export class CollectionToolsExamineeComponent implements OnInit {
     let fireData = this.getFireElements(item.buildingTypes[0].id || '') //获取建筑下 消防要素
     let planData = this.getBuildingData(params) //获取 建筑 数据
     this.http.get('/api/BuildingAreas',{params}).subscribe(data=>{
+
       this.sitePlanData = data
+      console.log('楼层数据',this.sitePlanData)
       this.selectingSitePlan = this.sitePlanData[0] || {}
       this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
       this.selectSitePlanIndex = 0

src/app/ui/collection-tools-examinee/panel.scss

@@ -252,6 +252,9 @@
   color: #fff;
   background-color: #07CDCF;
 }
+.selectSitePlanColor {
+  color: #FF8678;
+}
 //选中素材库图片时
 .selectImg {
   color: #fff;