From 315cbba5413609f92e19b3b9616020cf347dd28a Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Fri, 29 Jan 2021 12:22:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=A4=9A=E9=80=89,=20?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=A4=84=E7=BD=AE=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E5=BA=95=E5=9B=BE=E8=A7=92=E5=BA=A6=20=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/canvas-share-data.service.ts | 1 - .../collection-tools.component.ts | 8 ++++---- .../collection-tools.component.ts | 8 ++++---- .../collection-tools/collection-tools.component.html | 2 +- .../ui/collection-tools/collection-tools.component.ts | 11 +++++++---- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index afffbeb..8e15703 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -20,7 +20,6 @@ export class CanvasShareDataService { isChange:boolean = false; // 数据 是否改动 selectTemplateData:any; // 选择当前 模板数据 - isMultiSelect:boolean = false; // 单选/多选 模板图标 // 总平面图/建筑 楼层 selectStorey: any = {area: '', details: ''}; // 选择当前 楼层 数据 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 ddc4db5..b7429e8 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -1806,14 +1806,14 @@ export class CollectionToolsBuildingComponent implements OnInit { this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{ let isSuccess = this.renovateSitePlan() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) }) } else { //楼层/区域 this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{ let isSuccess = this.renovateBuilding() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) }) } @@ -1957,7 +1957,7 @@ export class CollectionToolsBuildingComponent implements OnInit { this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{ let isSuccess = this.renovateSitePlan() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -1968,7 +1968,7 @@ export class CollectionToolsBuildingComponent implements OnInit { this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{ let isSuccess = this.renovateBuilding() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; 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 833bfd9..7c307bf 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -1816,14 +1816,14 @@ export class CollectionToolsPlanComponent implements OnInit { this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{ let isSuccess = this.renovateSitePlan() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) }) } else { //楼层/区域 this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{ let isSuccess = this.renovateBuilding() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) }) } @@ -1967,7 +1967,7 @@ export class CollectionToolsPlanComponent implements OnInit { this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{ let isSuccess = this.renovateSitePlan() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -1978,7 +1978,7 @@ export class CollectionToolsPlanComponent implements OnInit { this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{ let isSuccess = this.renovateBuilding() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 176ca4d..9b2328c 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -15,7 +15,7 @@ - 多选 + 多选 显示图例 diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 328b79e..fd7e1a4 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -1569,6 +1569,8 @@ export class CollectionToolsComponent implements OnInit { beforeOneCheckedBuildingIsShow:boolean = false; //想定作业下 建筑是否显示 togglebeforeOneCheckedBuilding () { this.beforeOneCheckedBuildingIsShow = !this.beforeOneCheckedBuildingIsShow } + 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) } @@ -1842,14 +1844,14 @@ export class CollectionToolsComponent implements OnInit { this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{ let isSuccess = this.renovateSitePlan() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) }) } else { //楼层/区域 this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{ let isSuccess = this.renovateBuilding() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) }) } @@ -1993,7 +1995,7 @@ export class CollectionToolsComponent implements OnInit { this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{ let isSuccess = this.renovateSitePlan() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -2004,7 +2006,7 @@ export class CollectionToolsComponent implements OnInit { this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{ let isSuccess = this.renovateBuilding() isSuccess.then(res=>{ - this.canvas.refreshBackgroundImage() + this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle) }) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -2399,6 +2401,7 @@ export class CollectionToolsComponent implements OnInit { //自定义数据节点 时 async customizeNodes() { + this.canvasData.selectPanelPoint.BackgroundImageAngle = 0 await this.canvas.loadNoRelevantInformationDisposalPlan(this.canvasData.selectPanelPoint) let other = { children: [],