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

[修改]消防设施最内层数据报错问题

tangshan
陈敬瑜 3 years ago
parent
1885a064dd
commit
7768c8192e
5 changed files with 15 additions and 14 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. 6
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  2. 4
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  3. 2
      src/app/ui/plan-template/Disaster.html
  4. 6
      src/app/ui/plan-template/plan-template.component.html
  5. 11
      src/app/ui/plan-template/plan-template.component.ts

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

@ -1130,9 +1130,9 @@
<div style="height: 100%;width: 100%;"
*ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
<input type="text" placeholder="请输入内容"
style="background-color: #E8E9E9;width: 40%;"
style="background-color: #E8E9E9;width: 25%;text-align: center;"
[(ngModel)]="itemthj.head" *ngIf="pattern == 'edit'">
<input type="text" placeholder="请输入内容" style="width: 60%;"
<input type="text" placeholder="请输入内容" style="width: 75%;"
[(ngModel)]="itemthj.body" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
@ -1149,7 +1149,7 @@
text-align: center;white-space:pre-wrap;width: 185px;">
{{itemthj.body}}
</td>
</tr>
</tr>
</table>
</div>
</div>

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

@ -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

2
src/app/ui/plan-template/Disaster.html
Unescape View File

@ -21,7 +21,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="level!=2">
<label style="margin-right: 10px;">名称:</label>
<mat-form-field class="example-full-width">
<input matInput placeholder="请输入表头名称" [(ngModel)]="headName" autocomplete="off" required>

6
src/app/ui/plan-template/plan-template.component.html
Unescape View File

@ -200,7 +200,7 @@
<td *ngIf="facilityItems.completed!=null&&facilityItems.completed" style="width: 30%;">
<img src="../../../assets/images/toppaixu.png" alt="" style="height: 15px;margin-right: 2px;position: relative;top: 2px;" (click)='fileTop(zi,suri,i,f)'>
<img src="../../../assets/images/downpaixu.png" alt="" style="height: 15px;margin-right: 5px;position: relative;top: 2px;" (click)='fileDown(zi,suri,i,f)'>
<span style="color: #FF5D4A;margin-left: 4px;cursor: pointer;" (click)='fileDel(i,f)'>删除</span>
<span style="color: #FF5D4A;margin-left: 4px;cursor: pointer;" (click)='fileDel(suri,i,f)'>删除</span>
</td>
</tr>
</tbody>
@ -274,9 +274,9 @@
*ngFor="let itemth of zdy.tableth;let tablethi=index;TrackBy:trackByFn">
<div style="height: 100%;width: 100%;"
*ngFor="let itemthj of zdy.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
<input type="text" placeholder="请输入内容" style="background-color: #E8E9E9;width: 40%;"
<input type="text" placeholder="请输入内容" style="background-color: #E8E9E9;width: 20%;"
[(ngModel)]="itemthj.head">
<input type="text" placeholder="请输入内容" style="width: 60%;" [(ngModel)]="itemthj.body">
<input type="text" placeholder="请输入内容" style="width: 80%;" [(ngModel)]="itemthj.body">
</div>
</div>
</div>

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

@ -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

Write Preview
Loading…
Cancel
Save