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 a02421d..4642e56 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 @@ -679,17 +679,17 @@ border: 0; box-sizing: border-box; padding: 0 5px;"> {{ i.name }} - delete - + +
- delete - + + 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 4ace18d..90442c8 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 @@ -1799,7 +1799,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.fileData.forEach((value,index,array) => { if(value.groupName=='交通水源'||value.groupName=='重点图示'){ value.attribute.forEach(element => { - if(element.imgArr!=undefined){ + if(element.imgArr!=undefined&&element.imgArr.length>0){ element.imgArr[0]=element.imgArr[0].slice(25,element.imgArr[0].length) } diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 23d25ee..2727df6 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -614,7 +614,8 @@ export class EntryPlanLookComponent implements OnInit { :(this.unitdata.unittype=='商市场'||this.unitdata.unittype=='医院'||this.unitdata.unittype=='学校' ||this.unitdata.unittype=='宾馆'||this.unitdata.unittype=='娱乐场所'||this.unitdata.unittype=='餐饮业' ||this.unitdata.unittype=='影剧院'||this.unitdata.unittype=='展览建筑'||this.unitdata.unittype=='养老院' - ||this.unitdata.unittype=='会议中心')?4:this.unitdata.unittype=='储罐类'?'StorageTankFivePlan':this.unitdata.unittype=='化工生产'?'ChemicalProductionFivePlan':'' + ||this.unitdata.unittype=='会议中心')?4:this.unitdata.unittype=='储罐类'?'StorageTankFivePlan' + :this.unitdata.unittype=='化工生产'?'ChemicalProductionFivePlan':this.unitdata.unittype=='农村'?'CountrysideFivePlan':'' let blob=[] /* 调用下载接口获取文件流,并赋值给blob diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html index 9774d50..fba1820 100644 --- a/src/app/tabbar/tabbar.component.html +++ b/src/app/tabbar/tabbar.component.html @@ -214,15 +214,15 @@
- 提交审核 - 撤销审核 + 撤销审核 --> - ( + (审核通过) { + this.contentVerify = data + sessionStorage.setItem('contentVerify',JSON.stringify(data)) + },err=>{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open(err,'确定',config); + }) } - this.http.post(`/api/ContentVerifies`,body).subscribe(data=>{ - this.contentVerify = data - sessionStorage.setItem('contentVerify',JSON.stringify(data)) - },err=>{ + + } + //撤销单位审核 + cancelAudit(){ + let isTrue = confirm('您确定要撤销审核该条信息吗') + if(isTrue){ + this.http.delete(`/api/ContentVerifies/${this.contentVerify.id}`).subscribe(data=>{ + this.contentVerify = data + sessionStorage.setItem('contentVerify',JSON.stringify(data)) + }, + err=>{ const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 this.snackBar.open(err,'确定',config); - }) - } - //撤销单位审核 - cancelAudit(){ - this.http.delete(`/api/ContentVerifies/${this.contentVerify.id}`).subscribe(data=>{ - this.contentVerify = data - sessionStorage.setItem('contentVerify',JSON.stringify(data)) - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open(err,'确定',config); - }) + }) + } + } //初始化下载 downloadFile () {