|
|
|
@ -481,8 +481,8 @@ export class PlanTemplateComponent implements OnInit {
|
|
|
|
|
}else{ |
|
|
|
|
this.attPanle=true |
|
|
|
|
const dialogRef = this.dialog.open(addattinf, {//调用open方法打开对话框并且携带参数过去
|
|
|
|
|
width: '240px', |
|
|
|
|
height:'400px', |
|
|
|
|
width: '290px', |
|
|
|
|
height:'440px', |
|
|
|
|
disableClose:true, |
|
|
|
|
data:{newleftTabledata:this.newleftTabledata,surveyName:surveyName,leftclicki:this.leftclicki} |
|
|
|
|
}); |
|
|
|
@ -1589,12 +1589,15 @@ getattinf(){
|
|
|
|
|
categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId |
|
|
|
|
} |
|
|
|
|
this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{ |
|
|
|
|
this.addAttinfBuild=data[0].propertyInfos |
|
|
|
|
data.forEach(buildDate => { |
|
|
|
|
this.addAttinfBuild.push(...buildDate.propertyInfos) |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
this.addAttinfBuild.forEach(element => { |
|
|
|
|
element.completed=false |
|
|
|
|
element.olddata=element.propertyValue |
|
|
|
|
}); |
|
|
|
|
console.log(this.addAttinfBuild) |
|
|
|
|
//console.log(this.addAttinfBuild)
|
|
|
|
|
}) |
|
|
|
|
}else if(value.surveyName=='建筑信息'&&value.attinf!=undefined){ |
|
|
|
|
this.addAttinfBuild=value.attinf |
|
|
|
@ -1602,18 +1605,19 @@ getattinf(){
|
|
|
|
|
categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId |
|
|
|
|
} |
|
|
|
|
this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{ |
|
|
|
|
this.addAttinfBuild=data[0].propertyInfos |
|
|
|
|
data.forEach((buildDate,buildi,buildarr) => { |
|
|
|
|
this.addAttinfBuild.push(...buildarr[buildi].propertyInfos) |
|
|
|
|
}); |
|
|
|
|
this.addAttinfBuild.forEach((element,ei,earr) => { |
|
|
|
|
value.attinf.forEach((elattinf,fi,farr) => { |
|
|
|
|
if(earr[ei].propertyName==farr[fi].propertyName){ |
|
|
|
|
earr[ei].completed=farr[fi].completed |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
element.olddata=element.propertyValue |
|
|
|
|
}); |
|
|
|
|
console.log(this.addAttinfBuild) |
|
|
|
|
//console.log(this.addAttinfBuild)
|
|
|
|
|
}) |
|
|
|
|
}else if(value.surveyName=='消防设施'&&value.attinf==undefined){ |
|
|
|
|
let paramsdata:any ={ |
|
|
|
|