diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html index 32b5a8e..d253c0f 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.html +++ b/src/app/ui/collection-tools-building/collection-tools.component.html @@ -12,6 +12,13 @@ 基本信息名称 visibility + + + 多选 + + + 显示图例 + - - 多选 - + 适应缩放 diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts index 754ba6d..aeddad8 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -830,8 +830,12 @@ export class CollectionToolsBuildingComponent implements OnInit { this.canvas.paste(companyId,buildingId,floorId) this.renovateTreeData(false) } + 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) } + basicInfo:boolean = true //基本信息名称显隐 wantToWork:boolean = true //想定作业名称显隐 //点击基本信息名称 @@ -1479,6 +1483,7 @@ export class CollectionToolsBuildingComponent implements OnInit { isRefresh? await this.canvas.refresh() : null this.canvas.setNameVisible(this.basicInfo,0) this.canvas.setNameVisible(this.wantToWork,1) + this.canvas.setLegendVisible(this.isShowLegend) //图例显隐 isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null @@ -1508,7 +1513,6 @@ export class CollectionToolsBuildingComponent implements OnInit { //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ params = {companyId: sessionStorage.getItem('companyId')} - // params = {companyId: this.route.snapshot.queryParams.id} allFireElements:any = []; //当前 单位/建筑 下的消防要素 isShowAttribute:boolean = true; //属性栏 是否显示 默认数据 diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html index ec36c3d..0fdc889 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.html +++ b/src/app/ui/collection-tools-plan/collection-tools.component.html @@ -8,21 +8,20 @@ list - + + 多选 + + + 显示图例 + - - - 多选 - + 适应缩放 diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts index 0e2ac4f..528ba81 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -833,8 +833,12 @@ export class CollectionToolsPlanComponent implements OnInit { this.canvas.paste(companyId,buildingId,floorId) // this.renovateTreeData(false) } + 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) } + basicInfo:boolean = true //基本信息名称显隐 wantToWork:boolean = true //想定作业名称显隐 //点击基本信息名称 @@ -1490,6 +1494,7 @@ export class CollectionToolsPlanComponent implements OnInit { isRefresh? await this.canvas.refresh() : null this.canvas.setNameVisible(this.basicInfo,0) this.canvas.setNameVisible(this.wantToWork,1) + this.canvas.setLegendVisible(this.isShowLegend) //图例显隐 isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null @@ -1518,7 +1523,6 @@ export class CollectionToolsPlanComponent implements OnInit { //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ params = {companyId: sessionStorage.getItem('companyId')} - // params = {companyId: this.route.snapshot.queryParams.id} allFireElements:any = []; //当前 单位/建筑 下的消防要素 isShowAttribute:boolean = true; //属性栏 是否显示 默认数据 diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 27b1d13..921ba69 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -7,6 +7,7 @@ + 基本信息名称visibility @@ -20,10 +21,10 @@ 显示图例 + -