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

[新增]预案模板管理消防设施模板添加表格

上海一张图
chenjingyu 4 years ago
parent
d023a2afa1
commit
ef46582dae
6 changed files with 268 additions and 61 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. 2
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  2. 12
      src/app/ui/plan-template/addattinf.html
  3. 7
      src/app/ui/plan-template/addgroup.html
  4. 65
      src/app/ui/plan-template/plan-template.component.html
  5. 56
      src/app/ui/plan-template/plan-template.component.scss
  6. 187
      src/app/ui/plan-template/plan-template.component.ts

2
src/app/plan-audit/wait-examineer/wait-examineer.component.html
Unescape View File

@ -277,7 +277,7 @@
</div>
<!-- 点击每条表格右边显示内容 -->
<div *ngIf="isallDate">
<div style="height: 100%;" *ngIf="isallDate">
<!-- word文档 -->
<div class="word" *ngIf="showtype == 0">
<iframe [src]='iframeSrc'></iframe>

12
src/app/ui/plan-template/addattinf.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-05-26 14:54:36
* @LastEditors: sueRimn
* @LastEditTime: 2021-05-29 15:12:23
* @LastEditTime: 2021-06-01 10:25:05
-->
<div class="box">
<div class="top">
@ -20,6 +20,16 @@
<mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.propertyName}}</mat-checkbox>
</div>
</div>
<div class="center" *ngIf="this.data.surveyName=='消防设施'">
<div class="group" *ngFor="let item of addAttinfFile" >
<mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.name}}</mat-checkbox>
</div>
</div>
<div class="center" *ngIf="this.data.facilityItems!=null">
<div class="group" *ngFor="let item of facilityItems" >
<mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.name}}</mat-checkbox>
</div>
</div>
<div class="bottom">
<button mat-raised-button color="primary" (click)='defineClick()'>确定</button>
<button mat-raised-button style="margin-left: 20px;" (click)="close()">取消</button>

7
src/app/ui/plan-template/addgroup.html
Unescape View File

@ -4,15 +4,16 @@
* @Author: sueRimn
* @Date: 2021-05-24 10:08:22
* @LastEditors: sueRimn
* @LastEditTime: 2021-05-25 14:11:23
* @LastEditTime: 2021-06-01 14:25:50
-->
<div class="box">
<div class="top">
<span>新增分组</span>
</div>
<div class="center">
<div class="group" *ngFor="let item of addgtoup">
<mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.groupName}}</mat-checkbox>
<div class="group" *ngFor="let item of addgtoup;let i=index">
<!-- <input type="checkbox" [(ngModel)]="item.completed">{{item.groupName}} -->
<mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.groupName}}</mat-checkbox>
</div>
</div>
<div class="bottom">

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-05-19 15:50:20
* @LastEditors: sueRimn
* @LastEditTime: 2021-05-29 16:52:44
* @LastEditTime: 2021-06-01 16:43:14
-->
<div class="box">
<div class="boxleft">
@ -78,6 +78,7 @@
</mat-panel-title>
</mat-expansion-panel-header>
<!--单位概况:单位基本信息,建筑信息 -->
<div class="table" *ngIf="item.groupName=='单位概况'&&(element.surveyName=='单位基本信息'||element.surveyName=='建筑信息')">
<!-- <table mat-table [dataSource]='element.attinf' class="mat-elevation-z8">
<ng-container matColumnDef="name">
@ -121,11 +122,71 @@
<tr *ngFor="let attinf of element.attinf" >
<td *ngIf="attinf.completed" style="width: 30%;">{{attinf.propertyName}}</td>
<td *ngIf="attinf.completed" style="width: 30%;">{{attinf.propertyType==0?'单行文本':attinf.propertyType==1?'多行文本':'数值'}}</td>
<td *ngIf="attinf.completed" style="width: 30%;"><span style="color: #FF5D4A;margin-left: 4px;cursor: pointer;"> 删除</span></td>
<td *ngIf="attinf.completed" style="width: 30%;"><span style="color: #FF5D4A;margin-left: 4px;cursor: pointer;"(click)='delAttInfo(item.groupName,element.surveyName,attinf.propertyName)' > 删除</span></td>
</tr>
</tbody>
</table>
</div>
<!-- 单位概况消防设施-->
<div class="accordingin"*ngIf="item.groupName=='单位概况'&&(element.surveyName=='消防设施')">
<mat-accordion *ngFor="let attinf of element.attinf;let i = index">
<mat-expansion-panel [expanded]='attPanle' *ngIf="attinf.completed" expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;height: 100%;">
<mat-expansion-panel-header collapsedHeight='50px' expandedHeight='50px' class="panelhead" style="background-color: #FFD91D;">
<mat-panel-title class="paneltitle" >
<div class="dwgk">
<div class="attname" >
<span style="float: right;color: #B99A00;">{{attinf.name}}</span>
</div>
<div class="caozuo">
<button mat-raised-button color="#ECF6FF" ><img src="../../../assets/images/deletehui.png"> 删除</button>
<button mat-raised-button color="primary" style="margin-right: 10px;" (click)='fileAdd(attinf.facilityItems,i)'><img src="../../../assets/images/addbai.png"> 编辑</button>
</div>
</div>
</mat-panel-title>
</mat-expansion-panel-header>
<div class="table" *ngIf="item.groupName=='单位概况'&&(element.surveyName=='消防设施')">
<table cellspacing="0" cellpadding="0">
<thead>
<th style="width: 30%;">名称</th>
<th style="width: 30%;">类型</th>
<th style="width: 30%;">操作</th>
</thead>
<tbody>
<tr *ngFor="let facilityItems of attinf.facilityItems;let f=index" >
<td *ngIf="facilityItems.completed!=null&&facilityItems.completed" style="width: 30%;">{{facilityItems.name}}</td>
<td *ngIf="facilityItems.completed!=null&&facilityItems.completed" style="width: 30%;">文本类型</td>
<td *ngIf="facilityItems.completed!=null&&facilityItems.completed" style="width: 30%;"><span style="color: #FF5D4A;margin-left: 4px;cursor: pointer;"(click)='fileDel(i,f)' > 删除</span></td>
</tr>
</tbody>
</table>
</div>
</mat-expansion-panel>
</mat-accordion>
</div>
<!--进攻通道-->
<div *ngIf="item.groupName=='单位概况'&&(element.surveyName=='进攻通道')">
<div class="attack" *ngFor="let item of attack">
<div class="attackLeft">
<div class="attackleftHead">
<input type="text" [value]='item.head'>
</div>
<div class="attackleftTable">
<table>
<thead>
<th><input type="text" [value]='item.tableth'></th>
</thead>
</table>
</div>
</div>
<div class="attackRight">
<div class="rightButton">
<button mat-raised-button color="primary" (click)='attackAdd()'><img src="../../../assets/images/addbai.png"> 新增</button>
<button mat-raised-button color="#ECF6FF" style="margin-left: 10px;"><img src="../../../assets/images/deletehui.png"> 删除</button>
</div>
</div>
</div>
</div>
</mat-expansion-panel>
</mat-accordion>
</div>

56
src/app/ui/plan-template/plan-template.component.scss
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-05-19 15:50:20
* @LastEditors: sueRimn
* @LastEditTime: 2021-05-28 13:52:54
* @LastEditTime: 2021-06-01 16:46:43
*/
.box{
height: 97%;
@ -215,6 +215,60 @@
}
}
}
.attack{
width: 100%;
display: flex;
flex-direction: row;
.attackLeft{
width: 70%;
display: flex;
flex-direction: column;
.attackleftHead{
width: 100%;
height: 40px;
background-color: #FFD91D;
input{
background-color: #FFD91D;
color: #B99A00;
text-align: center;
height: 100%;
width: 100%;
font-size: 16px;
border: none;
outline: none;
}
}
.attackleftTable{
width: 100%;
thead,table{
width: 100%;
}
th{
background-color: #F9F9F9;
height: 40px;
font-size: 16px;
text-align: center;
input{
background-color: #FFFFFF;
text-align: center;
height: 100%;
width: 100%;
font-size: 16px;
border: none;
outline: none;
}
}
}
}
.attackRight{
width: 30%;
.rightButton{
margin-top: 20px;
margin-left: 40%;
}
}
}
}
}
}

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-05-19 15:50:20
* @LastEditors: sueRimn
* @LastEditTime: 2021-05-29 16:50:13
* @LastEditTime: 2021-06-01 16:39:49
*/
import { Component, Inject, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@ -42,6 +42,7 @@ export class PlanTemplateComponent implements OnInit {
buildData.forEach((element,i,buildArray) => {
if(value.buildingTypeId==element.id){
array[index].unitname=buildArray[i].name
array[index].facilityCategoryId=buildArray[i].facilityCategoryId
}
});
})
@ -122,7 +123,7 @@ export class PlanTemplateComponent implements OnInit {
unitName
leftclicki=-1//点了第几个模板
planClick(item){
//console.log(item)
console.log(item)
this.Id=item.id
this.planCategory=item.planCategory
this.unitName=item.unitname
@ -155,7 +156,7 @@ export class PlanTemplateComponent implements OnInit {
data:this.group
});
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(result!=undefined){
@ -185,6 +186,7 @@ export class PlanTemplateComponent implements OnInit {
}
})
}
this.newleftTabledata[this.leftclicki].data=this.group
}
//新增属性
addAttribute(groupName){
@ -197,7 +199,7 @@ 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=='单位概况'){
@ -223,12 +225,16 @@ export class PlanTemplateComponent implements OnInit {
}
})
}
this.newleftTabledata[this.leftclicki].data=this.group
console.log(this.newleftTabledata)
}
//新增属性信息
danweiInfTable=[]
addAttInfo(surveyName){
this.attPanle=true
if(surveyName=='进攻通道'){
this.attack.push({head:'进出口',tableth:[]})
}else{
this.attPanle=true
const dialogRef = this.dialog.open(addattinf, {//调用open方法打开对话框并且携带参数过去
width: '240px',
height:'400px',
@ -236,13 +242,8 @@ export class PlanTemplateComponent implements OnInit {
data:{newleftTabledata:this.newleftTabledata,surveyName:surveyName,leftclicki:this.leftclicki}
});
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
}
}) */
this.newleftTabledata[this,this.leftclicki].data.forEach((value,index,array)=>{
if(value.groupName=='单位概况'){
array[index].attribute.forEach((element,i,attary) => {
@ -257,7 +258,69 @@ export class PlanTemplateComponent implements OnInit {
}
console.log(this.newleftTabledata)
});
}
}
//删除属性信息
delAttInfo(groupName,surveyName,propertyName){
let isTrue = confirm('您确定要删除该条信息吗')
if(isTrue){
this.group.forEach((value,index,array)=>{
if (array[index].groupName==groupName) {
array[index].attribute.forEach((element,i,attarr) => {
if(element.surveyName==surveyName){
//array[index].attribute[i].completed=false
attarr[i].attinf.forEach((attinfValue,attinfi,attinfarr) => {
if(attinfValue.propertyName==propertyName){
attinfarr[attinfi].completed=false
}
});
}
});
}
})
}
this.newleftTabledata[this.leftclicki].data=this.group
console.log(this.newleftTabledata)
}
//消防设施具体属性编辑
fileAdd(facilityItems,filei){
const dialogRef = this.dialog.open(addattinf, {//调用open方法打开对话框并且携带参数过去
width: '240px',
height:'400px',
disableClose:true,
data:{facilityItems:facilityItems}
});
dialogRef.afterClosed().subscribe(result => {
console.log(result)
if(result!=undefined){
this.newleftTabledata[this,this.leftclicki].data.forEach((value,index,array)=>{
if(value.groupName=='单位概况'){
array[index].attribute.forEach((element,i,attary) => {
if(element.surveyName=='消防设施'){
attary[i].attinf[filei].facilityItems=result
}
});
}
})
this.group=this.newleftTabledata[this,this.leftclicki].data
}
console.log(this.newleftTabledata)
});
}
//消防设施具体属性删除
fileDel(i,f){
let isTrue = confirm('您确定要删除该条信息吗')
if(isTrue){
this.group[0].attribute[3].attinf[i].facilityItems[f].completed=false
}
}
//进攻通道
attack=[]
attackAdd(){
this.attack.length+1
}
//保存
save(){
@ -362,7 +425,7 @@ export class addPlanname{
styleUrls: ['./addKeyname.scss']
})
export class upPlanname{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<addPlanname>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
constructor(private http: HttpClient,public dialogRef: MatDialogRef<upPlanname>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
name//预案名称
level=this.data.item.planCategory//预案级别
unitName=this.data.item.unitname//单位类型
@ -429,7 +492,7 @@ export class upPlanname{
styleUrls: ['./addgroup.scss']
})
export class addGroup{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<addPlanname>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
constructor(private http: HttpClient,public dialogRef: MatDialogRef<addGroup>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
addgtoup=[
{groupName:'单位概况',completed:false},{groupName:'灾情设定',completed:false},{groupName:'力量调集',completed:false},
{groupName:'组织指挥',completed:false},{groupName:'作战行动',completed:false},{groupName:'社会联动',completed:false},
@ -439,15 +502,7 @@ export class addGroup{
groupName=[]
ngOnInit(): void{
//console.log(this.data)
/* this.addgtoup.forEach((value,index,array)=>{
this.data.forEach(element => {
if(element.groupName==array[index].groupName){
array[index].completed=true
}
});
}) */
console.log(this.data)
if(this.data!=null){
if(this.data.length!=0||this.data!=null){
this.addgtoup=this.data
}
@ -457,9 +512,11 @@ export class addGroup{
this.dialogRef.close();
}
//复选框点击事件
checkClick(e,item){
clicki
checkClick(i){
this.clicki=i
//console.log(e,item)
if (e.checked) {
/* if (e.checked) {
this.groupName.push(item)
}else {
this.groupName.forEach((value,index,array)=>{
@ -467,8 +524,8 @@ export class addGroup{
this.groupName.splice(index,1)
}
})
}
//console.log(this.groupName)
} */
//console.log(this.data)
}
//确定提交
newGroup(){
@ -497,14 +554,14 @@ export class addGroup{
styleUrls: ['./addgroup.scss']
})
export class adddwsurvey{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<addPlanname>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
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}
]
ngOnInit(): void{
//console.log(this.data)
console.log(this.data)
this.data.forEach(element => {
if(element.groupName=='单位概况'&&element.attribute!=undefined){
this.addwsurvey=element.attribute
@ -513,7 +570,7 @@ ngOnInit(): void{
}
//取消按钮
close(){
this.dialogRef.close();
this.dialogRef.close(undefined);
}
//确定按钮
defineClick(){
@ -527,7 +584,7 @@ defineClick(){
styleUrls: ['./addgroup.scss']
})
export class addattinf{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<addPlanname>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
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},
@ -538,34 +595,57 @@ export class addattinf{
{propertyName:'单位照片',completed:false,propertyType:0}//,default:'-',must:'是',danwei:'-'
]
addAttinfBuild
addAttinfFile
facilityItems
ngOnInit(): void{
//console.log(this.data)
console.log(this.data)
this.getattinf()
}
//获取弹窗信息
getattinf(){
this.data.newleftTabledata[this.data.leftclicki].data.forEach(element => {
if(element.groupName=='单位概况'&&element.attribute!=undefined){
element.attribute.forEach(value => {
if(value.surveyName=='单位基本信息'&&value.attinf!=undefined){
this.addAttinf=value.attinf
}else if(value.surveyName=='建筑信息'&&value.attinf==undefined){
let paramsdata:any ={
categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId
if(this.data.facilityItems==undefined){
this.data.newleftTabledata[this.data.leftclicki].data.forEach(element => {
if(element.groupName=='单位概况'&&element.attribute!=undefined){
element.attribute.forEach(value => {
if(value.surveyName=='单位基本信息'&&value.attinf!=undefined){
this.addAttinf=value.attinf
}else if(value.surveyName=='建筑信息'&&value.attinf==undefined){
let paramsdata:any ={
categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId
}
this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{
this.addAttinfBuild=data[0].propertyInfos
this.addAttinfBuild.forEach(element => {
element.completed=false
});
console.log(this.addAttinfBuild)
})
}else if(value.surveyName=='建筑信息'&&value.attinf!=undefined){
this.addAttinfBuild=value.attinf
}else if(value.surveyName=='消防设施'&&value.attinf==undefined){
let paramsdata:any ={
categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
}
this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
this.addAttinfFile=data
this.addAttinfFile.forEach(element => {
element.completed=false
});
})
}else if(value.surveyName=='消防设施'&&value.attinf!=undefined){
this.addAttinfFile=value.attinf
}
this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{
this.addAttinfBuild=data[0].propertyInfos
this.addAttinfBuild.forEach(element => {
element.completed=false
});
console.log(this.addAttinfBuild)
})
}else if(value.surveyName=='建筑信息'&&value.attinf!=undefined){
this.addAttinfBuild=value.attinf
}
});
}
});
});
}
});
}else{
this.facilityItems=this.data.facilityItems
console.log(this.facilityItems)
this.facilityItems.forEach(element => {
element.completed=false
});
}
}
//取消按钮
close(){
@ -573,6 +653,7 @@ close(){
}
//确定按钮
defineClick(){
this.dialogRef.close(this.data.surveyName=='单位基本信息'?this.addAttinf:this.addAttinfBuild)
this.dialogRef.close(this.data.surveyName=='单位基本信息'?this.addAttinf:this.data.surveyName=='建筑信息'?
this.addAttinfBuild:this.data.surveyName=='消防设施'?this.addAttinfFile:this.facilityItems)
}
}
Write Preview
Loading…
Cancel
Save