diff --git a/src/component/common/InformationBox.vue b/src/component/common/InformationBox.vue index c23bc06..9eee1ff 100644 --- a/src/component/common/InformationBox.vue +++ b/src/component/common/InformationBox.vue @@ -33,6 +33,7 @@ title: string; data: Record; field: Record; + color: Record | null; offsetX: number; offsetY: number; }>(); diff --git a/src/component/rain-earthquake/basic/CollapseComponent.vue b/src/component/rain-earthquake/basic/CollapseComponent.vue index 5f4d321..63b3a50 100644 --- a/src/component/rain-earthquake/basic/CollapseComponent.vue +++ b/src/component/rain-earthquake/basic/CollapseComponent.vue @@ -15,6 +15,7 @@ (); // 获取钩子函数 - const { informationBoxTitle, field, getDisasterIcon } = useRiskPoint(); + const { informationBoxTitle, field, color, getDisasterIcon } = useRiskPoint(); $api.riskSpots.getBasePoints().then((res) => { riskPoints.value = res.data; diff --git a/src/component/rain-earthquake/basic/WaterLoggingComponent.vue b/src/component/rain-earthquake/basic/WaterLoggingComponent.vue index 16d19ae..6d0ce71 100644 --- a/src/component/rain-earthquake/basic/WaterLoggingComponent.vue +++ b/src/component/rain-earthquake/basic/WaterLoggingComponent.vue @@ -3,9 +3,7 @@
([]); const statusStore = useStatusStore(); const loadingInformationStore = useLoadingInformationStore(); const loadingResourceStore = useLoadingResourceStore(); + const simulationIdStore = useSimulationIdStore(); - const { field, getDisasterIcon } = useHiddenPoint(); + const { field, color, getDisasterIcon } = useHiddenPoint(); // 信息框相关配置 const offsetX = ref(0); @@ -81,7 +82,8 @@ } const res = await $api.hiddenDangerSpots.getPointDetailById( - loadingInformationStore.waterLoggingHiddenPoint.id + loadingInformationStore.waterLoggingHiddenPoint.id, + simulationIdStore.status ? simulationIdStore.id : -1 ); // 更新数据 diff --git a/src/hooks/rain-earthquake/useHiddenPoint.ts b/src/hooks/rain-earthquake/useHiddenPoint.ts index 6bb0499..dd825b8 100644 --- a/src/hooks/rain-earthquake/useHiddenPoint.ts +++ b/src/hooks/rain-earthquake/useHiddenPoint.ts @@ -24,6 +24,13 @@ export const useHiddenPoint = () => { riskGrade: '风险等级', }; + /** + * 颜色 + */ + const color = { + probability: 'red', + }; + /** * 根据灾害类型获取对应图标 * @param disasterType - 灾害类型(支持中英文) @@ -52,5 +59,5 @@ export const useHiddenPoint = () => { } } - return { field, getDisasterIcon }; + return { field, color, getDisasterIcon }; }; diff --git a/src/hooks/rain-earthquake/useRiskPoint.ts b/src/hooks/rain-earthquake/useRiskPoint.ts index 0494ebd..4aac6b2 100644 --- a/src/hooks/rain-earthquake/useRiskPoint.ts +++ b/src/hooks/rain-earthquake/useRiskPoint.ts @@ -28,6 +28,13 @@ export const useRiskPoint = () => { lat: '纬度', }; + /** + * 颜色 + */ + const color = { + probability: 'red', + }; + /** * 获取风险点图标 * @returns 图标路径 @@ -36,5 +43,5 @@ export const useRiskPoint = () => { return riskAreaIcon; } - return { informationBoxTitle, field, getDisasterIcon }; + return { informationBoxTitle, field, color, getDisasterIcon }; };