From 1421fbd8bedca352704c0f926e800156a3ef528f Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 23 Jul 2021 15:07:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wait-examineer.component.ts | 102 +++++++++--------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index 2ca7838..2a443eb 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -165,7 +165,7 @@ export class WaitExamineerComponent implements OnInit { differentContentOfBuildingsInfo: any//当前单位变更数据 之 建筑信息 differentContentOfFunction: any = []//当前单位变更数据 之 功能分区 differentContentOfPicture: any//当前单位变更数据 之 实景图 - bianzhi=false + bianzhi = false radioClick(e, item) { this.selectedItem = item console.log(item) @@ -179,23 +179,25 @@ export class WaitExamineerComponent implements OnInit { // 实景图 this.differentContentOfPicture = differentContent.filter(item => item.propertyName == 'realityImageGroups') - //建筑信息 - this.differentContentOfBuildingsInfo = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0])) - this.differentContentOfBuildingsInfo.childrens.forEach(element => { - element.childrens = element.childrens.filter(item => item.isObj == false) - }); - //功能分区 - let differentContentOfFunction = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0])) - this.differentContentOfFunction = [] - differentContentOfFunction.childrens.forEach(item => { - item.childrens.forEach(i => { - if (i.propertyName == "buildingFunctionalDivisions") { - i.propertyName = item.propertyName - this.differentContentOfFunction.push(i) - } - }); - }); + if (differentContent.filter(item => item.propertyName == 'buildings').length != 0) { + //建筑信息 + this.differentContentOfBuildingsInfo = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0])) + this.differentContentOfBuildingsInfo.childrens.forEach(element => { + element.childrens = element.childrens.filter(item => item.isObj == false) + }); + //功能分区 + let differentContentOfFunction = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0])) + this.differentContentOfFunction = [] + differentContentOfFunction.childrens.forEach(item => { + item.childrens.forEach(i => { + if (i.propertyName == "buildingFunctionalDivisions") { + i.propertyName = item.propertyName + this.differentContentOfFunction.push(i) + } + }); + }); + } } @@ -210,22 +212,22 @@ export class WaitExamineerComponent implements OnInit { this.id = item.id this.fetchUrl = '' this.viewer = {} - + if (item.contentType == 11) { - this.bianzhi=false + this.bianzhi = false window.setTimeout(() => { this.showtype = 3 sessionStorage.setItem('companyId', item.itemId) }, 0) } else if (item.contentType == 12) { - this.bianzhi=false + this.bianzhi = false //水源 this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data) => { this.waterData = data this.showtype = 12 }) } else if (item.contentType == 13) { - this.bianzhi=false + this.bianzhi = false //消防力量 this.http.get(`/api/CustomFireForce/${item.itemId}`).subscribe((data: any) => { if (data.forceType != 0) {//如果是其他消防力量 @@ -247,7 +249,7 @@ export class WaitExamineerComponent implements OnInit { }) } else if (item.contentType == 14) { - this.bianzhi=false + this.bianzhi = false //联动力量 this.http.get(`/api/LinkageForces/${item.itemId}`).subscribe((data: any) => { @@ -261,35 +263,35 @@ export class WaitExamineerComponent implements OnInit { this.companyId = data.companyId this.companyName = data.companyName if (data.planType != 2 && data.planType != 1) { - if(data.planMode==2){ - this.bianzhi=true - this.src=`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false` + if (data.planMode == 2) { + this.bianzhi = true + this.src = `/planManagement/createplanonlinefive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false` //this.src=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}` - }else{ - this.bianzhi=false - this.fetchUrl = data.attachmentUrls[0] - var index = this.fetchUrl.indexOf("\/") - if (this.fetchUrl.substr(0, index) == 'psw') { - this.showtype = 1 - var obj = document.getElementById('viewer') - if (obj != null) { - obj.innerHTML = '' - } - window.setTimeout(() => { - this.viewer = new photoViewer({ - container: document.querySelector('#viewer'), - panorama: '/api/Objects/PlanPlatform/' + this.fetchUrl, - - }); - }) - } else { - this.lookWord() - } + this.bianzhi = false + this.fetchUrl = data.attachmentUrls[0] + var index = this.fetchUrl.indexOf("\/") + if (this.fetchUrl.substr(0, index) == 'psw') { + this.showtype = 1 + var obj = document.getElementById('viewer') + if (obj != null) { + obj.innerHTML = '' + } + window.setTimeout(() => { + this.viewer = new photoViewer({ + container: document.querySelector('#viewer'), + panorama: '/api/Objects/PlanPlatform/' + this.fetchUrl, + + }); + }) + + } else { + this.lookWord() + } } - + } else { - this.bianzhi=false + this.bianzhi = false this.organizationName = item.organizationName this.planData = data this.handleData() @@ -319,13 +321,13 @@ export class WaitExamineerComponent implements OnInit { //毕升 lookWord() { this.showtype = 0 - let src + let src let suffix = this.fetchUrl.split('.')[this.fetchUrl.split('.').length - 1].toLowerCase() if (suffix == 'docx' || suffix == 'doc') { let arr = this.fetchUrl.split('.') arr[arr.length - 1] = 'pdf' - src = `/api/Objects/PlanPlatform/` + arr.join('.') - }else if (suffix == 'pdf') { + src = `/api/Objects/PlanPlatform/` + arr.join('.') + } else if (suffix == 'pdf') { src = `/api/Objects/PlanPlatform/` + this.fetchUrl } this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src);