From dcfaea91ce30fd8965040a7cb144004b28134e67 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 28 Jun 2022 16:25:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9bug?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=BD=AC=E6=96=87=E6=A1=A3=E5=BB=BA=E7=AD=91?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E5=AD=97=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-plan-online-five.component.ts | 1398 ++++++++--------- .../entry-plan-look.component.ts | 6 +- 2 files changed, 703 insertions(+), 701 deletions(-) diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 93c9deb..061ece8 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -58,34 +58,34 @@ export class CreatePlanOnlineFiveComponent implements OnInit { planLevel: string//预案级别 blockyl = true - zaixianDr=false - haveNew=false + zaixianDr = false + haveNew = false planMode//预案类型 xiazai//是否点击下载按钮进来的 //index - async ngOnInit() { + async ngOnInit() { //this.index = this.getArrayIndex(this.planTemplateData,'单位概况') - this.xiazai=this.route.snapshot.queryParams.xiazai - this.haveNew=this.route.snapshot.queryParams.haveNew - this.planMode=this.route.snapshot.queryParams.planMode + this.xiazai = this.route.snapshot.queryParams.xiazai + this.haveNew = this.route.snapshot.queryParams.haveNew + this.planMode = this.route.snapshot.queryParams.planMode console.log(this.route.snapshot.queryParams.wordChange) this.planLevel = this.route.snapshot.queryParams.planCategory if (this.route.snapshot.queryParams.pattern == 'false') { this.pattern = 'look' this.blockyl = false - this.selectedItem='单位概况' + this.selectedItem = '单位概况' //this.clickTitleItem(this.planTemplateData[1]) } else { - this.selectedItem='封面' + this.selectedItem = '封面' this.pattern = 'edit' } - await this.getUnitData() - await this.getOrganizations() - if(this.route.snapshot.queryParams.xiazai=='true'){ - window.setTimeout(async ()=>{ - this.generatingDoc() - },32000) - + await this.getUnitData() + await this.getOrganizations() + if (this.route.snapshot.queryParams.xiazai == 'true') { + window.setTimeout(async () => { + this.generatingDoc() + }, 32000) + } } zdysearch = '' @@ -124,20 +124,20 @@ export class CreatePlanOnlineFiveComponent implements OnInit { //得到当前单位所在组织机构的tree型数据 allorganizations: any //所有组织机构 async getpresentOrganization() { - let result=new Promise((resolve)=>{ + let result = new Promise((resolve) => { this.newallorganizations = this.allorganizations - this.newallorganizations.forEach(item => { - item.children = [] - this.newallorganizations.forEach(element => { - if (element.parentId == item.id) { - item.children.push(element) - } + this.newallorganizations.forEach(item => { + item.children = [] + this.newallorganizations.forEach(element => { + if (element.parentId == item.id) { + item.children.push(element) + } + }); }); - }); - this.dataSource.data = this.tree.toTree(this.treedata); - resolve(this.dataSource.data) + this.dataSource.data = this.tree.toTree(this.treedata); + resolve(this.dataSource.data) }) - + /* this.http.get("/api/Account/Profiles").subscribe( (data: any) => { this.organizationName = data.organizationName @@ -152,18 +152,18 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } } ) */ - + } //获得所有组织机构 async getOrganizations() { - let result=new Promise((resolve)=>{ + let result = new Promise((resolve) => { this.http.get('/api/Organizations').subscribe( async (data: any) => { this.allorganizations = data this.treedata = this.tree.toTree(data); - await this.getpresentOrganization(); - resolve(data) + await this.getpresentOrganization(); + resolve(data) } ) }) @@ -181,13 +181,13 @@ export class CreatePlanOnlineFiveComponent implements OnInit { let paramsdata: any = { Name: this.route.snapshot.queryParams.unitName || '', } - let result=new Promise((resolve)=>{ + let result = new Promise((resolve) => { this.http.get("/api/Companies", { params: paramsdata }).subscribe((data: any) => { data.items.forEach(async element => { if (element.id == this.route.snapshot.queryParams.companyId) { this.unitData = element - if(this.planLevel=='5'){ - this.zaixianDr=true + if (this.planLevel == '5') { + this.zaixianDr = true } //console.log('单位列表信息', this.unitData) await this.getTemplateData() @@ -196,7 +196,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { resolve(data) }) }) - + } //获得四周毗邻信息 getArrayIndex(arr, groupName) { @@ -210,7 +210,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { pilinData = [] async getpili() { - let index = this.getArrayIndex(this.planTemplateData,'单位概况') + let index = this.getArrayIndex(this.planTemplateData, '单位概况') let result = await new Promise((resolve) => { this.planTemplateData[index].building.forEach(element => { let id = { buildingId: element.buildingId } @@ -249,7 +249,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { //获取重点部位 buData = [] async getbuwei() { - let index = this.getArrayIndex(this.planTemplateData,'单位概况') + let index = this.getArrayIndex(this.planTemplateData, '单位概况') let result = await new Promise((resolve) => { this.planTemplateData[index].building.forEach(element => { let id = { buildingId: element.buildingId } @@ -276,10 +276,10 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } selectedItem: string = '封面' - selectedContent:any + selectedContent: any async clickTitleItem(item) { //this.planTemplateData[key].new=true - + this.selectedContent = item this.addNumber = -1 this.yinruData = { @@ -376,62 +376,62 @@ export class CreatePlanOnlineFiveComponent implements OnInit { await this.getpili() await this.getbuwei() //console.log(this.buildZong) - let index = this.getArrayIndex(this.planTemplateData,'单位概况') + let index = this.getArrayIndex(this.planTemplateData, '单位概况') this.planTemplateData[index].building.forEach(element => { - if(element.body[0].completed){ - element.body[0].attinf.forEach((arrval,atti,attarr) => { - if(arrval.propertyName=='统一社会信用代码'){ - arrval.value=arrval.olddata=this.unitData.usci - }else if(arrval.propertyName=='单位类型'){ - arrval.value=arrval.olddata=this.unitData.buildingTypes[0].name - }else if(arrval.propertyName=='联系人'){ - arrval.value=arrval.olddata=this.unitData.contacts - }else if(arrval.propertyName=='联系电话'){ - arrval.value=arrval.olddata=this.unitData.phone - }else if(arrval.propertyName=='辖区中队'){ - arrval.value=arrval.olddata=this.unitData.organizationName - }else if(arrval.propertyName=='单位地址'){ - arrval.value=arrval.olddata=this.unitData.address + if (element.body[0].completed) { + element.body[0].attinf.forEach((arrval, atti, attarr) => { + if (arrval.propertyName == '统一社会信用代码') { + arrval.value = arrval.olddata = this.unitData.usci + } else if (arrval.propertyName == '单位类型') { + arrval.value = arrval.olddata = this.unitData.buildingTypes[0].name + } else if (arrval.propertyName == '联系人') { + arrval.value = arrval.olddata = this.unitData.contacts + } else if (arrval.propertyName == '联系电话') { + arrval.value = arrval.olddata = this.unitData.phone + } else if (arrval.propertyName == '辖区中队') { + arrval.value = arrval.olddata = this.unitData.organizationName + } else if (arrval.propertyName == '单位地址') { + arrval.value = arrval.olddata = this.unitData.address } }); - /* element.body[0].attinf[0].value = element.body[0].attinf[0].olddata = this.unitData.usci - element.body[0].attinf[1].value = element.body[0].attinf[1].olddata = this.unitData.buildingTypes[0].name - element.body[0].attinf[2].value = element.body[0].attinf[2].olddata = this.unitData.contacts - element.body[0].attinf[3].value = element.body[0].attinf[3].olddata = this.unitData.phone - element.body[0].attinf[4].value = element.body[0].attinf[4].olddata = this.unitData.organizationName - element.body[0].attinf[5].value = element.body[0].attinf[5].olddata = this.unitData.address */ - - if (element.body.length>1&&element.body[1].attinf != undefined) { - element.body[1].attinf.forEach(eBuild => { - this.buildZong.forEach(oldBuild => { - if (oldBuild.buildingBasicGroups.length > 0) { - oldBuild.buildingBasicGroups[0].propertyInfos.forEach(infodata => { - eBuild.olddata = infodata.propertyValue - }); - } + /* element.body[0].attinf[0].value = element.body[0].attinf[0].olddata = this.unitData.usci + element.body[0].attinf[1].value = element.body[0].attinf[1].olddata = this.unitData.buildingTypes[0].name + element.body[0].attinf[2].value = element.body[0].attinf[2].olddata = this.unitData.contacts + element.body[0].attinf[3].value = element.body[0].attinf[3].olddata = this.unitData.phone + element.body[0].attinf[4].value = element.body[0].attinf[4].olddata = this.unitData.organizationName + element.body[0].attinf[5].value = element.body[0].attinf[5].olddata = this.unitData.address */ + + if (element.body.length > 1 && element.body[1].attinf != undefined) { + element.body[1].attinf.forEach(eBuild => { + this.buildZong.forEach(oldBuild => { + if (oldBuild.buildingBasicGroups.length > 0) { + oldBuild.buildingBasicGroups[0].propertyInfos.forEach(infodata => { + eBuild.olddata = infodata.propertyValue + }); + } + }); }); - }); - } + } } - + }); console.log(this.planTemplateData) } else if (this.selectedItem == '预案附件') { this.getTwoDPlanList() - }else if(this.selectedItem == '新建'){ + } else if (this.selectedItem == '新建') { const dialogRef = this.dialog.open(newTitle, {//调用open方法打开对话框并且携带参数过去 width: '300px', - height:'190px', - disableClose:true, - data:{type:'新建',planTemplateData:this.planTemplateData} + height: '190px', + disableClose: true, + data: { type: '新建', planTemplateData: this.planTemplateData } }); dialogRef.afterClosed().subscribe(result => { console.log(result) - if(result!=undefined){ + if (result != undefined) { //delete this.planTemplateData[this.planTemplateData.length-1] - this.planTemplateData[this.planTemplateData.length-1]={attribute:[],completed: true, groupName: result,new:false,headName:'自定义名称'} - this.planTemplateData.push({completed: true,groupName: '新建'}) + this.planTemplateData[this.planTemplateData.length - 1] = { attribute: [], completed: true, groupName: result, new: false, headName: '自定义名称' } + this.planTemplateData.push({ completed: true, groupName: '新建' }) //delete this.planTemplateData[this.planTemplateData.length-3] } //JSON.parse(JSON.stringify(this.planTemplateData)) @@ -440,25 +440,25 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } } //自定义模块改名 - upName(index,name){ + upName(index, name) { const dialogRef = this.dialog.open(newTitle, {//调用open方法打开对话框并且携带参数过去 width: '300px', - height:'190px', - disableClose:true, - data:{type:'修改',planName:name,planTemplateData:this.planTemplateData} + height: '190px', + disableClose: true, + data: { type: '修改', planName: name, planTemplateData: this.planTemplateData } }); dialogRef.afterClosed().subscribe(result => { - this.planTemplateData[index].groupName=result + this.planTemplateData[index].groupName = result }); } //自定义模块删除 - delName(index){ + delName(index) { let isTrue = confirm('您确定要删除该项吗') - if(isTrue){ - this.planTemplateData.splice(index,1) + if (isTrue) { + this.planTemplateData.splice(index, 1) console.log(this.planTemplateData) } - + } drop(event: CdkDragDrop) { @@ -473,7 +473,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { basicCategoryId //获得所有建筑信息 async getAllBuildingsInfo() { - let index = this.getArrayIndex(this.planTemplateData,'单位概况') + let index = this.getArrayIndex(this.planTemplateData, '单位概况') const result = await new Promise((resolve) => { this.http.get("/api/Buildings", { params: { @@ -588,14 +588,14 @@ export class CreatePlanOnlineFiveComponent implements OnInit { planTemplateData: any //获得模板信息 - danweInfo={ + danweInfo = { //若选择自定义，默认三条信息 - attribute:[ + attribute: [ { - attinf:[ - {completed: true,olddata: "",propertyName: "联系人",propertyType: 0,propertyValue: "",value: ""}, - {completed: true,olddata: "",propertyName: "联系电话",propertyType: 0,propertyValue: "",value: ""}, - {completed: true,olddata: "",propertyName: "单位地址",propertyType: 0,propertyValue: "",value: ""} + attinf: [ + { completed: true, olddata: "", propertyName: "联系人", propertyType: 0, propertyValue: "", value: "" }, + { completed: true, olddata: "", propertyName: "联系电话", propertyType: 0, propertyValue: "", value: "" }, + { completed: true, olddata: "", propertyName: "单位地址", propertyType: 0, propertyValue: "", value: "" } ], completed: true, surveyName: "单位基本信息" @@ -605,40 +605,40 @@ export class CreatePlanOnlineFiveComponent implements OnInit { groupName: "单位概况" } async getTemplateData() { - let result=new Promise((resolve)=>{ + let result = new Promise((resolve) => { this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => { console.log('预案内容', data.webTextData) - if(this.route.snapshot.queryParams.planMode==4&&data.webTextData==null){ - this.planTemplateData=[] + if (this.route.snapshot.queryParams.planMode == 4 && data.webTextData == null) { + this.planTemplateData = [] let obj = { - completed: true, - groupName: "封面", - attribute: { - planNumber: '', - planName: this.route.snapshot.queryParams.planName, - objName: this.unitData.name, - unitNature: this.unitData.buildingTypes[0].name, - planLevel: '', - disasterType: '火灾', - fireproofingLevel: '', - fireproofingAdminister: this.unitData.organizationName, - putOutFireAdminister: '', - producer: { - name: '', - duty: '' - }, - verifier: { - name: '', - duty: '' - }, - auditTime: '' - } + completed: true, + groupName: "封面", + attribute: { + planNumber: '', + planName: this.route.snapshot.queryParams.planName, + objName: this.unitData.name, + unitNature: this.unitData.buildingTypes[0].name, + planLevel: '', + disasterType: '火灾', + fireproofingLevel: '', + fireproofingAdminister: this.unitData.organizationName, + putOutFireAdminister: '', + producer: { + name: '', + duty: '' + }, + verifier: { + name: '', + duty: '' + }, + auditTime: '' + } } this.planTemplateData.unshift(obj) this.planTemplateData.push(this.danweInfo) - this.planTemplateData.push({completed: true,groupName: '新建'}) + this.planTemplateData.push({ completed: true, groupName: '新建' }) console.log(this.planTemplateData) - }else if(data.webTextData!=null){ + } else if (data.webTextData != null) { this.planTemplateData = JSON.parse(data.webTextData).filter(item => item.completed == true ) @@ -700,23 +700,23 @@ export class CreatePlanOnlineFiveComponent implements OnInit { element.attribute = [{ name: '特别警示', content: '' }] } } - if(element.groupName=='单位概况'){ + if (element.groupName == '单位概况') { this.clickTitleItem(this.planTemplateData[1]) } }); - if(this.planLevel=='4'||this.route.snapshot.queryParams.haveNew){ - this.planTemplateData.push({completed: true,groupName: '新建'}) + if (this.planLevel == '4' || this.route.snapshot.queryParams.haveNew) { + this.planTemplateData.push({ completed: true, groupName: '新建' }) } this.planTemplateData.forEach(element => { - if(element.attribute!=undefined){ + if (element.attribute != undefined) { /* element.attribute.forEach((item,index,value) => { if(value[index].level!=undefined&&value[index].level==1){ value[index].lieNumber=value[index].tableth.length } }); */ - for(let i=0;i { if (orgArr[orgi].level == '1') { orgtableCount++ @@ -1020,7 +1020,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { var orginputCount = 0 var orgtextAreaCount = 0 var orgtreeCount = 0 - let index = this.getArrayIndex(this.planTemplateData,'社会联动') + let index = this.getArrayIndex(this.planTemplateData, '社会联动') this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => { if (orgArr[orgi].level == '1') { orgtableCount++ @@ -1046,7 +1046,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { var orginputCount = 0 var orgtextAreaCount = 0 var orgtreeCount = 0 - let index = this.getArrayIndex(this.planTemplateData,'勤务保障') + let index = this.getArrayIndex(this.planTemplateData, '勤务保障') this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => { if (orgArr[orgi].level == '1') { orgtableCount++ @@ -1072,7 +1072,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { var orginputCount = 0 var orgtextAreaCount = 0 var orgtreeCount = 0 - let index = this.getArrayIndex(this.planTemplateData,'处置要点') + let index = this.getArrayIndex(this.planTemplateData, '处置要点') this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => { if (orgArr[orgi].level == '1') { orgtableCount++ @@ -1311,145 +1311,145 @@ export class CreatePlanOnlineFiveComponent implements OnInit { addNumber = -1 addTd(key, i) { this.addNumber++ - if (this.planTemplateData[key].attribute[i].tableth == undefined||this.planTemplateData[key].attribute[i].tableth.length==0) { + if (this.planTemplateData[key].attribute[i].tableth == undefined || this.planTemplateData[key].attribute[i].tableth.length == 0) { //this.planTemplateData[key].attribute[i].tabletr = [] const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 this.snackBar.open('请先编辑列!', '确定', config); - }else{ - if(this.planTemplateData[key].attribute[i].tabletr == undefined){ + } else { + if (this.planTemplateData[key].attribute[i].tabletr == undefined) { this.planTemplateData[key].attribute[i].tabletr = [] } this.planTemplateData[key].attribute[i].tabletr.push({ tabletd: [] }) - for(var j = 0; j < this.planTemplateData[key].attribute[i].tableth.length; j++) { - if (this.planTemplateData[key].attribute[i].tabletr != undefined) { - this.planTemplateData[key].attribute[i].tabletr[this.planTemplateData[key].attribute[i].tabletr.length - 1].tabletd.push('') - } - else { - this.planTemplateData[key].attribute[i].tabletr[this.addNumber].tabletd.push('') + for (var j = 0; j < this.planTemplateData[key].attribute[i].tableth.length; j++) { + if (this.planTemplateData[key].attribute[i].tabletr != undefined) { + this.planTemplateData[key].attribute[i].tabletr[this.planTemplateData[key].attribute[i].tabletr.length - 1].tabletd.push('') + } + else { + this.planTemplateData[key].attribute[i].tabletr[this.addNumber].tabletd.push('') + } } } - } - + // console.log(this.planTemplateData) } //四种类型删除一行 - delTd(key, i,tri?:number,uniti?:number,elei?:number) { + delTd(key, i, tri?: number, uniti?: number, elei?: number) { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 let isTrue = confirm('您确定要删除该条信息吗') - if(isTrue){ - if(tri==undefined){ - this.planTemplateData[key].attribute.splice(i,1) - }else{ - if(uniti==undefined&&elei==undefined){ - this.planTemplateData[key].attribute[i].tabletr.splice(tri,1) - }else{ - this.planTemplateData[key].building[i].body[tri].attinf[uniti].tabletr.splice(elei,1) + if (isTrue) { + if (tri == undefined) { + this.planTemplateData[key].attribute.splice(i, 1) + } else { + if (uniti == undefined && elei == undefined) { + this.planTemplateData[key].attribute[i].tabletr.splice(tri, 1) + } else { + this.planTemplateData[key].building[i].body[tri].attinf[uniti].tabletr.splice(elei, 1) } - + } - + } } //修改多行文本，表格行列数量 - updataHl(...num:number[]){ + updataHl(...num: number[]) { const dialogRef = this.dialog.open(updataHl, {//调用open方法打开对话框并且携带参数过去 width: '340px', - height:'350px', - disableClose:true, - data:JSON.parse(JSON.stringify(num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]])) + height: '350px', + disableClose: true, + data: JSON.parse(JSON.stringify(num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]])) }); dialogRef.afterClosed().subscribe(result => { - if(result!=undefined){ + if (result != undefined) { - //外层四种类型编辑行跟列 - if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).level==1){ - //表格类型编辑列数 - if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr==undefined){ - (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr = [] - } - if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length { - element.tabletd.push('') - }); - } - + //外层四种类型编辑行跟列 + if ((num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).level == 1) { + //表格类型编辑列数 + if ((num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr == undefined) { + (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr = [] + } + if ((num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length < result.lieNumber) { + //表格类型新增列数 + for (let i = (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length; i < result.lieNumber; i++) { + (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.push('') + if ((num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr != undefined) { + (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr.forEach(element => { + element.tabletd.push('') + }); } - }else{ - //表格类型减少列数 - for(let i=(num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length;i>result.lieNumber;i--){ - (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.splice(i-1,1) - if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr!=undefined){ - (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr.forEach((element) => { - element.tabletd.splice(element.tabletd.length-1,1) - }); - } + + } + } else { + //表格类型减少列数 + for (let i = (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length; i > result.lieNumber; i--) { + (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.splice(i - 1, 1) + if ((num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr != undefined) { + (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr.forEach((element) => { + element.tabletd.splice(element.tabletd.length - 1, 1) + }); } } - }else if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).level==2){ - //多行文本编辑行列 - if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length result.hNumber; i--) { + (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.splice(i - 1, 1) + } + } + + (num.length < 3 ? this.planTemplateData[num[0]].attribute[num[1]] : this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.forEach((element, index, value) => { + if (value[index].length < result.lieNumber) { + for (let a = value[index].length; a < result.lieNumber; a++) { + value[index].push({ body: '', head: '' }) } - }else{ - for(let i=(num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length;i>result.hNumber;i--){ - (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.splice(i-1,1) + } else { + for (let a = value[index].length; a > result.lieNumber; a--) { + value[index].splice(index - 1, 1) } } - - (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.forEach((element,index,value) => { - if(value[index].lengthresult.lieNumber;a--){ - value[index].splice(index-1,1) - } - } - - }); - - } - + + }); + + } + console.log(this.planTemplateData) } - - }); + + }); } //新建内容向上排序 - upPai(zi,attributei){ + upPai(zi, attributei) { var temp - if(attributei!=0){ - for (let index = attributei-1; index >=0; index--) { - temp=this.planTemplateData[zi].attribute[index] - this.planTemplateData[zi].attribute[index]=this.planTemplateData[zi].attribute[attributei] - this.planTemplateData[zi].attribute[attributei]=temp - return + if (attributei != 0) { + for (let index = attributei - 1; index >= 0; index--) { + temp = this.planTemplateData[zi].attribute[index] + this.planTemplateData[zi].attribute[index] = this.planTemplateData[zi].attribute[attributei] + this.planTemplateData[zi].attribute[attributei] = temp + return } - + } } //新建内容向下排序 - downPai(zi,attributei){ + downPai(zi, attributei) { var temp - if (attributei!=this.planTemplateData[zi].attribute.length-1) { - for (let index = attributei+1; index < this.planTemplateData[zi].attribute.length; index++) { - temp=this.planTemplateData[zi].attribute[index] - this.planTemplateData[zi].attribute[index]=this.planTemplateData[zi].attribute[attributei] - this.planTemplateData[zi].attribute[attributei]=temp + if (attributei != this.planTemplateData[zi].attribute.length - 1) { + for (let index = attributei + 1; index < this.planTemplateData[zi].attribute.length; index++) { + temp = this.planTemplateData[zi].attribute[index] + this.planTemplateData[zi].attribute[index] = this.planTemplateData[zi].attribute[attributei] + this.planTemplateData[zi].attribute[attributei] = temp return - + } - + } } //单位概况左侧建筑点击事件 @@ -1462,16 +1462,16 @@ export class CreatePlanOnlineFiveComponent implements OnInit { // console.log(item, this.clicki) } //单位概况增加一行 - unitadd(surveyName, attacki, i,fileNum?:number) { - let index = this.getArrayIndex(this.planTemplateData,'单位概况') + unitadd(surveyName, attacki, i, fileNum?: number) { + let index = this.getArrayIndex(this.planTemplateData, '单位概况') this.addNumber++ - this.planTemplateData[index].building[attacki].body.forEach((value,bodyi,arr)=>{ - if(surveyName==arr[bodyi].surveyName){ + this.planTemplateData[index].building[attacki].body.forEach((value, bodyi, arr) => { + if (surveyName == arr[bodyi].surveyName) { console.log(bodyi) - if(arr[bodyi].zdy==undefined){ + if (arr[bodyi].zdy == undefined) { if (surveyName == '进攻通道') { - if(this.planTemplateData[index].building[attacki].body[bodyi].attinf==undefined){ - this.planTemplateData[index].building[attacki].body[bodyi].attinf=[] + if (this.planTemplateData[index].building[attacki].body[bodyi].attinf == undefined) { + this.planTemplateData[index].building[attacki].body[bodyi].attinf = [] } if (this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr == undefined) { this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr = [] @@ -1485,7 +1485,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr[this.addNumber].tabletd.push('') } } - + // console.log(this.planTemplateData) } else if (surveyName == '功能分区') { @@ -1494,68 +1494,68 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } else if (surveyName == '重点部位') { this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ heafName: '', body: [{ name: '重点部位名称', value: '' }, { name: '重点部位所在位置', value: '' }, { name: '建筑结构', value: '' }, { name: '使用性质', value: '' }, { name: '主要危险性', value: '' }] }) } - else if(surveyName == '单位基本信息'||surveyName == '建筑信息'){ - if(this.planTemplateData[index].building[attacki].body[bodyi].attinf==undefined){ - this.planTemplateData[index].building[attacki].body[bodyi].attinf=[] + else if (surveyName == '单位基本信息' || surveyName == '建筑信息') { + if (this.planTemplateData[index].building[attacki].body[bodyi].attinf == undefined) { + this.planTemplateData[index].building[attacki].body[bodyi].attinf = [] } - this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ propertyName: '', value: '',completed:true,zdy:true }) - } else if(surveyName == '四周毗邻'){ - this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '',completed:true,zdy:false }) - this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '',completed:true,zdy:true }) - }else if(surveyName == '消防设施'){ - if(this.planTemplateData[index].building[attacki].body[bodyi].attinf==undefined){ - this.planTemplateData[index].building[attacki].body[bodyi].attinf=[] + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ propertyName: '', value: '', completed: true, zdy: true }) + } else if (surveyName == '四周毗邻') { + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '', completed: true, zdy: false }) + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '', completed: true, zdy: true }) + } else if (surveyName == '消防设施') { + if (this.planTemplateData[index].building[attacki].body[bodyi].attinf == undefined) { + this.planTemplateData[index].building[attacki].body[bodyi].attinf = [] } - if(fileNum==0){ - this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.push({ name: '', value: '',completed:true,zdy:true}) - }else{ - this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '',completed:true,zdy:true,facilityItems:[] }) + if (fileNum == 0) { + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.push({ name: '', value: '', completed: true, zdy: true }) + } else { + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '', completed: true, zdy: true, facilityItems: [] }) } - + } - }else{ - this.addAttribute(surveyName,attacki,i,1,surveyName) + } else { + this.addAttribute(surveyName, attacki, i, 1, surveyName) } - + } }) console.log(this.planTemplateData) } //单位概况自定义表格新增一行 - unitNewadd(...num:number[]){ + unitNewadd(...num: number[]) { console.log(num) - if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth == undefined||this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth.length==0) { + if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth == undefined || this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth.length == 0) { //this.planTemplateData[key].attribute[i].tabletr = [] const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 this.snackBar.open('请先编辑列!', '确定', config); - }else{ - if(this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr == undefined){ + } else { + if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr == undefined) { this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr = [] } this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr.push({ tabletd: [] }) - for(var j = 0; j < this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth.length; j++) { - if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr != undefined) { - this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr[this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr.length - 1].tabletd.push('') - } - else { - this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr[this.addNumber].tabletd.push('') + for (var j = 0; j < this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth.length; j++) { + if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr != undefined) { + this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr[this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr.length - 1].tabletd.push('') + } + else { + this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr[this.addNumber].tabletd.push('') + } } } - } console.log(this.planTemplateData) //this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].push() } //单位概况删除一行 - unitDel(surveyName, attacki, i,fileNum?:number) { - let index = this.getArrayIndex(this.planTemplateData,'单位概况') + unitDel(surveyName, attacki, i, fileNum?: number) { + let index = this.getArrayIndex(this.planTemplateData, '单位概况') const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 let isTrue = confirm('您确定要删除该条信息吗') - this.planTemplateData[index].building[attacki].body.forEach((value,bodyi,arr) => { - if(surveyName==arr[bodyi].surveyName){ + this.planTemplateData[index].building[attacki].body.forEach((value, bodyi, arr) => { + if (surveyName == arr[bodyi].surveyName) { if (surveyName == '进攻通道') { if (isTrue) { if (this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr != undefined) { @@ -1568,22 +1568,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.snackBar.open('请先增加一行!', '确定', config); } } - } else if (surveyName == '功能分区'||surveyName=='重点部位'||surveyName=='单位基本信息'||surveyName=='建筑信息'||surveyName=='消防设施') { + } else if (surveyName == '功能分区' || surveyName == '重点部位' || surveyName == '单位基本信息' || surveyName == '建筑信息' || surveyName == '消防设施') { if (isTrue) { - if(surveyName=='消防设施'&&fileNum!=undefined){ - this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.splice(fileNum,1) - }else{ + if (surveyName == '消防设施' && fileNum != undefined) { + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.splice(fileNum, 1) + } else { this.planTemplateData[index].building[attacki].body[bodyi].attinf.splice(i, 1) } - + } - }else if(surveyName == '四周毗邻'){ + } else if (surveyName == '四周毗邻') { this.planTemplateData[index].building[attacki].body[bodyi].attinf.splice(i, 1) - this.planTemplateData[index].building[attacki].body[bodyi].attinf.splice(i-1, 1) + this.planTemplateData[index].building[attacki].body[bodyi].attinf.splice(i - 1, 1) } } }); - + } //分段上传 @@ -1634,7 +1634,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { preview() { this.pattern = 'look' this.clickTitleItem('单位概况') - + } quitPreview() { this.pattern = 'edit' @@ -1690,19 +1690,19 @@ export class CreatePlanOnlineFiveComponent implements OnInit { function condataurl(dataURL, charImg) { charImg.src = dataURL; } */ - + this.planTemplateData.forEach(element => { - if(element.groupName=='交通水源'||element.groupName=='重点图示'){ - if(element.attribute[0].imgArr.length>0){ - for(let i=0;i 0) { + for (let i = 0; i < element.attribute[0].imgArr.length; i++) { console.log(element.attribute[0].imgArr[i]) - element.attribute[0].imgArr[i]= String(element.attribute[0].imgArr[i]) +'?x-image-process=image/format,jpg' + element.attribute[0].imgArr[i] = String(element.attribute[0].imgArr[i]) + '?x-image-process=image/format,jpg' } } } }); console.log(this.planTemplateData) - + $(".mainbox").wordExport('word文档'); } //原数据点击 @@ -1713,50 +1713,50 @@ export class CreatePlanOnlineFiveComponent implements OnInit { //新增功能(社会联动等引用) searchType = '0' //打开自定义新增具体内容 - tuTrue=false - addAttribute(groupName,attacki?:any, bi?:any,fileNum?:any,surveyName?:string){ - let index = this.getArrayIndex(this.planTemplateData,'单位概况') + tuTrue = false + addAttribute(groupName, attacki?: any, bi?: any, fileNum?: any, surveyName?: string) { + let index = this.getArrayIndex(this.planTemplateData, '单位概况') const dialogRef = this.dialog.open(disaster, {//调用open方法打开对话框并且携带参数过去 width: '340px', - height:'450px', - disableClose:true, - data:this.planTemplateData + height: '450px', + disableClose: true, + data: this.planTemplateData }); dialogRef.afterClosed().subscribe(result => { - if(result!=undefined){ - if(surveyName==undefined){ - this.planTemplateData.forEach((value,index,array)=>{ - if(array[index].groupName==groupName){ - if(array[index].attribute==undefined){ - array[index].attribute=[] + if (result != undefined) { + if (surveyName == undefined) { + this.planTemplateData.forEach((value, index, array) => { + if (array[index].groupName == groupName) { + if (array[index].attribute == undefined) { + array[index].attribute = [] array[index].attribute.push(result) - }else{ + } else { array[index].attribute.push(result) } - if(result.level==2){ - for(let i=0;i{ - if (array[index].groupName==name) { - this.planTemplateData[index].attribute.splice(i,1) + if (isTrue) { + this.planTemplateData.forEach((value, index, array) => { + if (array[index].groupName == name) { + this.planTemplateData[index].attribute.splice(i, 1) } }) - + } - + } //自定义添加表格数据 - attackAdd(name,i,level){ + attackAdd(name, i, level) { //console.log(name,i) - this.planTemplateData.forEach((value,index,array)=>{ - if (array[index].groupName==name) { - if(level==1){ - this.planTemplateData[index].attribute[i].tableth.push('') - }else if(level==2){ - this.planTemplateData[index].attribute[i].tableth.push({head:'',body:''}) - } + this.planTemplateData.forEach((value, index, array) => { + if (array[index].groupName == name) { + if (level == 1) { + this.planTemplateData[index].attribute[i].tableth.push('') + } else if (level == 2) { + this.planTemplateData[index].attribute[i].tableth.push({ head: '', body: '' }) } - }) - - - + } + }) + + + //console.log(this.newleftTabledata) } //自定义模块删除一张图片 - delImg(key,attributei,imgkey){ + delImg(key, attributei, imgkey) { let isDelete = window.confirm('确定要删除该分组吗?分组下内容将一同被删除!') if (isDelete) { - this.planTemplateData[key].attribute[attributei].tableth.json.splice(imgkey,1) + this.planTemplateData[key].attribute[attributei].tableth.json.splice(imgkey, 1) } } //鼠标移入图片显示 - showTu(key){ - this.planTemplateData[key].new=true + showTu(key) { + this.planTemplateData[key].new = true } //上传 upload() { let isTrue = confirm('上传新文件后可能会覆盖原有数据，您确定要继续上传吗') - if(isTrue){ + if (isTrue) { document.getElementById('up').click() } } //在线文档上传接口 fileData - iftrue=false - fileSc(e){ + iftrue = false + fileSc(e) { this.clickTitleItem(this.planTemplateData[1]) - this.iftrue=true + this.iftrue = true const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 let formData = new FormData() formData.append("file", e.target.files[0]) console.log(formData) - let type=this.unitData.buildingTypes[0].name=='高层建筑'?1:this.unitData.buildingTypes[0].name=='居民小区'?2:this.unitData.buildingTypes[0].name=='厂房'?3 - :(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:this.unitData.buildingTypes[0].name=='储罐类'?'StorageTankFivePlan': - this.unitData.buildingTypes[0].name=='化工生产'?'ChemicalProductionFivePlan':this.unitData.buildingTypes[0].name=='轨道交通'?'MetroFivePlan': - this.unitData.buildingTypes[0].name=='地下建筑'?'UndergroundBuildingFivePlan':this.unitData.buildingTypes[0].name=='农村'?'CountrysideFivePlan':'' - - this.http.post(`/api/OfficeExtract/ExtractWordPlan?type=${type}`,formData).subscribe((data:any)=>{ + let type = this.unitData.buildingTypes[0].name == '高层建筑' ? 1 : this.unitData.buildingTypes[0].name == '居民小区' ? 2 : this.unitData.buildingTypes[0].name == '厂房' ? 3 + : (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 : this.unitData.buildingTypes[0].name == '储罐类' ? 'StorageTankFivePlan' : + this.unitData.buildingTypes[0].name == '化工生产' ? 'ChemicalProductionFivePlan' : this.unitData.buildingTypes[0].name == '轨道交通' ? 'MetroFivePlan' : + this.unitData.buildingTypes[0].name == '地下建筑' ? 'UndergroundBuildingFivePlan' : this.unitData.buildingTypes[0].name == '农村' ? 'CountrysideFivePlan' : '' + + this.http.post(`/api/OfficeExtract/ExtractWordPlan?type=${type}`, formData).subscribe((data: any) => { console.log(data) - if(data==null){ + if (data == null) { this.snackBar.open('解析失败,请确定好格式再重新上传!', '确定', config); - }else{ - this.fileData=JSON.parse(JSON.stringify(data)) - this.fileData.forEach((value,index,array) => { - if(value.groupName=='交通水源'||value.groupName=='重点图示'){ + } else { + this.fileData = JSON.parse(JSON.stringify(data)) + this.fileData.forEach((value, index, array) => { + if (value.groupName == '交通水源' || value.groupName == '重点图示') { value.attribute.forEach(element => { - if(element.imgArr!=undefined&&element.imgArr.length>0){ - element.imgArr[0]= "/api/"+element.imgArr[0].split('/api/')[1] + if (element.imgArr != undefined && element.imgArr.length > 0) { + element.imgArr[0] = "/api/" + element.imgArr[0].split('/api/')[1] //element.imgArr[0]=element.imgArr[0].slice(25,element.imgArr[0].length) //+'?x-image-process=image/format,png' } - + }); } - this.planTemplateData.forEach((pvalue,pindex,parr) => { - if(parr[1].building==undefined){ + this.planTemplateData.forEach((pvalue, pindex, parr) => { + if (parr[1].building == undefined) { this.planTemplateData[index].building = [] - if(array[index].groupName==parr[pindex].groupName){ - parr[pindex].attribute=array[index].attribute + if (array[index].groupName == parr[pindex].groupName) { + parr[pindex].attribute = array[index].attribute } - }else{ - if(array[index].groupName==parr[pindex].groupName&&pindex!=1){ - parr[pindex].attribute=array[index].attribute - }else if(array[index].groupName==parr[pindex].groupName&&pindex==1){ - parr[pindex].building[0].body=array[index].attribute + } else { + if (array[index].groupName == parr[pindex].groupName && pindex != 1) { + parr[pindex].attribute = array[index].attribute + } else if (array[index].groupName == parr[pindex].groupName && pindex == 1) { + parr[pindex].building[0].body = array[index].attribute } } }); - - }); - //console.log(this.fileData) - this.snackBar.open('解析成功!', '确定', config); + + }); + //console.log(this.fileData) + this.snackBar.open('解析成功!', '确定', config); } - this.iftrue=false - e.target.value='' + this.iftrue = false + e.target.value = '' }) } //消防设施新增一条数据 - zdyXf(groupName){ + zdyXf(groupName) { const dialogRef = this.dialog.open(disaster, {//调用open方法打开对话框并且携带参数过去 width: '340px', - height:'450px', - disableClose:true, - data:this.planTemplateData + height: '450px', + disableClose: true, + data: this.planTemplateData }); dialogRef.afterClosed().subscribe(result => { console.log(result) - if(result!=undefined){ - this.planTemplateData.forEach((value,index,array)=>{ - if(array[index].groupName==groupName){ - if(array[index].attribute==undefined){ - array[index].attribute=[] + if (result != undefined) { + this.planTemplateData.forEach((value, index, array) => { + if (array[index].groupName == groupName) { + if (array[index].attribute == undefined) { + array[index].attribute = [] array[index].attribute.push(result) - }else{ + } else { array[index].attribute.push(result) } - if(result.level==2){ - for(var i=0;i { console.log(result) - if(result!=undefined){ - if(result.length>this.planTemplateData.length){ - result.forEach((valuer,i,rarr) => { - let temp=0 - this.planTemplateData[index].attribute.forEach((group,gi,garr) => { - if(valuer.surveyName==group.surveyName){ + if (result != undefined) { + if (result.length > this.planTemplateData.length) { + result.forEach((valuer, i, rarr) => { + let temp = 0 + this.planTemplateData[index].attribute.forEach((group, gi, garr) => { + if (valuer.surveyName == group.surveyName) { temp++ } }) - if(temp==0){ + if (temp == 0) { //将缺少的填上 this.planTemplateData[index].attribute.push(valuer) } }); } - result.forEach((valuer,i,rarr) => { - this.planTemplateData[index].attribute.forEach((group,gi,garr) => { - if(garr[gi].surveyName==rarr[i].surveyName){ - garr[gi].completed=rarr[i].completed + result.forEach((valuer, i, rarr) => { + this.planTemplateData[index].attribute.forEach((group, gi, garr) => { + if (garr[gi].surveyName == rarr[i].surveyName) { + garr[gi].completed = rarr[i].completed } }); }) - this.planTemplateData[index].building[this.clicki].body=this.planTemplateData[index].attribute + this.planTemplateData[index].building[this.clicki].body = this.planTemplateData[index].attribute } - + console.log(this.planTemplateData) }) - + } //建筑信息和消防设施模板信息添加 - addBuildingmb(element){ - let index = this.getArrayIndex(this.planTemplateData,'单位概况') - console.log(element,this.buildingsData) + addBuildingmb(element) { + let index = this.getArrayIndex(this.planTemplateData, '单位概况') + console.log(element, this.buildingsData) const dialogRef = this.dialog.open(adddwsurveys, {//调用open方法打开对话框并且携带参数过去 width: '290px', - height:'460px', - disableClose:true, - data:{element:element,buildingID:this.buildingsData[0].basicCategoryId,fid:this.route.snapshot.queryParams.unitTypeId} + height: '460px', + disableClose: true, + data: { element: element, buildingID: this.buildingsData[0].basicCategoryId, fid: this.route.snapshot.queryParams.unitTypeId } }); dialogRef.afterClosed().subscribe(result => { - if(result!=undefined){ + if (result != undefined) { this.planTemplateData[index].building[this.clicki].body.forEach(item => { - if(item.surveyName==element.surveyName){ - element.attinf=result + if (item.surveyName == element.surveyName) { + element.attinf = result } }); } - + }) } //消防设施具体属性编辑 - fileAdd(facilityItems,filei,filename){ - let index = this.getArrayIndex(this.planTemplateData,'单位概况') - if(facilityItems.length!=0){ + fileAdd(facilityItems, filei, filename) { + let index = this.getArrayIndex(this.planTemplateData, '单位概况') + if (facilityItems.length != 0) { const dialogRef = this.dialog.open(adddwsurveys, {//调用open方法打开对话框并且携带参数过去 width: '240px', - height:'400px', - disableClose:true, - data:{facilityItems:facilityItems,filename,fid:this.route.snapshot.queryParams.unitTypeId} + height: '400px', + disableClose: true, + data: { facilityItems: facilityItems, filename, fid: this.route.snapshot.queryParams.unitTypeId } }); dialogRef.afterClosed().subscribe(result => { console.log(result) - if(result!=undefined){ + if (result != undefined) { this.planTemplateData[index].building[this.clicki].body.forEach(element => { - if(element.surveyName=='消防设施'){ - element.attinf[filei].facilityItems=result + if (element.surveyName == '消防设施') { + element.attinf[filei].facilityItems = result } }); } - + }) } } //单位概况自定义 - zdyDw(){ - let index = this.getArrayIndex(this.planTemplateData,'单位概况') + zdyDw() { + let index = this.getArrayIndex(this.planTemplateData, '单位概况') const dialogRef = this.dialog.open(zdyaddattinf, {//调用open方法打开对话框并且携带参数过去 width: '340px', - height:'200px', - disableClose:true, + height: '200px', + disableClose: true, //data:this.planTemplateData }); dialogRef.afterClosed().subscribe(result => { - if(result!=undefined){ - this.planTemplateData[index].building[this.clicki].body.push({surveyName:result.groupName,completed: true,attinf:[],zdy:true}) + if (result != undefined) { + this.planTemplateData[index].building[this.clicki].body.push({ surveyName: result.groupName, completed: true, attinf: [], zdy: true }) } - + }) - + } } @@ -2114,38 +2114,38 @@ export class yinYong { templateUrl: './newTitle.html', styleUrls: ['./create-plan-online-five.component.scss'] }) -export class newTitle{ - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - ngOnInit(){ +export class newTitle { + constructor(private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } + ngOnInit() { console.log(this.data) - if(this.data.planName!=undefined){ - this.planname=this.data.planName + if (this.data.planName != undefined) { + this.planname = this.data.planName } } planname//预案名称 //取消按钮 - close(){ + close() { this.dialogRef.close(); } //确定按钮 - planName(){ + planName() { const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - if(this.planname==''||this.planname==undefined){ + config.verticalPosition = 'top'; + config.duration = 3000 + if (this.planname == '' || this.planname == undefined) { this.snackBar.open('请输入名称', '确定', config); - }else{ + } else { this.data.planTemplateData.forEach(element => { - if(element.groupName==this.planname){ + if (element.groupName == this.planname) { this.snackBar.open('您输入的名称重复', '确定', config); - this.planname=undefined + this.planname = undefined this.dialogRef.close(); return } }); this.dialogRef.close(this.planname); } - + } } //新建模块新增具体内容 @@ -2154,51 +2154,51 @@ export class newTitle{ templateUrl: './Disaster.html', styleUrls: ['./addKeyname.scss'] }) -export class disaster{ - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - ngOnInit(): void{ - //console.log(this.data) +export class disaster { + constructor(private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } + ngOnInit(): void { + //console.log(this.data) } level//类型 headName//表头名称 lieNumber//列数 hNumber//行数 //取消按钮 - close(){ - this.dialogRef.close(); + close() { + this.dialogRef.close(); } - + //确定按钮 - newdisaster(){ + newdisaster() { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(this.level==undefined||this.level==''){ - this.snackBar.open('请选择类型!','确定',config); - }else if(this.headName==undefined||this.headName==''){ - this.snackBar.open('请输入表头名称!','确定',config); - }else if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){ - this.snackBar.open('列数不许为空,并且列数大于0!','确定',config); - }else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){ - this.snackBar.open('行数不许为空,并且行数大于0!!','确定',config); + if (this.level == undefined || this.level == '') { + this.snackBar.open('请选择类型!', '确定', config); + } else if (this.headName == undefined || this.headName == '') { + this.snackBar.open('请输入表头名称!', '确定', config); + } else if (this.level == 2 && (this.lieNumber == undefined || this.lieNumber == '')) { + this.snackBar.open('列数不许为空,并且列数大于0!', '确定', config); + } else if (this.level == 2 && (this.hNumber == undefined || this.hNumber == '')) { + this.snackBar.open('行数不许为空,并且行数大于0!!', '确定', config); } - else{ - let tree={ - json:[], + else { + let tree = { + json: [], name: '' } - let attrubute={ - headName:this.headName, - level:this.level, - tableth:this.level==1||this.level==2?[]:this.level==3?'':tree, - lieNumber:this.lieNumber, - hNumber:this.hNumber, + let attrubute = { + headName: this.headName, + level: this.level, + tableth: this.level == 1 || this.level == 2 ? [] : this.level == 3 ? '' : tree, + lieNumber: this.lieNumber, + hNumber: this.hNumber, imgArr: [], - zdy:true + zdy: true } this.dialogRef.close(attrubute); } - + } } //修改表格，都行文本行列 @@ -2207,59 +2207,59 @@ export class disaster{ templateUrl: './updatal.html', styleUrls: ['./addKeyname.scss'] }) -export class updataHl{ - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - ngOnInit(): void{ - JSON.parse(JSON.stringify(this.data)) - this.level=Number(this.data.level) - console.log(this.data) - this.lieNumber=this.level==2? this.data.tableth[0].length:0//最小列数 this.data.zdy!=undefined?0: - this.hNumber=this.level==2? this.data.tableth.length:0//行数this.data.zdy!=undefined?0: +export class updataHl { + constructor(private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } + ngOnInit(): void { + JSON.parse(JSON.stringify(this.data)) + this.level = Number(this.data.level) + console.log(this.data) + this.lieNumber = this.level == 2 ? this.data.tableth[0].length : 0//最小列数 this.data.zdy!=undefined?0: + this.hNumber = this.level == 2 ? this.data.tableth.length : 0//行数this.data.zdy!=undefined?0: } level//类型 - headName=this.data.headName//表头名称 + headName = this.data.headName//表头名称 lieNumber hNumber //取消按钮 - close(){ - this.dialogRef.close(); + close() { + this.dialogRef.close(); } - inputChange(){ + inputChange() { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){ - this.snackBar.open('请输入列数,并且列数大于0!','确定',config); + if (this.level == 2 && (this.lieNumber == undefined || this.lieNumber == '')) { + this.snackBar.open('请输入列数,并且列数大于0!', '确定', config); - }else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){ - this.snackBar.open('请输入行数,并且行数大于0!!','确定',config); + } else if (this.level == 2 && (this.hNumber == undefined || this.hNumber == '')) { + this.snackBar.open('请输入行数,并且行数大于0!!', '确定', config); } } //确定按钮 - newdisaster(){ - console.log(this.lieNumber,this.hNumber) - let result={ - lieNumber:this.level==2? this.lieNumber:this.data.tableth.length, - hNumber:this.hNumber + newdisaster() { + console.log(this.lieNumber, this.hNumber) + let result = { + lieNumber: this.level == 2 ? this.lieNumber : this.data.tableth.length, + hNumber: this.hNumber } const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(this.level==undefined||this.level==''){ - this.snackBar.open('请选择类型!','确定',config); - }else if(this.headName==undefined||this.headName==''){ - this.snackBar.open('请输入表头名称!','确定',config); - }else if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){ - this.snackBar.open('列数不许为空,并且列数大于0!','确定',config); - }else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){ - this.snackBar.open('行数不许为空,并且行数大于0!!','确定',config); - }else if(this.level==1&& this.data.tableth.length<=0){ - this.snackBar.open('列数不许为空,并且列数大于0!','确定',config); + if (this.level == undefined || this.level == '') { + this.snackBar.open('请选择类型!', '确定', config); + } else if (this.headName == undefined || this.headName == '') { + this.snackBar.open('请输入表头名称!', '确定', config); + } else if (this.level == 2 && (this.lieNumber == undefined || this.lieNumber == '')) { + this.snackBar.open('列数不许为空,并且列数大于0!', '确定', config); + } else if (this.level == 2 && (this.hNumber == undefined || this.hNumber == '')) { + this.snackBar.open('行数不许为空,并且行数大于0!!', '确定', config); + } else if (this.level == 1 && this.data.tableth.length <= 0) { + this.snackBar.open('列数不许为空,并且列数大于0!', '确定', config); } - else{ + else { this.dialogRef.close(result); } - + } } //建筑跟消防设施添加模板数据 @@ -2268,260 +2268,260 @@ export class updataHl{ templateUrl: './addattinf.html', styleUrls: ['./addgroup.scss'] }) -export class adddwsurveys{ - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - addAttinfBuild=[] - buildnewDate=[] +export class adddwsurveys { + constructor(private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } + addAttinfBuild = [] + buildnewDate = [] addAttinfFile//过滤消防设施外层数据 - filenewDate=[] + filenewDate = [] facilityItems//过滤消防设施最内层数据 facilityCategoryId//消防设施内容id zdyData//模板传过来自定义的数据 - ngOnInit(): void{ + ngOnInit(): void { this.getinf() console.log(this.data) - + } - async getinf(){ - if(this.data.facilityItems==undefined){ - if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf==undefined){ - this.addAttinfBuild=[] - let paramsdata:any ={ - categoryId:this.data.buildingID + async getinf() { + if (this.data.facilityItems == undefined) { + if (this.data.element.surveyName == '建筑信息' && this.data.element.attinf == undefined) { + this.addAttinfBuild = [] + let paramsdata: any = { + categoryId: this.data.buildingID } - this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{ + this.http.get("/api/BasicGroups", { params: paramsdata }).subscribe((data: any) => { data.forEach(buildDate => { this.addAttinfBuild.push(...buildDate.propertyInfos) - + }); this.addAttinfBuild.forEach(element => { - element.completed=false - element.olddata=element.propertyValue + element.completed = false + element.olddata = element.propertyValue }); console.log(this.addAttinfBuild) }) - }else if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf!=undefined){ - this.buildnewDate=[] //接受接口返回的新数据 - this.addAttinfBuild=this.data.element.attinf.filter(item=>{ - return item.zdy==undefined + } else if (this.data.element.surveyName == '建筑信息' && this.data.element.attinf != undefined) { + this.buildnewDate = [] //接受接口返回的新数据 + this.addAttinfBuild = this.data.element.attinf.filter(item => { + return item.zdy == undefined }) //模板传过来的非自定义数据 - this.zdyData=this.data.element.attinf.filter(item=>{ - return item.zdy!=undefined + this.zdyData = this.data.element.attinf.filter(item => { + return item.zdy != undefined })//模板传过来自定义数据 - this.addAttinfBuild=JSON.parse(JSON.stringify(this.addAttinfBuild)) + this.addAttinfBuild = JSON.parse(JSON.stringify(this.addAttinfBuild)) console.log(this.addAttinfBuild) - let paramsdata:any ={ - categoryId:this.data.buildingID + let paramsdata: any = { + categoryId: this.data.buildingID } /* 请求接口，做差异化对比 */ - let restlt=await new Promise((resolve) => { - this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{ - data.forEach((buildDate,buildi,buildarr) => { + let restlt = await new Promise((resolve) => { + this.http.get("/api/BasicGroups", { params: paramsdata }).subscribe((data: any) => { + data.forEach((buildDate, buildi, buildarr) => { this.buildnewDate.push(...buildarr[buildi].propertyInfos) resolve(data) }); this.buildnewDate.forEach(element => { - element.completed=false - element.olddata=element.propertyValue + element.completed = false + element.olddata = element.propertyValue }); }) - }) - this.buildnewDate=JSON.parse(JSON.stringify(this.buildnewDate)) - //差异化比较 - let temp=0 - this.buildnewDate.forEach((buildval,buindi,buildarr)=>{ - temp=0 - this.addAttinfBuild.forEach((addval,addi,addarr)=>{ - if(buildval.propertyName==addval.propertyName){ - temp++ - } - }) - if(temp==0){ - //模板数据少于接口数据 - // console.log(buildval) - this.addAttinfBuild.push(buildval) + }) + this.buildnewDate = JSON.parse(JSON.stringify(this.buildnewDate)) + //差异化比较 + let temp = 0 + this.buildnewDate.forEach((buildval, buindi, buildarr) => { + temp = 0 + this.addAttinfBuild.forEach((addval, addi, addarr) => { + if (buildval.propertyName == addval.propertyName) { + temp++ } }) - this.addAttinfBuild.forEach((addval,addi,addarr)=>{ - temp=0 - this.buildnewDate.forEach((buildval,buindi,buildarr)=>{ - if(buildarr[buindi].propertyName==addarr[addi].propertyName){ - temp++ - } - }) - if(temp==0){ - console.log(addarr[addi]) - //模板数据多了 - this.addAttinfBuild.splice(addi,1) + if (temp == 0) { + //模板数据少于接口数据 + // console.log(buildval) + this.addAttinfBuild.push(buildval) + } + }) + this.addAttinfBuild.forEach((addval, addi, addarr) => { + temp = 0 + this.buildnewDate.forEach((buildval, buindi, buildarr) => { + if (buildarr[buindi].propertyName == addarr[addi].propertyName) { + temp++ } }) - this.addAttinfBuild.push(...this.zdyData) - console.log(this.buildnewDate) - console.log(this.addAttinfBuild) - - }else if(this.data.element.surveyName=='消防设施'&&this.data.element.attinf==undefined){ - this.http.get("/api/BuildingTypes").subscribe((buildData:any)=>{ + if (temp == 0) { + console.log(addarr[addi]) + //模板数据多了 + this.addAttinfBuild.splice(addi, 1) + } + }) + this.addAttinfBuild.push(...this.zdyData) + console.log(this.buildnewDate) + console.log(this.addAttinfBuild) + + } else if (this.data.element.surveyName == '消防设施' && this.data.element.attinf == undefined) { + this.http.get("/api/BuildingTypes").subscribe((buildData: any) => { console.log(buildData) buildData.forEach(element => { - if(element.id==this.data.fid){ - this.facilityCategoryId=element.facilityCategoryId - let paramsdata:any ={ - categoryId:this.facilityCategoryId + if (element.id == this.data.fid) { + this.facilityCategoryId = element.facilityCategoryId + let paramsdata: any = { + categoryId: this.facilityCategoryId } - this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{ + this.http.get("/api/FacilityGroups", { params: paramsdata }).subscribe((data: any) => { console.log(data) - this.addAttinfFile=data + this.addAttinfFile = data this.addAttinfFile.forEach(element => { - element.completed=false - element.value='' + element.completed = false + element.value = '' }); console.log(this.addAttinfFile) }) } }); }) - - }else if(this.data.element.surveyName=='消防设施'&&this.data.element.attinf!=undefined){ - this.filenewDate=[] - this.addAttinfFile=this.data.element.attinf.filter(element => { - return element.zdy==false + + } else if (this.data.element.surveyName == '消防设施' && this.data.element.attinf != undefined) { + this.filenewDate = [] + this.addAttinfFile = this.data.element.attinf.filter(element => { + return element.zdy == false + }); + this.zdyData = this.data.element.attinf.filter(element => { + return element.zdy != undefined }); - this.zdyData=this.data.element.attinf.filter(element => { - return element.zdy!=undefined - }); //this.addAttinfFile=JSON.parse(JSON.stringify(this.addAttinfFile)) - console.log(this.addAttinfFile,this.zdyData) - let restlt=await new Promise((resolve) => { - this.http.get("/api/BuildingTypes").subscribe((buildData:any)=>{ + console.log(this.addAttinfFile, this.zdyData) + let restlt = await new Promise((resolve) => { + this.http.get("/api/BuildingTypes").subscribe((buildData: any) => { buildData.forEach(async element => { - if(element.id==this.data.fid){ - this.facilityCategoryId=element.facilityCategoryId - let paramsdata:any ={ - categoryId:this.facilityCategoryId + if (element.id == this.data.fid) { + this.facilityCategoryId = element.facilityCategoryId + let paramsdata: any = { + categoryId: this.facilityCategoryId } - this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{ - data.forEach((buildDate,buildi,buildarr) => { - this.filenewDate.push(buildDate) - resolve(data) - }); - this.filenewDate.forEach(element => { - element.completed=false - //element.olddata=element.propertyValue - }); - }) + this.http.get("/api/FacilityGroups", { params: paramsdata }).subscribe((data: any) => { + data.forEach((buildDate, buildi, buildarr) => { + this.filenewDate.push(buildDate) + resolve(data) + }); + this.filenewDate.forEach(element => { + element.completed = false + //element.olddata=element.propertyValue + }); + }) } }) }) }) - - - this.filenewDate=JSON.parse(JSON.stringify(this.filenewDate)) - console.log(this.filenewDate) - let temp=0 - this.filenewDate.forEach((buildval,buindi,buildarr)=>{ - temp=0 - this.addAttinfFile.forEach((addval,addi,addarr)=>{ - if(buildval.name==addval.name){ - temp++ - } - }) - if(temp==0){ - //console.log(buildval) - this.addAttinfFile.push(buildval) + + + this.filenewDate = JSON.parse(JSON.stringify(this.filenewDate)) + console.log(this.filenewDate) + let temp = 0 + this.filenewDate.forEach((buildval, buindi, buildarr) => { + temp = 0 + this.addAttinfFile.forEach((addval, addi, addarr) => { + if (buildval.name == addval.name) { + temp++ } }) - this.addAttinfFile.forEach((addval,addi,addarr)=>{ - temp=0 - this.filenewDate.forEach((buildval,buindi,buildarr)=>{ - if(buildval.name==addval.name){ - temp++ - } - - }) - if(temp==0){ - this.addAttinfFile.splice(addi,1) + if (temp == 0) { + //console.log(buildval) + this.addAttinfFile.push(buildval) + } + }) + this.addAttinfFile.forEach((addval, addi, addarr) => { + temp = 0 + this.filenewDate.forEach((buildval, buindi, buildarr) => { + if (buildval.name == addval.name) { + temp++ } + }) - this.addAttinfFile.push(...this.zdyData) + if (temp == 0) { + this.addAttinfFile.splice(addi, 1) + } + }) + this.addAttinfFile.push(...this.zdyData) } - }else{ + } else { //消防设施最里层数据 - let apifile - this.facilityItems=this.data.facilityItems.filter(element => { - return element.zdy==undefined - }); - this.zdyData=this.data.facilityItems.filter(element => { - return element.zdy!=undefined - }); - this.facilityItems=JSON.parse(JSON.stringify(this.facilityItems)) - console.log(this.facilityItems) - //请求接口，看数据是否有变化 - let paramsdata:any ={ - categoryId:this.data.fid - } - this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((buildData:any)=>{ - buildData.forEach(async element => { - if(element.id==this.data.fid){ - this.facilityCategoryId=element.facilityCategoryId - let paramsdata:any ={ - categoryId:this.facilityCategoryId - } - let fileResult=await new Promise((resolve) => { - this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{ - resolve(data) - }) - }) - apifile=fileResult - let apifileData//消防设施最内层数据 - apifile.forEach(element => { - if(element.name==this.data.filename){ - apifileData=element.facilityItems - } - }); - console.log(apifileData) - let temp=0 - apifileData.forEach((buildval,buindi,buildarr)=>{ - temp=0 - this.facilityItems.forEach((addval,addi,addarr)=>{ - if(buildval.name==addval.name){ - temp++ - } - }) - if(temp==0){ - console.log(buildval) - this.facilityItems.push(buildval) + let apifile + this.facilityItems = this.data.facilityItems.filter(element => { + return element.zdy == undefined + }); + this.zdyData = this.data.facilityItems.filter(element => { + return element.zdy != undefined + }); + this.facilityItems = JSON.parse(JSON.stringify(this.facilityItems)) + console.log(this.facilityItems) + //请求接口，看数据是否有变化 + let paramsdata: any = { + categoryId: this.data.fid + } + this.http.get("/api/FacilityGroups", { params: paramsdata }).subscribe((buildData: any) => { + buildData.forEach(async element => { + if (element.id == this.data.fid) { + this.facilityCategoryId = element.facilityCategoryId + let paramsdata: any = { + categoryId: this.facilityCategoryId } - }) - this.facilityItems.forEach((addval,addi,addarr)=>{ - temp=0 - apifileData.forEach((buildval,buindi,buildarr)=>{ - if(buildarr[buindi].name==addarr[addi].name){ - temp++ + let fileResult = await new Promise((resolve) => { + this.http.get("/api/FacilityGroups", { params: paramsdata }).subscribe((data: any) => { + resolve(data) + }) + }) + apifile = fileResult + let apifileData//消防设施最内层数据 + apifile.forEach(element => { + if (element.name == this.data.filename) { + apifileData = element.facilityItems } - if(temp==0){ - console.log(addarr[addi]) - this.facilityItems.splice(addi,1) + }); + console.log(apifileData) + let temp = 0 + apifileData.forEach((buildval, buindi, buildarr) => { + temp = 0 + this.facilityItems.forEach((addval, addi, addarr) => { + if (buildval.name == addval.name) { + temp++ + } + }) + if (temp == 0) { + console.log(buildval) + this.facilityItems.push(buildval) } }) - - }) - } + this.facilityItems.forEach((addval, addi, addarr) => { + temp = 0 + apifileData.forEach((buildval, buindi, buildarr) => { + if (buildarr[buindi].name == addarr[addi].name) { + temp++ + } + if (temp == 0) { + console.log(addarr[addi]) + this.facilityItems.splice(addi, 1) + } + }) + + }) + } + }) }) - }) - this.facilityItems.push(...this.zdyData) + this.facilityItems.push(...this.zdyData) } - - + + } //取消按钮 -close(){ - this.dialogRef.close(undefined); -} -//确定按钮 -defineClick(){ - this.dialogRef.close(this.data.element!=undefined&&this.data.element.surveyName=='建筑信息'? - this.addAttinfBuild:this.data.element!=undefined&&this.data.element.surveyName=='消防设施'?this.addAttinfFile:this.facilityItems) -} + close() { + this.dialogRef.close(undefined); + } + //确定按钮 + defineClick() { + this.dialogRef.close(this.data.element != undefined && this.data.element.surveyName == '建筑信息' ? + this.addAttinfBuild : this.data.element != undefined && this.data.element.surveyName == '消防设施' ? this.addAttinfFile : this.facilityItems) + } } diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index e387a1c..aa396aa 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -788,8 +788,10 @@ export class EntryPlanLookComponent implements OnInit { : (this.unitdata.unittype == '商市场' || this.unitdata.unittype == '医院' || this.unitdata.unittype == '学校' || this.unitdata.unittype == '宾馆' || this.unitdata.unittype == '娱乐场所' || this.unitdata.unittype == '餐饮业' || this.unitdata.unittype == '影剧院' || this.unitdata.unittype == '展览建筑' || this.unitdata.unittype == '养老院' - || this.unitdata.unittype == '会议中心') ? 4 : this.unitdata.unittype == '储罐类' ? 'StorageTankFivePlan' - : this.unitdata.unittype == '化工生产' ? 'ChemicalProductionFivePlan' : this.unitdata.unittype == '农村' ? 'CountrysideFivePlan' : '' + || this.unitdata.unittype == '会议中心') ? 4 : this.unitdata.unittype == '储罐类' ? 'StorageTankFivePlan' : + this.unitdata.unittype == '化工生产' ? 'ChemicalProductionFivePlan' : this.unitdata.unittype == '轨道交通' ? 'MetroFivePlan' : + this.unitdata.unittype == '地下建筑' ? 'UndergroundBuildingFivePlan' : this.unitdata.unittype == '农村' ? 'CountrysideFivePlan' : '' + let blob = [] /* 调用下载接口获取文件流,并赋值给blob