From 4bc09be25b88f3b00be1a3907a9b39db95a84478 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 25 Dec 2020 13:10:42 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=85=B1=E4=BA=AB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D=E6=A5=BC=E5=B1=82?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=9C=80=E8=A6=81=E9=9A=90=E8=97=8F=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/canvas-share-data.service.ts                     | 3 ++-
 .../collection-tools.component.ts                        | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts
index 7b40b58..fa70878 100644
--- a/src/app/canvas-share-data.service.ts
+++ b/src/app/canvas-share-data.service.ts
@@ -25,7 +25,8 @@ export class CanvasShareDataService {
 
 
   examOriginaleveryStoreyData: any; // 考生答卷 总平面图/楼层/区域 楼层数据
-
+  
+  hiddenBasicInfoFacilities: any; // 考生答卷 当前楼层需要隐藏的基本信息素材
   // 总平面图/建筑 楼层
 
   // 处置 节点
diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.ts b/src/app/ui/collection-tools-examinee/collection-tools.component.ts
index 8acac5c..7bf0e5e 100644
--- a/src/app/ui/collection-tools-examinee/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-examinee/collection-tools.component.ts
@@ -469,6 +469,9 @@ export class CollectionToolsExamineeComponent implements OnInit {
   //获得所有素材库
   basicAssetLibraries:any = []//基本信息素材库
   getAllAssetLibraries(Facilitiesitem){
+    
+    this.canvasData.hiddenBasicInfoFacilities = Facilitiesitem.children
+    console.log(1314,this.canvasData.hiddenBasicInfoFacilities)
     this.basicAssetLibraries = []
     this.http.get('/api/AssetLibraries').subscribe(async(data:any) => {
       console.log('素材库',data)
@@ -941,7 +944,6 @@ export class CollectionToolsExamineeComponent implements OnInit {
     let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
     let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 
     let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据
-    console.log(566,storeyData.data)
     this.Facilities.forEach(item => {
       item.key == this.selectingSitePlan.id ? 
       this.getAllAssetLibraries(item) :
@@ -1085,7 +1087,6 @@ export class CollectionToolsExamineeComponent implements OnInit {
         planComponentId : this.route.snapshot.queryParams.planComponentId
       }
       this.http.get('/api/ExamSitePlanData',{params:examParams}).subscribe((data:any)=>{
-        console.log("cnm1",data)
         this.canvasData.examOriginaleveryStoreyData = data || {} // 楼层原数据
         this.canvasData.examOriginaleveryStoreyData.data? this.canvasData.examOriginaleveryStoreyData.data = JSON.parse(this.canvasData.examOriginaleveryStoreyData.data) : this.canvasData.examOriginaleveryStoreyData.data = {}
         this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0"
@@ -1108,7 +1109,6 @@ export class CollectionToolsExamineeComponent implements OnInit {
         planComponentId : this.route.snapshot.queryParams.planComponentId
       }
       this.http.get('/api/ExamBuildingAreaData',{params:examParams}).subscribe((data:any)=>{
-        console.log("cnm2",data)
         this.canvasData.examOriginaleveryStoreyData = data || {} // 楼层原数据
         this.canvasData.examOriginaleveryStoreyData.data? this.canvasData.examOriginaleveryStoreyData.data = JSON.parse(this.canvasData.examOriginaleveryStoreyData.data) : this.canvasData.examOriginaleveryStoreyData.data = {}
         this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0"
@@ -1498,7 +1498,7 @@ export class CollectionToolsExamineeComponent implements OnInit {
     let treeData = []
     let data =  JSON.parse(JSON.stringify( disposalNodedata || [] )) 
     data.forEach(element => {
-      // this.defaultExpandedKeys.push(element.id)
+
       element.title = element.name //name
       element.key = element.id //id
       element.children = [] //children
@@ -1518,7 +1518,6 @@ export class CollectionToolsExamineeComponent implements OnInit {
     })
     type == '题目' ? this.questionstreeData = [...treeData] : this.treeData = [...treeData]
     
-    // this.defaultExpandedKeys = [...this.defaultExpandedKeys]
   }
 
   //刷新 treeData 保存已展开节点