From 0f590ef960728b156b8c787a6e586bf6100b535d Mon Sep 17 00:00:00 2001 From: wzy-warehouse <18135009705@163.com> Date: Wed, 17 Jun 2026 14:23:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E6=B5=8B=E6=A6=82?= =?UTF-8?q?=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.ts | 14 +++++--- src/api/hidden-danger-spots.ts | 34 ++++++++++++------- src/api/risk-spots.ts | 20 ++++++----- .../basic/CollapseComponent.vue | 5 ++- .../basic/DebrisFlowComponent.vue | 5 ++- .../basic/FlashFloodComponent.vue | 5 ++- .../basic/LandslideComponent.vue | 5 ++- .../basic/RiskPointComponent.vue | 15 ++++---- src/hooks/rain-earthquake/useHiddenPoint.ts | 1 + src/hooks/rain-earthquake/useRiskPoint.ts | 1 + src/types/base/Point.ts | 2 ++ 11 files changed, 71 insertions(+), 36 deletions(-) diff --git a/src/api/api.ts b/src/api/api.ts index a98af06..6e2d4da 100644 --- a/src/api/api.ts +++ b/src/api/api.ts @@ -87,12 +87,14 @@ export const $api = { /** * 根据id获取隐患点详情 * @param id - 隐患点id + * @param simulationId - 模拟id * @returns 隐患点详情 */ getPointDetailById: ( - id: number + id: number, + simulationId: number ): Promise> => - getHiddenDangerPointDetailById(id), + getHiddenDangerPointDetailById(id, simulationId), }, // 风险点信息 @@ -107,10 +109,14 @@ export const $api = { /** * 根据id获取风险点详情 * @param id - 风险点id + * @param simulationId - 模拟id * @returns 风险点详情 */ - getPointDetailById: (id: number): Promise> => - getRiskPointDetailById(id), + getPointDetailById: ( + id: number, + simulationId: number + ): Promise> => + getRiskPointDetailById(id, simulationId), }, // 医院信息 diff --git a/src/api/hidden-danger-spots.ts b/src/api/hidden-danger-spots.ts index 8002aba..6840c00 100644 --- a/src/api/hidden-danger-spots.ts +++ b/src/api/hidden-danger-spots.ts @@ -1,25 +1,33 @@ -import type { ApiResponse } from "@/types/ApiResponse" -import type { XianHiddenDangerSpots } from "@/types/base/XianHiddenDangerSpots" -import httpInstance from "@/utils/request/http" +import type { ApiResponse } from '@/types/ApiResponse'; +import type { XianHiddenDangerSpots } from '@/types/base/XianHiddenDangerSpots'; +import httpInstance from '@/utils/request/http'; /** * 获取隐患点基础数据 * @param disasterType - 灾害类型（landslide, debris_flow, water_logging, flash_flood） * @returns 隐患点数据数组 */ -export const getBasePoints = (disasterType: string): Promise> => { - return httpInstance.get('/hidden-danger-spots/base-points', { - params: { - disasterType - } - }) -} +export const getBasePoints = ( + disasterType: string +): Promise> => { + return httpInstance.get('/hidden-danger-spots/base-points', { + params: { + disasterType, + }, + }); +}; /** * 根据id获取隐患点详情 * @param id - 隐患点id + * @param simulationId - 模拟id * @returns 隐患点详情 */ -export const getPointDetailById = (id: number): Promise> => { - return httpInstance.get(`/hidden-danger-spots/point-detail/${id}`) -} \ No newline at end of file +export const getPointDetailById = ( + id: number, + simulationId: number +): Promise> => { + return httpInstance.get( + `/hidden-danger-spots/point-detail/${id}/${simulationId}` + ); +}; diff --git a/src/api/risk-spots.ts b/src/api/risk-spots.ts index d451ee6..f4848ae 100644 --- a/src/api/risk-spots.ts +++ b/src/api/risk-spots.ts @@ -1,20 +1,24 @@ -import type { ApiResponse } from "@/types/ApiResponse" -import type { XianRiskSpots } from "@/types/base/XianRiskSpots" -import httpInstance from "@/utils/request/http" +import type { ApiResponse } from '@/types/ApiResponse'; +import type { XianRiskSpots } from '@/types/base/XianRiskSpots'; +import httpInstance from '@/utils/request/http'; /** * 获取风险点基础数据 * @returns 风险点数据数组 */ export const getBasePoints = (): Promise> => { - return httpInstance.get('/risk-spots/base-points') -} + return httpInstance.get('/risk-spots/base-points'); +}; /** * 根据id获取风险点详情 * @param id - 风险点id + * @param simulationId - 模拟id * @returns 风险点详情 */ -export const getPointDetailById = (id: number): Promise> => { - return httpInstance.get(`/risk-spots/point-detail/${id}`) -} \ No newline at end of file +export const getPointDetailById = ( + id: number, + simulationId: number +): Promise> => { + return httpInstance.get(`/risk-spots/point-detail/${id}/${simulationId}`); +}; diff --git a/src/component/rain-earthquake/basic/CollapseComponent.vue b/src/component/rain-earthquake/basic/CollapseComponent.vue index e2bb2cf..5f4d321 100644 --- a/src/component/rain-earthquake/basic/CollapseComponent.vue +++ b/src/component/rain-earthquake/basic/CollapseComponent.vue @@ -41,12 +41,14 @@ PointType, HiddenDangerPointTypeMap, } from '@/types/common/DisasterType.ts'; + import { useSimulationIdStore } from '@/stores/useSimulationIdStore'; const collapsePoints = ref([]); const statusStore = useStatusStore(); const loadingInformationStore = useLoadingInformationStore(); const loadingResourceStore = useLoadingResourceStore(); + const simulationIdStore = useSimulationIdStore(); const { field, getDisasterIcon } = useHiddenPoint(); @@ -79,7 +81,8 @@ } const res = await $api.hiddenDangerSpots.getPointDetailById( - loadingInformationStore.collapseHiddenPoint.id + loadingInformationStore.collapseHiddenPoint.id, + simulationIdStore.status ? simulationIdStore.id : -1 ); // 更新数据 diff --git a/src/component/rain-earthquake/basic/DebrisFlowComponent.vue b/src/component/rain-earthquake/basic/DebrisFlowComponent.vue index ea5bdb1..e29ef31 100644 --- a/src/component/rain-earthquake/basic/DebrisFlowComponent.vue +++ b/src/component/rain-earthquake/basic/DebrisFlowComponent.vue @@ -41,12 +41,14 @@ PointType, HiddenDangerPointTypeMap, } from '@/types/common/DisasterType.ts'; + import { useSimulationIdStore } from '@/stores/useSimulationIdStore'; const debrisFlowPoints = ref([]); const statusStore = useStatusStore(); const loadingInformationStore = useLoadingInformationStore(); const loadingResourceStore = useLoadingResourceStore(); + const simulationIdStore = useSimulationIdStore(); const { field, getDisasterIcon } = useHiddenPoint(); @@ -79,7 +81,8 @@ } const res = await $api.hiddenDangerSpots.getPointDetailById( - loadingInformationStore.debrisFlowHiddenPoint.id + loadingInformationStore.debrisFlowHiddenPoint.id, + simulationIdStore.status ? simulationIdStore.id : -1 ); // 更新数据 diff --git a/src/component/rain-earthquake/basic/FlashFloodComponent.vue b/src/component/rain-earthquake/basic/FlashFloodComponent.vue index d4a183e..c1434ec 100644 --- a/src/component/rain-earthquake/basic/FlashFloodComponent.vue +++ b/src/component/rain-earthquake/basic/FlashFloodComponent.vue @@ -41,12 +41,14 @@ PointType, HiddenDangerPointTypeMap, } from '@/types/common/DisasterType.ts'; + import { useSimulationIdStore } from '@/stores/useSimulationIdStore'; const flashFloodPoints = ref([]); const statusStore = useStatusStore(); const loadingInformationStore = useLoadingInformationStore(); const loadingResourceStore = useLoadingResourceStore(); + const simulationIdStore = useSimulationIdStore(); const { field, getDisasterIcon } = useHiddenPoint(); @@ -79,7 +81,8 @@ } const res = await $api.hiddenDangerSpots.getPointDetailById( - loadingInformationStore.flashFloodHiddenPoint.id + loadingInformationStore.flashFloodHiddenPoint.id, + simulationIdStore.status ? simulationIdStore.id : -1 ); // 更新数据 diff --git a/src/component/rain-earthquake/basic/LandslideComponent.vue b/src/component/rain-earthquake/basic/LandslideComponent.vue index b16e3e6..77a5b80 100644 --- a/src/component/rain-earthquake/basic/LandslideComponent.vue +++ b/src/component/rain-earthquake/basic/LandslideComponent.vue @@ -41,12 +41,14 @@ PointType, HiddenDangerPointTypeMap, } from '@/types/common/DisasterType.ts'; + import { useSimulationIdStore } from '@/stores/useSimulationIdStore'; const landslidePoints = ref([]); const statusStore = useStatusStore(); const loadingInformationStore = useLoadingInformationStore(); const loadingResourceStore = useLoadingResourceStore(); + const simulationIdStore = useSimulationIdStore(); const { field, getDisasterIcon } = useHiddenPoint(); @@ -79,7 +81,8 @@ } const res = await $api.hiddenDangerSpots.getPointDetailById( - loadingInformationStore.landslideHiddenPoint.id + loadingInformationStore.landslideHiddenPoint.id, + simulationIdStore.status ? simulationIdStore.id : -1 ); // 更新数据 diff --git a/src/component/rain-earthquake/basic/RiskPointComponent.vue b/src/component/rain-earthquake/basic/RiskPointComponent.vue index 49fed58..a195cb7 100644 --- a/src/component/rain-earthquake/basic/RiskPointComponent.vue +++ b/src/component/rain-earthquake/basic/RiskPointComponent.vue @@ -37,12 +37,14 @@ import { useRiskPoint } from '@/hooks/rain-earthquake/useRiskPoint.ts'; import { LoadingResource } from '@/types/common/LoadingResourceType.ts'; import { useLoadingResourceStore } from '@/stores/useLoadingResourceStore.ts'; + import { useSimulationIdStore } from '@/stores/useSimulationIdStore'; const riskPoints = ref([]); const statusStore = useStatusStore(); const loadingInformationStore = useLoadingInformationStore(); const loadingResourceStore = useLoadingResourceStore(); + const simulationIdStore = useSimulationIdStore(); // 信息框相关配置 const offsetX = ref(0); @@ -72,7 +74,8 @@ } const res = await $api.riskSpots.getPointDetailById( - loadingInformationStore.riskPoint.id + loadingInformationStore.riskPoint.id, + simulationIdStore.status ? simulationIdStore.id : -1 ); // 更新数据 @@ -100,15 +103,13 @@ (newValue: boolean) => { if (newValue) { CesiumUtilsSingleton.batchShowPrimitives( - loadingResourceStore.getLoadingResource( - LoadingResource.RISK_POINT - ).ids + loadingResourceStore.getLoadingResource(LoadingResource.RISK_POINT) + .ids ); } else { CesiumUtilsSingleton.batchHidePrimitives( - loadingResourceStore.getLoadingResource( - LoadingResource.RISK_POINT - ).ids + loadingResourceStore.getLoadingResource(LoadingResource.RISK_POINT) + .ids ); } } diff --git a/src/hooks/rain-earthquake/useHiddenPoint.ts b/src/hooks/rain-earthquake/useHiddenPoint.ts index 8eccc4f..6bb0499 100644 --- a/src/hooks/rain-earthquake/useHiddenPoint.ts +++ b/src/hooks/rain-earthquake/useHiddenPoint.ts @@ -15,6 +15,7 @@ export const useHiddenPoint = () => { * 字段映射配置 */ const field = { + probability: '预测概率', fieldCode: '野外编号', disasterName: '灾害点名称', position: '位置', diff --git a/src/hooks/rain-earthquake/useRiskPoint.ts b/src/hooks/rain-earthquake/useRiskPoint.ts index 06f750e..0494ebd 100644 --- a/src/hooks/rain-earthquake/useRiskPoint.ts +++ b/src/hooks/rain-earthquake/useRiskPoint.ts @@ -14,6 +14,7 @@ export const useRiskPoint = () => { * 字段映射配置 */ const field = { + probability: '预测概率', riskName: '风险区名称', unitCode: '统一编号', housing: '住房（间）', diff --git a/src/types/base/Point.ts b/src/types/base/Point.ts index 8b25d76..96aef47 100644 --- a/src/types/base/Point.ts +++ b/src/types/base/Point.ts @@ -14,4 +14,6 @@ export interface Point { disasterType?: string; /** 名称 */ name?: string; + /** 预测概率 */ + probability?: string; }