From f6162fceb449982dd3cbbece9e92d413b72ea0ae Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Wed, 19 Aug 2020 14:07:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE=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 | 6 +++++- src/app/ui/collection-tools/collection-tools.component.scss | 2 +- src/app/ui/collection-tools/collection-tools.component.ts | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index 49ae59d..3d83db6 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -7,7 +7,11 @@ export class CanvasShareDataService { constructor() { } - selectStorey:any; //选择当前 楼层 数据 + isChange:boolean = false; //数据 是否改动 + + selectStorey:any = {area: '', details: ''}; //选择当前 楼层 数据 + selectTemplateData:any; //选择当前 模板数据 + originalcompanyBuildingData:any; // 单位/建筑 数据 originaleveryStoreyData:any; // 总平面图/楼层/区域 楼层数据 diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index 9694262..18cc8c9 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -93,7 +93,7 @@ transition: margin-left 0.5s; min-width: 150px; border: 1px solid #E6EAEE; - width: 13%; + width: 230px; left: 0; } .functionalDomainRight { diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 10bf519..f5a9eb4 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -690,6 +690,7 @@ export class CollectionToolsComponent implements OnInit { //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ allFireElements:any = []; //当前 单位/建筑 下的消防要素 + isShowAttribute:boolean = true; //属性栏 是否显示 默认数据 toggleExpandPanel:boolean = false; //可展开面板展开或关闭 togglePlane:boolean = true; //可展开面板平面图 显隐 @@ -764,6 +765,8 @@ export class CollectionToolsComponent implements OnInit { this.http.get(`/api/CompanyAccount/SitePlanData`,{params}).subscribe((data:any)=>{ this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据 this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {} + this.canvasData.isChange = false + this.isShowAttribute = true this.renovateTreeData() }) } @@ -782,6 +785,8 @@ export class CollectionToolsComponent implements OnInit { this.http.get(`/api/CompanyAccount/BuildingAreaData`,{params}).subscribe((data:any)=>{ this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据 this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {} + this.canvasData.isChange = false + this.isShowAttribute = true this.renovateTreeData() }) } @@ -1061,6 +1066,7 @@ export class CollectionToolsComponent implements OnInit { this.selectLibrary = item.name this.selectImage = items this.selectImageIndex = index + this.canvasData.selectTemplateData = items this.canvas.beginPaint(items) } From 7bfc632cc0c1b45bf0c5a9a2ccb3402b364ca120 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Wed, 19 Aug 2020 14:14:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8F=B3=E4=BE=A7=E5=B1=9E=E6=80=A7=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/collection-tools/collection-tools.component.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index d0c0502..77821a2 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -731,6 +731,9 @@ export class CollectionToolsComponent implements OnInit { //封装 刷新 tree 数据 renovateTreeData () { + this.canvasData.isChange = false //服务中 数据是否改动 改为false + this.isShowAttribute = true //属性栏展示 默认数据 + let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据 @@ -824,8 +827,6 @@ export class CollectionToolsComponent implements OnInit { this.http.get(`/api/CompanyAccount/SitePlanData`,{params}).subscribe((data:any)=>{ this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据 this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {} - this.canvasData.isChange = false - this.isShowAttribute = true this.renovateTreeData() }) } @@ -844,8 +845,6 @@ export class CollectionToolsComponent implements OnInit { this.http.get(`/api/CompanyAccount/BuildingAreaData`,{params}).subscribe((data:any)=>{ this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据 this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {} - this.canvasData.isChange = false - this.isShowAttribute = true this.renovateTreeData() }) }