[完善]预案状态字段

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) => {

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(
+    const buildingType = element.company.buildingTypes[0] || {};
-      `/planManagement/entryPlandetail?unitId=${
+    const unitTypeId = buildingType.id || null;
-        element.company.id
+    const unitTypeName = buildingType.name || null;
-      }&unitTypeId=${
+
-        element.company.buildingTypes.length == 0
+    const params = new URLSearchParams({
-          ? null
+      unitId: element.company.id.toString(), // 确保是字符串
-          : element.company.buildingTypes[0].id
+      unitTypeId: unitTypeId ? unitTypeId.toString() : "", // 确保是字符串
-      }&operation=${this.operation}&pagetype=entryplan&unitName=${
+      operation: this.operation.toString(), // 将 boolean 转换为字符串
-        element.company.name
+      pagetype: "entryplan",
-      }&orName=${element.company.organizationName}&orId=${
+      unitName: element.company.name.toString(), // 确保是字符串
-        element.company.organizationId
+      orName: element.company.organizationName.toString(), // 确保是字符串
-      }&unitType=${
+      orId: element.company.organizationId.toString(), // 确保是字符串
-        element.company.buildingTypes.length == 0
+      unitType: unitTypeName ? unitTypeName.toString() : "", // 确保是字符串
-          ? null
+      unitAdd: element.company.address.toString(), // 确保是字符串
-          : element.company.buildingTypes[0].name
+      usci: element.company.usci.toString(), // 确保是字符串
-      }&unitAdd=${element.company.address}&usci=${element.company.usci}`
+    });
-    );
+    window.open(`/planManagement/entryPlandetail?${params.toString()}`);
   }
   //查询
   onSubmit(value) {

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" = "退回修改中",
 }

src/index.html

@@ -24,9 +24,9 @@
     securityJsCode: 'dca2583973d0448116433fd64f97f8f8'
   }
 </script>
-<!-- <script
+<script
   src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=2584e43582b85680d76a515979503538&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
+<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
 <!-- <script
   src="https://webapi.amap.com/maps?v=2.0&key=2584e43582b85680d76a515979503538&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
 <script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->