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 1dd7cf3..f34bc4d 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -125,7 +125,7 @@
- + @@ -235,7 +235,7 @@
- + 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/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts index 22d003d..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 == "毗邻") {//如果是相同楼层，则筛选出毗邻 @@ -1884,6 +1892,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 +1945,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..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) { @@ -1929,6 +1937,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 +1990,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) } } 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(); 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 @@ - - - + + +