diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index e9ba1dc..c474787 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -7,21 +7,26 @@ - - - - + 基本信息名称 visibility + 多选 + + 显示图例 + + + + + 适应缩放 diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index 95d4404..7abcdc5 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -34,21 +34,23 @@ margin-right: 3px; } } + .marginLeftRight { + margin: 0 8px; + font-size: 16px; + user-select: none; + cursor: pointer; + .mat-icon { vertical-align: middle; font-size: 24px; } + } .nameShow{ cursor: pointer; user-select: none; } .copytobutn{ - width: 33px; - min-width: 33px; + width: 60px; + min-width: 60px; display: flex; justify-content: center; } - font-size: 18px; - mat-icon{ - font-size: 26px; - vertical-align: text-top; - } span{ height: 24px; line-height: 24px; diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index f7c7baf..4ba0bb6 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -444,6 +444,9 @@ export class CollectionToolsComponent implements OnInit { isMultiSelect:boolean = false; // 多选/单选 切换 changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) } + isShowLegend:boolean = true; //图例是否显示 + changeLegend (e) { this.canvasData.selectPanelPoint.BackgroundImageUrl? null : this.canvas.setLegendVisible(this.isShowLegend) } + isMultipleAsset:boolean = false//框选多个素材属性显隐 multipleAsset:any = { Width:null, @@ -1188,6 +1191,7 @@ export class CollectionToolsComponent implements OnInit { isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null this.canvas.setNameVisible(this.basicInfo,0) + this.canvas.setLegendVisible(this.isShowLegend) //图例显隐 let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据 @@ -1199,7 +1203,7 @@ export class CollectionToolsComponent 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]) } }