shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[新增]预案模板单位概况

tangshan
chenjingyu 4 years ago
parent
576566c4ea
commit
56218ffae9
5 changed files with 378 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 93
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  2. 159
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
  3. 53
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  4. 4
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  5. 113
      src/app/ui/plan-template/plan-template.component.ts

93
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
Unescape View File

@ -279,7 +279,7 @@
</div>
<!--树形图-->
<div style="height: 300px;width: 100%;" *ngIf="element.level==4">
<tree-diagram [data]="element.tableth" [(ngModel)]="element.tableth"></tree-diagram>
<tree-diagram [data]="element.tableth" ></tree-diagram>
</div>
</div>
</div>
@ -338,6 +338,8 @@
<div *ngIf="element.completed">
<div class="unitbodyHead">
<span>{{element.surveyName}}</span>
<!-- <img src="../../../assets/images/deletered.png" > -->
<img src="../../../assets/images/addbai.png" (click)='unitadd(element.surveyName,1)' *ngIf="element.surveyName=='功能分区'||element.surveyName=='重点部位'">
</div>
<div class="body">
<!-- 进攻通道 -->
@ -373,7 +375,94 @@
</div>
<!-- 单位和建筑信息 -->
<div class="building"></div>
<div class="building" *ngIf="element.surveyName=='单位基本信息'">
<div *ngFor="let info of element.attinf">
<div *ngIf="info.completed" class="onetext">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly>
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="info.value">
</div>
</div>
</div>
<div class="building" *ngIf="element.surveyName=='建筑信息'">
<div *ngFor="let info of element.attinf">
<div *ngIf="info.completed" class="onetext">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly>
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="info.propertyValue">
</div>
</div>
</div>
<!-- 消防设施 -->
<div class="file" *ngIf="element.surveyName=='消防设施'">
<div *ngFor="let attack of element.attinf;let attacki=index">
<div *ngIf="attack.completed">
<div class="fileHead">
<span>{{attack.name}}</span>
</div>
<div class="fileBody">
<div *ngFor="let info of attack.facilityItems">
<div *ngIf="info.completed" class="onetext">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.name" readonly>
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="info.value">
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 四周毗邻 -->
<div class="fouradj" *ngIf="element.surveyName=='四周毗邻'">
<div class="fourTexttwo" *ngFor="let info of element.attinf">
<input type="text" placeholder="请输入内容" style="width: 30%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.name" readonly>
<input type="text" placeholder="请输入内容" style="width: 70%;background-color: #FFFFFF;" [(ngModel)]="info.value">
</div>
</div>
<!-- 功能分区 -->
<div class="fouradj" *ngIf="element.surveyName=='功能分区'">
<div class="onetext" *ngFor="let info of element.attinf;let infoi=index">
<input type="text" placeholder="请输入内容" style="width: 30%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.name">
<input type="text" placeholder="请输入内容" style="width: 67%;background-color: #FFFFFF;" [(ngModel)]="info.value">
<img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,infoi)'>
</div>
</div>
<!-- 重点部位 -->
<div class="parts" *ngIf="element.surveyName=='重点部位'">
<div *ngFor="let parts of element.attinf;let infoi=index">
<div class="partsHead">
<input type="text" placeholder="请输入内容" [(ngModel)]="parts.heafName">
<img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,infoi)'>
</div>
<div class="partsBody">
<div class="duohang">
<div class="duohangHalf">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="parts.body[0].name">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[0].value">
</div>
<div class="duohangHalf">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;"[(ngModel)]="parts.body[1].name" >
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[1].value">
</div>
</div>
<div class="duohang">
<div class="duohangHalf">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="parts.body[2].name">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[2].value">
</div>
<div class="duohangHalf">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="parts.body[3].name">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[3].value">
</div>
</div>
<div class="danhang">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="parts.body[4].name">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[4].value">
</div>
</div>
</div>
</div>
</div>
</div>

159
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
Unescape View File

@ -375,6 +375,7 @@
display: flex;
}
}
}
}
}
@ -573,6 +574,164 @@
}
}
}
.building{
height: 100%;
width: 100%;
display: flex;
flex-direction: column;
}
.onetext{
height: 40px;
width: 100%;
border-bottom: 1px solid #F2F4F5;
span{
height: 40px;
width: 40%;
font-size: 16px;
background-color: #e8e9e9;
}
input{
height: 40px;
//width: 60%;
font-size: 16px;
border: none;
outline: none;
}
img{
height: 20px;
width: 20px;
position: relative;
top: 10px;
}
}
.file{
width: 100%;
height: 100%;
.fileHead{
height: 40px;
width: 100%;
background-color: #ffd91d;
text-align: center;
span {
font-size: 16px;
text-align: center;
height: 40px;
line-height: 40px;
color: #b99a00;
}
}
.fileBody{
height: 100%;
width: 100%;
display: flex;
flex-direction: column;
}
}
.fouradj{
width: 100%;
height: 100%;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
//flex-direction: column;
.adjtop,.adjbottom{
width: 100%;
height: 50%;
display: flex;
.adjbody{
height: 100%;
width: 50%;
input{
height: 40px;
//width: 60%;
font-size: 16px;
border: none;
outline: none;
}
}
}
.fourTexttwo{
height: 40px;
width: 50%;
border-bottom: 1px solid #F2F4F5;
input{
height: 40px;
//width: 60%;
font-size: 16px;
border: none;
outline: none;
}
}
}
.parts{
height: 100%;
width: 100%;
display: flex;
flex-direction: column;
.partsHead{
width: 100%;
height: 40px;
background-color: #ffd91d;
text-align: center;
input{
height: 40px;
font-size: 16px;
border: none;
outline: none;
background-color: #ffd91d;
color: #b99a00;
}
img {
cursor: pointer;
width: 20px;
height: 20px;
float: right;
margin-top: 10px;
margin-right: 10px;
}
}
.partsBody{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
.duohang{
width: 100%;
height: 40px;
display: flex;
border-bottom: 1px solid #FFFFFF;
.duohangHalf{
height: 40px;
width: 50%;
input{
height: 40px;
//width: 60%;
font-size: 16px;
border: none;
outline: none;
}
}
}
.danhang{
width: 100%;
height: 40px;
//border-top: 1px solid #FFFFFF;
input{
height: 40px;
//width: 60%;
font-size: 16px;
border: none;
outline: none;
}
}
}
}
}
}
.disposalPoint {

53
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-06-16 13:56:54
* @LastEditors: sueRimn
* @LastEditTime: 2021-06-23 16:26:37
* @LastEditTime: 2021-06-28 17:09:10
*/
import { HttpClient } from '@angular/common/http';
import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core';
@ -30,7 +30,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
console.log('级别', this.planLevel)
this.getTemplateData()
this.getUnitData()
this.getAllBuildings()
//this.getAllBuildings()
this.tree = {
json: this.treedate,
config: this.treeConfig
@ -65,6 +65,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
if (element.id == this.route.snapshot.queryParams.companyId) {
this.unitData = element
console.log('单位列表信息', this.unitData)
}
});
})
@ -79,7 +80,13 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.getSitePlan()
this.getRealPicture()
}else if(this.selectedItem == '单位概况'){
//this.getAllBuildings()
this.getAllBuildings()
this.planTemplateData[0].attribute[0].attinf[0].value=this.unitData.usci
this.planTemplateData[0].attribute[0].attinf[1].value=this.unitData.buildingTypes[0].name
this.planTemplateData[0].attribute[0].attinf[2].value=this.unitData.contacts
this.planTemplateData[0].attribute[0].attinf[3].value=this.unitData.phone
this.planTemplateData[0].attribute[0].attinf[4].value=this.unitData.organizationName
this.planTemplateData[0].attribute[0].attinf[5].value=this.unitData.address
}
}
@ -233,12 +240,15 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
})
})
this.allBuildings = data
this.planTemplateData[0].building=[]
if(this.planTemplateData[0].building==undefined){
this.planTemplateData[0].building=[]
}
for(var i=0;i<this.allBuildings.length;i++){
this.planTemplateData[0].building.push({name:this.allBuildings[i].name,body:this.planTemplateData[0].attribute})
}
this.buildingName=this.allBuildings[0].name
this.buildingName=this.planTemplateData[0].building[this.clicki].name
this.group=this.planTemplateData[0].building[this.clicki].body
//delete this.planTemplateData[0].attribute
console.log(this.planTemplateData)
})
}
@ -325,7 +335,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.buildingName=item.name
this.clicki=i
this.group=this.planTemplateData[0].building[this.clicki].body
//console.log(this.group)
}
//单位概况增加一行
unitadd(surveyName,attacki){
@ -346,21 +356,38 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
console.log(this.planTemplateData)
}
else if(surveyName=='功能分区'){
console.log(this.clicki)
this.planTemplateData[0].building[this.clicki].body[6].attinf.push({name:'',value:''})
}else if(surveyName=='重点部位'){
this.planTemplateData[0].building[this.clicki].body[5].attinf.push({heafName:'',body:[{name:'重点部位名称',value:''},{name:'重点部位所在位置',value:''},{name:'建筑结构',value:''},{name:'使用性质',value:''},{name:'主要危险性',value:''}]})
}
}
//单位概况删除一行
unitDel(surveyName,attacki){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
let isTrue = confirm('您确定要删除该条信息吗')
if(surveyName=='进攻通道'){
if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr != undefined) {
this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.splice(this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.length - 1, 1)
this.addNumber--
if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.length == 0) {
this.addNumber = -1
if(isTrue){
if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr != undefined) {
this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.splice(this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.length - 1, 1)
this.addNumber--
if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.length == 0) {
this.addNumber = -1
}
} else {
this.snackBar.open('请先增加一行!', '确定', config);
}
} else {
this.snackBar.open('请先增加一行!', '确定', config);
}
}else if(surveyName=='功能分区'){
if(isTrue){
this.planTemplateData[0].building[this.clicki].body[6].attinf.splice(attacki,1)
}
}else if(surveyName=='重点部位'){
if(isTrue){
this.planTemplateData[0].building[this.clicki].body[5].attinf.splice(attacki,1)
}
}
}

4
src/app/plan-management/entry-plan-look/entry-plan-look.component.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2021-06-21 15:14:48
* @LastEditTime: 2021-06-28 11:29:21
-->
<!-- <p>录入预案</p> -->
<div style="overflow: auto;height: 100%;">
@ -82,7 +82,7 @@
[ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1')}">编辑</span>
<span (click)="lookPlan(element)" *ngIf="element.planType == 2">查看</span>
<span (click)="readFile(element)"
[ngClass]="{'grey': element.planMode == '1' || element.planMode == '2' || element.planMode == '3'}">下载</span>
[ngClass]="{'grey': element.planMode == '2' || element.planMode == '3'}">下载</span>
<span (click)="deletePlan(element)" *ngIf="element.auditStatus==8">删除</span>
<span (click)="auditResult(element)">审批结果</span>
<span (click)="submitAudit(element)"

113
src/app/ui/plan-template/plan-template.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-05-31 10:40:01
* @LastEditors: sueRimn
* @LastEditTime: 2021-06-18 15:15:40
* @LastEditTime: 2021-06-29 16:51:56
*/
import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core';
@ -101,6 +101,9 @@ export class PlanTemplateComponent implements OnInit {
data:null
}
this.http.post("/api/PlanTemplate",savaData).subscribe((data:any)=>{
this.newleftTabledata[this.newleftTabledata.length-1].id=''
this.newleftTabledata[this.newleftTabledata.length-1].id=data.id
//console.log(data,this.newleftTabledata)
this.snackBar.open('创建成功!','确定',config);
})
}
@ -166,18 +169,18 @@ export class PlanTemplateComponent implements OnInit {
unitName
leftclicki=-1//点了第几个模板
planClick(item){
console.log(item)
this.Id=item.id
this.planCategory=item.planCategory
this.unitName=item.unitname
this.buildingTypeId=item.buildingTypeId
this.newleftTabledata.forEach((value,index,array)=>{
if(array[index].buildingTypeId==this.buildingTypeId){
this.group=array[index].data
if(array[index].buildingTypeId==this.buildingTypeId&&array[index].planCategory==this.planCategory){
this.leftclicki=index
this.group=array[this.leftclicki].data
}
})
//console.log(item,this.leftclicki)
}
//右侧新增分组点击事件
addGroupClick(){
@ -196,16 +199,20 @@ export class PlanTemplateComponent implements OnInit {
width: '240px',
height:'620px',
disableClose:true,
data:this.group==null?null:this.group.length==0?null:this.group
data:this.newleftTabledata[this.leftclicki].data==null?null:this.newleftTabledata[this.leftclicki].data==0?null:this.newleftTabledata[this.leftclicki].data
});
dialogRef.afterClosed().subscribe(result => {
console.log(result,this.newleftTabledata)
//console.log(result,this.newleftTabledata)
this.newleftTabledata.forEach((value,index,array)=>{
if(array[index].buildingTypeId==this.buildingTypeId){
if(array[index].buildingTypeId==this.buildingTypeId&&array[index].planCategory==this.planCategory){
if(result!=undefined){
result.forEach((valuer,i,rarr) => {
//添加分组名称
array[index].data=rarr
if(array[index].data==null){
array[index].data=result
}else{
array[index].data[i].completed=rarr[i].completed
}
});
}
@ -244,11 +251,20 @@ export class PlanTemplateComponent implements OnInit {
data:this.group
});
dialogRef.afterClosed().subscribe(result => {
//console.log(result)
console.log(result)
if(result!=undefined){
this.group.forEach((value,index,array)=>{
if(array[index].groupName=='单位概况'){
array[index].attribute=result
result.forEach((valuer,i,rarr) => {
//添加分组名称
if(array[index].attribute==null){
array[index].attribute=result
}else{
array[index].attribute[i].completed=rarr[i].completed
}
});
//array[index].attribute=result
}
})
}
@ -476,11 +492,13 @@ export class PlanTemplateComponent implements OnInit {
planCategory:Number(this.newleftTabledata[this.leftclicki].planCategory),
data:JSON.stringify(this.newleftTabledata[this.leftclicki].data)
}
console.log(`ary`, this.newleftTabledata, `key:`, this.leftclicki)
if(this.newleftTabledata[this.leftclicki].id==undefined){
this.http.post("/api/PlanTemplate",this.newleftTabledata[this.leftclicki]).subscribe((data:any)=>{
/* this.http.post("/api/PlanTemplate",this.newleftTabledata[this.leftclicki]).subscribe((data:any)=>{
this.snackBar.open('创建成功!','确定',config);
console.log(data)
})
}) */
this.snackBar.open('请先创建模板!','确定',config);
}
else{
this.http.put(`/api/PlanTemplate/${this.Id}`,body).subscribe((data:any)=>{
@ -641,14 +659,23 @@ export class addGroup{
{groupName:'单位概况',completed:false},{groupName:'灾情设定',completed:false},{groupName:'力量调集',completed:false},
{groupName:'组织指挥',completed:false},{groupName:'作战行动',completed:false},{groupName:'社会联动',completed:false},
{groupName:'勤务保障',completed:false},{groupName:'特别警示',completed:false},{groupName:'辅助决策',completed:false},
{groupName:'交通水源',completed:false},{groupName:'重点图示',completed:false},{groupName:'特别警示',completed:false},
{groupName:'交通水源',completed:false},{groupName:'重点图示',completed:false},{groupName:'处置要点',completed:false},
{groupName:'预案附件',completed:false}
]
groupName=[]
ngOnInit(): void{
console.log(this.data)
if(this.data!=null){
this.addgtoup=this.data
//this.addgtoup=this.data
this.data.forEach((datavalue,index,dataarr) => {
this.addgtoup.forEach((value,i,arr)=>{
if(dataarr[index].groupName==arr[i].groupName){
if(dataarr[index].completed==true&&arr[i].completed==false){
arr[i].completed= true
}
}
})
});
}
}
@ -702,15 +729,27 @@ export class addGroup{
export class adddwsurvey{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<adddwsurvey>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
addwsurvey=[
{surveyName:'单位基本信息',completed:false},{surveyName:'建筑信息',completed:false},{surveyName:'四周毗邻',completed:false},
{surveyName:'消防设施',completed:false},{surveyName:'进攻通道',completed:false},{surveyName:'重点部位',completed:false},
{surveyName:'功能分区',completed:false},{surveyName:'行车路线',completed:false},{surveyName:'千米水源',completed:false},{surveyName:'实景图',completed:false}
{surveyName:'单位基本信息',completed:false},{surveyName:'建筑信息',completed:false},
{surveyName:'四周毗邻',completed:false,attinf:[{name:'东',value:''},{name:'西',value:''},{name:'南',value:''},{name:'北',value:''}]},
{surveyName:'消防设施',completed:false},{surveyName:'进攻通道',completed:false},
{surveyName:'重点部位',completed:false,attinf:[{heafName:'',body:[{name:'重点部位名称',value:''},{name:'重点部位所在位置',value:''},{name:'建筑结构',value:''},{name:'使用性质',value:''},{name:'主要危险性',value:''}]}]},
{surveyName:'功能分区',completed:false,attinf:[{name:'',value:''}]},{surveyName:'行车路线',completed:false},{surveyName:'千米水源',completed:false},
{surveyName:'实景图',completed:false}
]
ngOnInit(): void{
console.log(this.data)
this.data.forEach(element => {
if(element.groupName=='单位概况'&&element.attribute!=undefined){
this.addwsurvey=element.attribute
//this.addwsurvey=element.attribute
element.attribute.forEach((datavalue,index,dataarr) => {
this.addwsurvey.forEach((value,i,arr)=>{
if(dataarr[index].surveyName==arr[i].surveyName){
if(dataarr[index].completed==true&&arr[i].completed==false){
arr[i].completed= dataarr[index].completed
}
}
})
});
}
});
}
@ -732,13 +771,13 @@ defineClick(){
export class addattinf{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<addattinf>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
addAttinf=[
{propertyName:'统一社会信用代码',completed:false,propertyType:0},
{propertyName:'单位类型',completed:false,propertyType:0},
{propertyName:'联系人',completed:false,propertyType:0},
{propertyName:'联系电话',completed:false,propertyType:0},
{propertyName:'辖区中队',completed:false,propertyType:0},
{propertyName:'单位地址',completed:false,propertyType:0},
{propertyName:'单位照片',completed:false,propertyType:0}//,default:'-',must:'是',danwei:'-'
{propertyName:'统一社会信用代码',completed:false,propertyType:0,value:''},
{propertyName:'单位类型',completed:false,propertyType:0,value:''},
{propertyName:'联系人',completed:false,propertyType:0,value:''},
{propertyName:'联系电话',completed:false,propertyType:0,value:''},
{propertyName:'辖区中队',completed:false,propertyType:0,value:''},
{propertyName:'单位地址',completed:false,propertyType:0,value:''},
/* {propertyName:'单位照片',completed:false,propertyType:0,value:''} *///,default:'-',must:'是',danwei:'-'
]
addAttinfBuild
addAttinfFile
@ -754,7 +793,16 @@ getattinf(){
if(element.groupName=='单位概况'&&element.attribute!=undefined){
element.attribute.forEach(value => {
if(value.surveyName=='单位基本信息'&&value.attinf!=undefined){
this.addAttinf=value.attinf
//this.addAttinf=value.attinf
value.attinf.forEach((datavalue,index,dataarr) => {
this.addAttinf.forEach((value,i,arr)=>{
if(dataarr[index].propertyName==arr[i].propertyName){
if(dataarr[index].completed==true&&arr[i].completed==false){
arr[i].completed= dataarr[index].completed
}
}
})
});
}else if(value.surveyName=='建筑信息'&&value.attinf==undefined){
let paramsdata:any ={
categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId
@ -768,6 +816,16 @@ getattinf(){
})
}else if(value.surveyName=='建筑信息'&&value.attinf!=undefined){
this.addAttinfBuild=value.attinf
/* console.log(this.addAttinfBuild)
value.attinf.forEach((datavalue,index,dataarr) => {
this.addAttinfBuild.forEach((value,i,arr)=>{
if(dataarr[index].propertyName==arr[i].propertyName){
if(dataarr[index].completed==true&&arr[i].completed==false){
arr[i].completed= dataarr[index].completed
}
}
})
}); */
}else if(value.surveyName=='消防设施'&&value.attinf==undefined){
let paramsdata:any ={
categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
@ -776,6 +834,7 @@ getattinf(){
this.addAttinfFile=data
this.addAttinfFile.forEach(element => {
element.completed=false
element.value=''
});
})
}else if(value.surveyName=='消防设施'&&value.attinf!=undefined){

Write Preview
Loading…
Cancel
Save