diff --git a/src/app/ui/plan-template/plan-template.component.ts b/src/app/ui/plan-template/plan-template.component.ts index 1a94a53..19a83ea 100644 --- a/src/app/ui/plan-template/plan-template.component.ts +++ b/src/app/ui/plan-template/plan-template.component.ts @@ -1554,7 +1554,7 @@ export class addattinf{ {propertyName:'单位地址',completed:false,propertyType:0,value:'',olddata:''}, /* {propertyName:'单位照片',completed:false,propertyType:0,value:''} *///,default:'-',must:'是',danwei:'-' ] -addAttinfBuild +addAttinfBuild=[] addAttinfFile facilityItems ngOnInit(): void{ @@ -1563,6 +1563,8 @@ ngOnInit(): void{ } //获取弹窗信息 getattinf(){ + 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[this.data.leftclicki].data.forEach(element => { if(element.groupName=='单位概况'&&element.attribute!=undefined){ @@ -1585,6 +1587,7 @@ getattinf(){ }) } */ else if(value.surveyName=='建筑信息'&&value.attinf==undefined){ + this.addAttinfBuild=[] let paramsdata:any ={ categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId } @@ -1600,25 +1603,32 @@ getattinf(){ //console.log(this.addAttinfBuild) }) }else if(value.surveyName=='建筑信息'&&value.attinf!=undefined){ + this.addAttinfBuild=value.attinf - let paramsdata:any ={ - categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId - } - this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{ - data.forEach((buildDate,buildi,buildarr) => { - this.addAttinfBuild.push(...buildarr[buildi].propertyInfos) - }); - this.addAttinfBuild.forEach((element,ei,earr) => { + this.addAttinfBuild=JSON.parse(JSON.stringify(this.addAttinfBuild)) + value.attinf.forEach((elattinf,fi,farr) => { - if(earr[ei].propertyName==farr[fi].propertyName){ - earr[ei].completed=farr[fi].completed + this.addAttinfBuild.forEach((element,ei,earr) => { + if(farr[fi].propertyName==earr[ei].propertyName){ + if(farr[fi].completed==true&&earr[ei].completed==false){ + farr[fi].completed=earr[ei].completed + } + } }); element.olddata=element.propertyValue }); - //console.log(this.addAttinfBuild) - }) + console.log(this.addAttinfBuild) + /* let paramsdata:any ={ + categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId + } + this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{ + data.forEach((buildDate,buildi,buildarr) => { + this.addAttinfBuild.push(...buildarr[buildi].propertyInfos) + }); + + }) */ }else if(value.surveyName=='消防设施'&&value.attinf==undefined){ let paramsdata:any ={ categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId