diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index aa7fc19..62c8cc0 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -86,6 +86,13 @@ export class CanvasShareDataService { * 更新建筑数据 */ public updateBuildingData() { + // 删除建筑数据中当前层数据 + Object.keys(this.originalcompanyBuildingData.data).forEach((key) => { + if (this.originalcompanyBuildingData.data[key].FloorId === this.selectStorey.id) { + delete this.originalcompanyBuildingData.data[key]; + } + }); + // 新增当前层数据到建筑数据 Object.keys(this.originaleveryStoreyData.data).forEach((key) => { this.originalcompanyBuildingData.data[key] = this.originaleveryStoreyData.data[key]; }); diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts index a567a28..90d0e05 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts @@ -805,7 +805,7 @@ export class GisLabelingComponent implements OnInit { //三维场景 threeeScene (e) { - window.open('http://121.37.20.190:8088/%5B%E7%BD%91%E9%A1%B5%E7%89%88%5D%E8%B4%B5%E6%B8%AF%E6%B2%B9%E5%BA%93%E4%B8%89%E7%BB%B4%E7%81%AD%E7%81%AB%E9%A2%84%E6%A1%88/') + window.open('http://39.106.78.171:8088/%E6%BC%94%E7%A4%BA%E6%A1%88%E4%BE%8B/--SHGJHYZX/') } //查看预案 diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index 20b2aca..60f0f30 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -30,8 +30,8 @@ export interface PeriodicElement { projectlevel: string; } const ELEMENT_DATA=[ - {unitname:"梧州市中恒制药有限公司",level:"Ⅰ级",addname:"张三",addtime:"2020-12-16",plantype:"洪涝",passstate:"审核通过",isopen:"未公开",projectlevel:"总队"}, - {unitname:"贵州油港",level:"Ⅱ级",addname:"韩信",addtime:"2020-12-16",plantype:"泥石流",passstate:"审核中",isopen:"未公开",projectlevel:"支队"} + {unitname:"抗洪抢险救援应急救援预案",level:"Ⅰ级",addname:"张三",addtime:"2020-12-16",plantype:"洪涝",passstate:"审核通过",isopen:"未公开",projectlevel:"总队"}, + {unitname:"泥石流应急救援预案",level:"Ⅱ级",addname:"韩信",addtime:"2020-12-16",plantype:"泥石流",passstate:"审核中",isopen:"未公开",projectlevel:"支队"} ] @Component({ diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts index a9c253b..131ec6c 100644 --- a/src/app/tabbar/tabbar.component.ts +++ b/src/app/tabbar/tabbar.component.ts @@ -77,10 +77,7 @@ export class TabbarComponent implements OnInit { USCI : this.route.snapshot.queryParams.usci } this.http.get('/api/Companies',{params:params}).subscribe((data:any) => { - this.companyIntegrityScore ? - this.companyIntegrityScore = data.items[0].companyIntegrityScore : - null - // console.log(data) + this.companyIntegrityScore = data.items[0].companyIntegrityScore }) } diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html index a9b6647..7a27875 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.html +++ b/src/app/ui/collection-tools-plan/collection-tools.component.html @@ -291,7 +291,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 9147fb5..2c930c5 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -726,6 +726,10 @@ export class CollectionToolsPlanComponent implements OnInit { //保存平面图 saveNum :any = [] saveSite(){ + + //更新用于统计的数据 + this.canvasData.updateBuildingData() + if (this.selectingSitePlan && this.selectingSitePlan.id) { this.saveNum = [] diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index bd60542..63297bf 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -291,7 +291,7 @@
-
+
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 7bf0762..1466b1d 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -754,6 +754,8 @@ export class CollectionToolsComponent implements OnInit { let adjoinArr = [] //毗邻数组 if(this.pattern){//如果是基本信息编辑模式 + //更新用于统计的数据 + this.canvasData.updateBuildingData() for (const key in object) { if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻 diff --git a/src/app/ui/collection-tools/save.ts b/src/app/ui/collection-tools/save.ts index 5dc3b6b..69d707c 100644 --- a/src/app/ui/collection-tools/save.ts +++ b/src/app/ui/collection-tools/save.ts @@ -102,7 +102,6 @@ export class saveOneDialog { selectedBuildingData = this.data.selectedBuildingData selectedSiteData = this.data.selectedSiteData onSubmit(value,type){ - // console.log(type) let name = this.selectedBuildingData.name + '-' + this.selectedSiteData.name //如果保存到已有节点 var postdata = { @@ -147,6 +146,8 @@ export class saveOneDialog { // 保存平面图数据到当前节点 let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint)) postdata.Data = JSON.stringify(postdata.Data) + postdata.DisposalNodeId = istrue.id + // console.log(111,istrue) this.http.post(`/api/DisposalNodeData`,postdata).subscribe(data => { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -168,14 +169,14 @@ export class saveOneDialog { resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点") }) }).then((values)=>{ - console.log(values) + // console.log(values) postdata.level = putdata.level + 1 new Promise((resolve,reject) => { this.http.post(`/api/DisposalNodes`,postdata).subscribe(data => { resolve(data) }) }).then((data:any)=>{ - console.log(7788,data) + // console.log(7788,data) let objData = { id: "", data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null, @@ -260,7 +261,7 @@ export class saveOneDialog { }) }).then((id) => { let dataNodeData - console.log("qnm",id) + // console.log("qnm",id) new Promise((resolve,reject) => { postdata.parentId = id postdata.level = dispositionNodeData.level + 1