From 730819bb9c30bb02cfd1bcf8ec17d51ec26905f0 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 27 Jul 2023 09:59:34 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]PropertyValue=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 2 +- .../collection-tools.component.ts | 14 ++++++++++++++ .../collection-tools/collection-tools.component.ts | 11 +++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/proxy.config.json b/proxy.config.json index f8ce786..5f2b935 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://121.36.37.70:8207/", + "target": "http://183.194.244.232:8088/", "测试": "http://121.36.37.70:8207/", "生产": "http://183.194.244.232:8088/", "secure": false, 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 670217f..6e93e29 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -901,7 +901,21 @@ export class CollectionToolsComponent2 implements OnInit { let SitePlanData = JSON.parse( JSON.stringify(this.canvasData.originaleveryStoreyData) ); + + for (const key in SitePlanData.data) { + if (Object.prototype.hasOwnProperty.call(SitePlanData.data, key)) { + const element = SitePlanData.data[key]; + element.Width = Number(element.Width); + element.Height = Number(element.Height); + element.PropertyInfos.forEach((item) => { + item.PropertyType = Number(item.PropertyType); + item.PropertyValue = String(item.PropertyValue); + }); + } + } + SitePlanData.data = JSON.stringify(SitePlanData.data); + let CompanyData = JSON.parse( JSON.stringify(this.canvasData.originalcompanyBuildingData) ); diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index b487fdc..66f4b92 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -898,6 +898,17 @@ export class CollectionToolsComponent implements OnInit { let SitePlanData = JSON.parse( JSON.stringify(this.canvasData.originaleveryStoreyData) ); + for (const key in SitePlanData.data) { + if (Object.prototype.hasOwnProperty.call(SitePlanData.data, key)) { + const element = SitePlanData.data[key]; + element.Width = Number(element.Width); + element.Height = Number(element.Height); + element.PropertyInfos.forEach((item) => { + item.PropertyType = Number(item.PropertyType); + item.PropertyValue = String(item.PropertyValue); + }); + } + } SitePlanData.data = JSON.stringify(SitePlanData.data); let CompanyData = JSON.parse( JSON.stringify(this.canvasData.originalcompanyBuildingData)