Browse Source

[新增]共享数据增加当前楼层需要需要隐藏的图标集合

master
邵佳豪 4 years ago
parent
commit
4bc09be25b
  1. 3
      src/app/canvas-share-data.service.ts
  2. 9
      src/app/ui/collection-tools-examinee/collection-tools.component.ts

3
src/app/canvas-share-data.service.ts

@ -25,7 +25,8 @@ export class CanvasShareDataService {
examOriginaleveryStoreyData: any; // 考生答卷 总平面图/楼层/区域 楼层数据
hiddenBasicInfoFacilities: any; // 考生答卷 当前楼层需要隐藏的基本信息素材
// 总平面图/建筑 楼层
// 处置 节点

9
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 保存已展开节点

Loading…
Cancel
Save