From 3b3d841de0f9275fb4788f627d6f844a92d7dd33 Mon Sep 17 00:00:00 2001 From: Sjh <55341701@qq.com> Date: Sun, 4 Feb 2024 15:42:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]linksPlan=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0unitId=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/app/app-routing.module.ts | 2 +- .../external-links-plan.component.html | 8 +- .../external-links-plan.component.ts | 160 ++++++++++-------- 4 files changed, 98 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index c7a7bb5..c9002ee 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve --proxy-config proxy.config.json --open --port 51423 --host 192.168.1.82", + "start": "ng serve --proxy-config proxy.config.json --open", "build": "ng build", "build-prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod", "publish": "ng build --prod --verbose", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index fa9e3a0..a2bc35b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -41,7 +41,7 @@ const routes: Routes = [ {path:'keyUnit/viewunitinfoplans', component:ViewUnitDetailsPlanComponent,canActivate: [AuthGuard],}, {path:'getNoMToken',component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面 {path:'planAudit/planpass', component: PlanPassComponent , canActivate: [AuthGuard]}, - {path:'test', component: TestComponent }, + // {path:'test', component: TestComponent }, {path:'linksPlan', component: ExternalLinksPlanComponent }, {path:'CreatePlanOnlineFive',component:CreatePlanOnlineFiveComponent}, {path:'exportExcel',component:ExportExcelComponent, canActivate: [AuthGuard]}, diff --git a/src/app/external-links-plan/external-links-plan.component.html b/src/app/external-links-plan/external-links-plan.component.html index cdb65b3..a9f07a1 100644 --- a/src/app/external-links-plan/external-links-plan.component.html +++ b/src/app/external-links-plan/external-links-plan.component.html @@ -1,4 +1,4 @@ - + @@ -68,6 +68,6 @@ - - - \ No newline at end of file +
+ +
\ No newline at end of file diff --git a/src/app/external-links-plan/external-links-plan.component.ts b/src/app/external-links-plan/external-links-plan.component.ts index 1741c02..7d6a9e1 100644 --- a/src/app/external-links-plan/external-links-plan.component.ts +++ b/src/app/external-links-plan/external-links-plan.component.ts @@ -25,84 +25,108 @@ export class ExternalLinksPlanComponent implements OnInit { showType; //预案类型 1：全景图 planData; //预案信息 + unitId; async ngOnInit(): Promise { await this.login(); //登录存储token this.route.queryParams.subscribe((paramsData) => { - this.planId = paramsData.planId; - this.http - .get(`/api/PlanComponents/${this.planId}`) - .subscribe((data: any) => { - console.log("单个预案详细信息", data); - sessionStorage.setItem("planId", data.id); - sessionStorage.setItem("companyId", data.companyId); - sessionStorage.setItem( - "buildingTypeId", - data.company.buildingTypes[0].id - ); - sessionStorage.setItem("editable", "0"); - sessionStorage.setItem("planName", data.name); - let queryParams = {}; - if (data.webTextData && data.planType === 16) { - queryParams = { - id: data.companyId, - planId: data.id, - orName: data.company.organizationName, - orId: data.company.organizationId, - companyId: data.companyId, - planName: data.name, - unitName: data.companyName, - planCategory: data.planCategory, - unitTypeId: data.company.buildingTypes[0].id, - pattern: "false", - }; - } else { - queryParams = { - id: data.companyId, - planId: data.id, - orName: data.company.organizationName, - orId: data.company.organizationId, - }; - } - this.router.navigate([`/linksPlan`], { - queryParams: queryParams, - }); - this.planData = data; - - //如果是查看文件类型 - - console.log("data.planType", data.planType); - if (data.planType != 1 && data.planType != 2) { - this.fetchUrl = data.attachmentUrls ? data.attachmentUrls[0] : ""; - var index = this.fetchUrl.indexOf("/"); - - // 在线编制预案 + if (paramsData.planId) { + this.planId = paramsData.planId; + this.http + .get(`/api/PlanComponents/${this.planId}`) + .subscribe((data: any) => { + console.log("单个预案详细信息", data); + sessionStorage.setItem("planId", data.id); + sessionStorage.setItem("companyId", data.companyId); + sessionStorage.setItem( + "buildingTypeId", + data.company.buildingTypes[0].id + ); + sessionStorage.setItem("editable", "0"); + sessionStorage.setItem("planName", data.name); + let queryParams = {}; if (data.webTextData && data.planType === 16) { - this.showType = 2; - return; + queryParams = { + id: data.companyId, + planId: data.id, + orName: data.company.organizationName, + orId: data.company.organizationId, + companyId: data.companyId, + planName: data.name, + unitName: data.companyName, + planCategory: data.planCategory, + unitTypeId: data.company.buildingTypes[0].id, + pattern: "false", + }; + } else { + queryParams = { + id: data.companyId, + planId: data.id, + orName: data.company.organizationName, + orId: data.company.organizationId, + }; } + this.router.navigate([`/linksPlan`], { + queryParams: queryParams, + }); + this.planData = data; - //全景图图片 - if (this.fetchUrl.substr(0, index) == "psw") { - this.showType = 1; - var obj = document.getElementById("viewer"); - if (obj != null) { - obj.innerHTML = ""; + //如果是查看文件类型 + + console.log("data.planType", data.planType); + if (data.planType != 1 && data.planType != 2) { + this.fetchUrl = data.attachmentUrls ? data.attachmentUrls[0] : ""; + var index = this.fetchUrl.indexOf("/"); + + // 在线编制预案 + if (data.webTextData && data.planType === 16) { + this.showType = 2; + return; } - window.setTimeout(() => { - this.viewer = new Viewer({ - container: document.querySelector("#viewer"), - panorama: "/api/Objects/PlanPlatform/" + this.fetchUrl, + + //全景图图片 + 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 Viewer({ + container: document.querySelector("#viewer"), + panorama: "/api/Objects/PlanPlatform/" + this.fetchUrl, + }); }); - }); + } else { + //word文档 + this.lookWord(); + } } else { - //word文档 - this.lookWord(); + // 如果是二三维预案 + this.handleData(); } - } else { - // 如果是二三维预案 - this.handleData(); - } - }); + }); + } else if (paramsData.unitId) { + this.http + .get(`/api/Companies/${paramsData.unitId}`) + .subscribe((data: any) => { + console.log("单位信息", data); + sessionStorage.setItem("editable", "0"); + sessionStorage.setItem("companyName", data.name); + sessionStorage.setItem("companyId", data.id); + sessionStorage.setItem( + data.id, + JSON.stringify(data.companyIntegrityScore) + ); + let queryParams = { + id: data.id, + usci: data.usci, + }; + this.unitId = paramsData.unitId; + this.router.navigate([`/linksPlan`], { + queryParams: queryParams, + }); + }); + } }); }