From 311da85ea15ecde5bac9eee42ac5929b51d2a249 Mon Sep 17 00:00:00 2001 From: Sjh <55341701@qq.com> Date: Sun, 26 Jan 2025 17:29:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=A2=84=E6=A1=88=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.component.ts | 2 +- .../entry-plan/entry-plan.component.ts | 34 +++++++++---------- .../statistic-analysis/home/home.component.ts | 4 +-- src/index.html | 4 +-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index e5e7c7c..f5c3d44 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -25,7 +25,7 @@ export class AppComponent { isMaskLayerShow: boolean = false; ngOnInit(): void { - console.log("更新日期2024.10.23"); + console.log("更新日期2025.01.07"); //监听遮罩层 this.maskLayerService.getMessage().subscribe((message: any) => { diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index a9f5959..7c60918 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -415,23 +415,23 @@ export class EntryPlanComponent implements OnInit { routerTo(element) { this.level == "0" ? (this.operation = false) : true; sessionStorage.setItem("companyName", element.company.name); - window.open( - `/planManagement/entryPlandetail?unitId=${ - element.company.id - }&unitTypeId=${ - element.company.buildingTypes.length == 0 - ? null - : element.company.buildingTypes[0].id - }&operation=${this.operation}&pagetype=entryplan&unitName=${ - element.company.name - }&orName=${element.company.organizationName}&orId=${ - element.company.organizationId - }&unitType=${ - element.company.buildingTypes.length == 0 - ? null - : element.company.buildingTypes[0].name - }&unitAdd=${element.company.address}&usci=${element.company.usci}` - ); + const buildingType = element.company.buildingTypes[0] || {}; + const unitTypeId = buildingType.id || null; + const unitTypeName = buildingType.name || null; + + const params = new URLSearchParams({ + unitId: element.company.id.toString(), // 确保是字符串 + unitTypeId: unitTypeId ? unitTypeId.toString() : "", // 确保是字符串 + operation: this.operation.toString(), // 将 boolean 转换为字符串 + pagetype: "entryplan", + unitName: element.company.name.toString(), // 确保是字符串 + orName: element.company.organizationName.toString(), // 确保是字符串 + orId: element.company.organizationId.toString(), // 确保是字符串 + unitType: unitTypeName ? unitTypeName.toString() : "", // 确保是字符串 + unitAdd: element.company.address.toString(), // 确保是字符串 + usci: element.company.usci.toString(), // 确保是字符串 + }); + window.open(`/planManagement/entryPlandetail?${params.toString()}`); } //查询 onSubmit(value) { diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts index 46822f8..a2dc7fb 100644 --- a/src/app/statistic-analysis/home/home.component.ts +++ b/src/app/statistic-analysis/home/home.component.ts @@ -567,9 +567,9 @@ export class HomeComponent implements OnInit { } enum PlanStatusType { - "New" = "预案新增", + "New" = "未提交审核", "Auditing" = "预案审核中", "Approved" = "预案审核通过", "Rejected" = "预案审核退回", - "Editing" = "预案编制", + "Editing" = "退回修改中", } diff --git a/src/index.html b/src/index.html index a6899a6..d0aa01d 100644 --- a/src/index.html +++ b/src/index.html @@ -24,9 +24,9 @@ securityJsCode: 'dca2583973d0448116433fd64f97f8f8' } - +