From 7768c8192ec10e00685d7f897fad3856341532d8 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Tue, 23 Nov 2021 15:01:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=B6=88=E9=98=B2=E8=AE=BE?= =?UTF-8?q?=E6=96=BD=E6=9C=80=E5=86=85=E5=B1=82=E6=95=B0=E6=8D=AE=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-plan-online-five.component.html | 6 +++--- .../create-plan-online-five.component.ts | 4 ++-- src/app/ui/plan-template/Disaster.html | 2 +- src/app/ui/plan-template/plan-template.component.html | 6 +++--- src/app/ui/plan-template/plan-template.component.ts | 11 ++++++----- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 2387bf2..d34426d 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -1130,9 +1130,9 @@
- @@ -1149,7 +1149,7 @@ text-align: center;white-space:pre-wrap;width: 185px;"> {{itemthj.body}} - +
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 6fa5a75..e26f521 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -163,7 +163,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { ||this.unitData.buildingTypes[0].name=='商市场'||this.unitData.buildingTypes[0].name=='医院'||this.unitData.buildingTypes[0].name=='学校' ||this.unitData.buildingTypes[0].name=='宾馆'||this.unitData.buildingTypes[0].name=='娱乐场所'||this.unitData.buildingTypes[0].name=='餐饮业' ||this.unitData.buildingTypes[0].name=='影剧院'||this.unitData.buildingTypes[0].name=='展览建筑'||this.unitData.buildingTypes[0].name=='养老院' - ||this.unitData.buildingTypes[0].name=='会议中心')&&this.planLevel=='5'){ + ||this.unitData.buildingTypes[0].name=='会议中心'||this.unitData.buildingTypes[0].name=='储罐类')&&this.planLevel=='5'){ this.zaixianDr=true } //console.log('单位列表信息', this.unitData) @@ -1709,7 +1709,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { :(this.unitData.buildingTypes[0].name=='商市场'||this.unitData.buildingTypes[0].name=='医院'||this.unitData.buildingTypes[0].name=='学校' ||this.unitData.buildingTypes[0].name=='宾馆'||this.unitData.buildingTypes[0].name=='娱乐场所'||this.unitData.buildingTypes[0].name=='餐饮业' ||this.unitData.buildingTypes[0].name=='影剧院'||this.unitData.buildingTypes[0].name=='展览建筑'||this.unitData.buildingTypes[0].name=='养老院' - ||this.unitData.buildingTypes[0].name=='会议中心')?4:5 + ||this.unitData.buildingTypes[0].name=='会议中心')?4:this.unitData.buildingTypes[0].name=='储罐类'?'StorageTankFivePlan':'' let fileData={ type:this.unitData.buildingTypes[0].name=='高层建筑'?1:2, file:formData diff --git a/src/app/ui/plan-template/Disaster.html b/src/app/ui/plan-template/Disaster.html index a82bacd..ba05ce4 100644 --- a/src/app/ui/plan-template/Disaster.html +++ b/src/app/ui/plan-template/Disaster.html @@ -21,7 +21,7 @@ -
+
diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html index ee56759..8c64a86 100644 --- a/src/app/ui/plan-template/plan-template.component.html +++ b/src/app/ui/plan-template/plan-template.component.html @@ -200,7 +200,7 @@ - 删除 + 删除 @@ -274,9 +274,9 @@ *ngFor="let itemth of zdy.tableth;let tablethi=index;TrackBy:trackByFn">
- - +
diff --git a/src/app/ui/plan-template/plan-template.component.ts b/src/app/ui/plan-template/plan-template.component.ts index 395befc..783bbb0 100644 --- a/src/app/ui/plan-template/plan-template.component.ts +++ b/src/app/ui/plan-template/plan-template.component.ts @@ -558,10 +558,10 @@ export class PlanTemplateComponent implements OnInit { } //消防设施表格具体属性删除 - fileDel(i,f){ + fileDel(suri,i,f){ let isTrue = confirm('您确定要删除该条信息吗') if(isTrue){ - this.group[0].attribute[3].attinf[i].facilityItems[f].completed=false + this.group[0].attribute[suri].attinf[i].facilityItems[f].completed=false } } @@ -1565,9 +1565,10 @@ ngOnInit(): void{ } //获取弹窗信息 getattinf(){ - this.data.newleftTabledata=JSON.parse(JSON.stringify(this.data.newleftTabledata)) - this.data.newleftTabledata=JSON.parse(JSON.stringify(this.data.newleftTabledata)) + //this.data.newleftTabledata=JSON.parse(JSON.stringify(this.data.newleftTabledata)) + if(this.data.facilityItems==undefined){ + this.data.newleftTabledata=JSON.parse(JSON.stringify(this.data.newleftTabledata)) this.data.newleftTabledata[this.data.leftclicki].data.forEach(element => { if(element.groupName=='单位概况'&&element.attribute!=undefined){ element.attribute.forEach(value => { @@ -1651,7 +1652,7 @@ getattinf(){ } }); }else{ - this.facilityItems=this.data.facilityItems + this.facilityItems=JSON.parse(JSON.stringify(this.data.facilityItems)) console.log(this.facilityItems) /* this.facilityItems.forEach(element => { element.completed=false