From b041b7d4c0e18ad14a33e34c0d224cddada45412 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 15 Jul 2021 16:17:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=86=85=E7=BD=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/plan-management/entry-plan-look/AddPlanone.html | 2 +- src/app/ui/collection-tools-plan/addPlaneFigure.html | 4 ++-- src/index.html | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html index c9100ab..1358ac6 100644 --- a/src/app/plan-management/entry-plan-look/AddPlanone.html +++ b/src/app/plan-management/entry-plan-look/AddPlanone.html @@ -62,7 +62,7 @@ (已上传)
- 在线编制 +
diff --git a/src/index.html b/src/index.html index df8d21a..88ef21b 100644 --- a/src/index.html +++ b/src/index.html @@ -23,10 +23,10 @@ - - - + + + From d2a3ae2018b4e1af38a485e5e2cb89545d3ca1fc Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Fri, 16 Jul 2021 15:57:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=81=AE=E7=BD=A9=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools-building/collection-tools.component.ts | 4 ++++ .../ui/collection-tools-plan/collection-tools.component.ts | 4 ++++ src/app/ui/collection-tools/collection-tools.component.ts | 4 ++++ 3 files changed, 12 insertions(+) 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 b2d6591..5dbaa03 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -1882,6 +1882,8 @@ export class CollectionToolsBuildingComponent implements OnInit { deletePlaneData(item) { const isDelete = confirm('您确定要删除吗'); if (isDelete) { + //打开遮罩层 + this.maskLayerService.sendMessage(true) if (this.checkedBuildingIndex == -1) { //总平面图 let isHave = this.canvasData.allDisposalNode.find(items => { return items.sitePlanId === item.id }) if (isHave == undefined) { @@ -1933,9 +1935,11 @@ export class CollectionToolsBuildingComponent implements OnInit { if (isCompany === -1) { this.http.post("/api/CompanyData", newData).subscribe(data => { }) this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 + this.maskLayerService.sendMessage(false) } else { this.http.post("/api/BuildingData", newData, { params: this.params }).subscribe(data => { }) this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据 + this.maskLayerService.sendMessage(false) } } 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 22d003d..c089a9c 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -1884,6 +1884,8 @@ export class CollectionToolsPlanComponent implements OnInit { deletePlaneData(item) { const isDelete = confirm('您确定要删除吗'); if (isDelete) { + //打开遮罩层 + this.maskLayerService.sendMessage(true) if (this.checkedBuildingIndex == -1) { //总平面图 let isHave = this.canvasData.allDisposalNode.find(items => { return items.sitePlanId === item.id }) if (isHave == undefined) { @@ -1935,9 +1937,11 @@ export class CollectionToolsPlanComponent implements OnInit { if (isCompany === -1) { this.http.post("/api/CompanyData", newData).subscribe(data => { }) this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 + this.maskLayerService.sendMessage(false) } else { this.http.post("/api/BuildingData", newData, { params: this.params }).subscribe(data => { }) this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据 + this.maskLayerService.sendMessage(false) } } diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 5cd37cb..6ff6466 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -1929,6 +1929,8 @@ export class CollectionToolsComponent implements OnInit { deletePlaneData(item) { const isDelete = confirm('您确定要删除吗'); if (isDelete) { + //打开遮罩层 + this.maskLayerService.sendMessage(true) if (this.checkedBuildingIndex == -1) { //总平面图 let isHave = this.canvasData.allDisposalNode.find(items => { return items.sitePlanId === item.id }) if (isHave == undefined) { @@ -1980,9 +1982,11 @@ export class CollectionToolsComponent implements OnInit { if (isCompany === -1) { this.http.post("/api/CompanyData", newData).subscribe(data => { }) this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 + this.maskLayerService.sendMessage(false) } else { this.http.post("/api/BuildingData", newData, { params: this.params }).subscribe(data => { }) this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据 + this.maskLayerService.sendMessage(false) } } From 4c5dec0356277a284a260bdd1d86700fe2daf90a Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Fri, 16 Jul 2021 16:28:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=89=8D=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=20=E5=B7=B2=E8=A2=AB=E5=88=A0=E9=99=A4=E6=A5=BC?= =?UTF-8?q?=E5=B1=82=E5=86=97=E4=BD=99=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.ts | 14 +++++++++++--- .../collection-tools.component.ts | 14 +++++++++++--- .../collection-tools/collection-tools.component.ts | 14 +++++++++++--- 3 files changed, 33 insertions(+), 9 deletions(-) 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 5dbaa03..bdd7651 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -894,15 +894,23 @@ export class CollectionToolsBuildingComponent implements OnInit { if (this.selectingSitePlan && this.selectingSitePlan.id) { //打开遮罩层 this.maskLayerService.sendMessage(true) + //遍历 建筑数据 删除多余数据 + let object = this.canvasData.originalcompanyBuildingData.data + let adjoinArr = [] //毗邻数组 + Object.keys(object).forEach(key=>{ + let isExist = this.sitePlanData.find(item=>{ return item.id === object[key].FloorId }) + if (isExist === undefined) { + console.log(object[key],'当前楼层已被删除') + delete object[key] + } + }) + //遍历 建筑数据 删除多余数据 this.saveNum = [] let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData)); SitePlanData.data = JSON.stringify(SitePlanData.data) let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData)); CompanyData.data = JSON.stringify(CompanyData.data) - let object = this.canvasData.originalcompanyBuildingData.data - let adjoinArr = [] //毗邻数组 - if (this.pattern) {//如果是基本信息编辑模式 for (const key in object) { if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻 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 c089a9c..f314119 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -804,15 +804,23 @@ export class CollectionToolsPlanComponent implements OnInit { if (this.selectingSitePlan && this.selectingSitePlan.id) { //打开遮罩层 this.maskLayerService.sendMessage(true) + //遍历 建筑数据 删除多余数据 + let object = this.canvasData.originalcompanyBuildingData.data + let adjoinArr = [] //毗邻数组 + Object.keys(object).forEach(key=>{ + let isExist = this.sitePlanData.find(item=>{ return item.id === object[key].FloorId }) + if (isExist === undefined) { + console.log(object[key],'当前楼层已被删除') + delete object[key] + } + }) + //遍历 建筑数据 删除多余数据 this.saveNum = [] let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData)); SitePlanData.data = JSON.stringify(SitePlanData.data) let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData)); CompanyData.data = JSON.stringify(CompanyData.data) - let object = this.canvasData.originalcompanyBuildingData.data - let adjoinArr = [] //毗邻数组 - if (this.pattern) {//如果是基本信息编辑模式 for (const key in object) { if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻 diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 6ff6466..15ac2a7 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -917,15 +917,23 @@ export class CollectionToolsComponent implements OnInit { this.canvasData.updateBuildingData() if (this.selectingSitePlan && this.selectingSitePlan.id) { + //遍历 建筑数据 删除多余数据 + let object = this.canvasData.originalcompanyBuildingData.data + let adjoinArr = [] //毗邻数组 + Object.keys(object).forEach(key=>{ + let isExist = this.sitePlanData.find(item=>{ return item.id === object[key].FloorId }) + if (isExist === undefined) { + console.log(object[key],'当前楼层已被删除') + delete object[key] + } + }) + //遍历 建筑数据 删除多余数据 this.saveNum = [] let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData)); SitePlanData.data = JSON.stringify(SitePlanData.data) let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData)); CompanyData.data = JSON.stringify(CompanyData.data) - let object = this.canvasData.originalcompanyBuildingData.data - let adjoinArr = [] //毗邻数组 - if (this.pattern) {//如果是基本信息编辑模式 this.maskLayerService.sendMessage(true) for (const key in object) { From 81347f8e99d83d5ac3aedc16e289cd9c62868886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Mon, 19 Jul 2021 10:43:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.5.2=20=20=20=E4=BF=AE=E6=AD=A3=20?= =?UTF-8?q?=E5=90=8D=E7=A7=B0/=E7=BC=96=E5=8F=B7=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/working-area/working-area.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index e784d80..694c53b 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -175,7 +175,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * 重大调整-主版本号增加 * 日期变更-日期版本号增加 */ - public VERSION = '1.5.1.20210715'; + public VERSION = '1.5.2.20210719'; /** * 数据初始化 */ @@ -614,6 +614,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } (axShape.assetData.PropertyInfos.find(i => i.PropertyName == "名称/编号")).PropertyValue = index; } + axShape.refresh(); this.emit('canvasDataChanged'); this.canvasData.isChange = true; this.updateCamera2D(); From f12a69444b240567fcd66c97679dd09eedb365eb Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 23 Jul 2021 13:43:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E6=95=B0=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-audit/wait-examineer/wait-examineer.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index c634c4a..24c09cb 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -109,7 +109,7 @@
- + @@ -219,7 +219,7 @@
- +