From eb15100f4f6a4c4f0c76138550e45129d622179a Mon Sep 17 00:00:00 2001 From: JIANG Date: Fri, 19 Dec 2025 16:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E9=A3=8E=E9=99=A9=E5=88=86?= =?UTF-8?q?=E6=9E=90=EF=BC=8C=E5=8F=B3=E4=B8=8B=E8=A7=92=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9B=BE=E4=BE=8B=EF=BC=9B=E5=9B=BE=E4=BE=8B=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E9=87=8D=E6=96=B0=E8=AE=BE=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E9=AB=98=E9=A3=8E=E9=99=A9=EF=BC=88=E7=BA=A2=E8=89=B2=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E4=BD=8E=E9=A3=8E=E9=99=A9=EF=BC=88=E7=BB=BF=E8=89=B2?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E7=AC=A6=E5=90=88=E5=B8=B8=E8=A7=84=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E8=A1=A8=E8=BE=BE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(main)/health-risk-analysis/page.tsx | 17 +++++++++ src/app/OlMap/Controls/HistoryDataPanel.tsx | 12 +++++-- src/app/OlMap/Controls/StyleEditorPanel.tsx | 1 + src/app/OlMap/Controls/StyleLegend.tsx | 1 + src/app/OlMap/MapComponent.tsx | 4 +-- .../olmap/HealthRiskAnalysis/types.ts | 36 +++++++++---------- 6 files changed, 47 insertions(+), 24 deletions(-) diff --git a/src/app/(main)/health-risk-analysis/page.tsx b/src/app/(main)/health-risk-analysis/page.tsx index 4034bb9..ef168be 100644 --- a/src/app/(main)/health-risk-analysis/page.tsx +++ b/src/app/(main)/health-risk-analysis/page.tsx @@ -6,6 +6,12 @@ import MapToolbar from "@app/OlMap/Controls/Toolbar"; import { HealthRiskProvider } from "@components/olmap/HealthRiskAnalysis/HealthRiskContext"; import HealthRiskPieChart from "@components/olmap/HealthRiskAnalysis/HealthRiskPieChart"; import PredictDataPanel from "@components/olmap/HealthRiskAnalysis/PredictDataPanel"; +import StyleLegend from "@app/OlMap/Controls/StyleLegend"; +import { + RAINBOW_COLORS, + RISK_BREAKS, +} from "@components/olmap/HealthRiskAnalysis/types"; +import { Box } from "@mui/material"; export default function Home() { return ( @@ -19,6 +25,17 @@ export default function Home() { /> + + + diff --git a/src/app/OlMap/Controls/HistoryDataPanel.tsx b/src/app/OlMap/Controls/HistoryDataPanel.tsx index 2c39468..aa63af2 100644 --- a/src/app/OlMap/Controls/HistoryDataPanel.tsx +++ b/src/app/OlMap/Controls/HistoryDataPanel.tsx @@ -112,7 +112,9 @@ const fetchFromBackend = async ( ]); const cleanedData = transformBackendData(cleanedRes, featureIds); - const rawData = transformBackendData(rawRes, featureIds); + // 如果清洗数据有值，则不显示原始监测值 + const rawData = + cleanedData.length > 0 ? [] : transformBackendData(rawRes, featureIds); return mergeTimeSeriesData( cleanedData, @@ -136,7 +138,9 @@ const fetchFromBackend = async ( ]); const cleanedData = transformBackendData(cleanedRes, featureIds); - const rawData = transformBackendData(rawRes, featureIds); + // 如果清洗数据有值，则不显示原始监测值 + const rawData = + cleanedData.length > 0 ? [] : transformBackendData(rawRes, featureIds); const schemeSimData = transformBackendData(schemeSimRes, featureIds); // 合并三组数据 @@ -186,7 +190,9 @@ const fetchFromBackend = async ( ]); const cleanedData = transformBackendData(cleanedRes, featureIds); - const rawData = transformBackendData(rawRes, featureIds); + // 如果清洗数据有值，则不显示原始监测值 + const rawData = + cleanedData.length > 0 ? [] : transformBackendData(rawRes, featureIds); const simulationData = transformBackendData(simulationRes, featureIds); // 合并三组数据 diff --git a/src/app/OlMap/Controls/StyleEditorPanel.tsx b/src/app/OlMap/Controls/StyleEditorPanel.tsx index 6206083..bcda540 100644 --- a/src/app/OlMap/Controls/StyleEditorPanel.tsx +++ b/src/app/OlMap/Controls/StyleEditorPanel.tsx @@ -185,6 +185,7 @@ const StyleEditorPanel: React.FC = ({ const { currentJunctionCalData, currentPipeCalData, + pipeData, junctionText, pipeText, setShowJunctionTextLayer, diff --git a/src/app/OlMap/Controls/StyleLegend.tsx b/src/app/OlMap/Controls/StyleLegend.tsx index 1ef83a4..e374e84 100644 --- a/src/app/OlMap/Controls/StyleLegend.tsx +++ b/src/app/OlMap/Controls/StyleLegend.tsx @@ -1,3 +1,4 @@ +import React from "react"; import Box from "@mui/material/Box"; import Typography from "@mui/material/Typography"; diff --git a/src/app/OlMap/MapComponent.tsx b/src/app/OlMap/MapComponent.tsx index 8533931..b79dff5 100644 --- a/src/app/OlMap/MapComponent.tsx +++ b/src/app/OlMap/MapComponent.tsx @@ -45,14 +45,13 @@ interface DataContextType { currentJunctionCalData?: any[]; // 当前计算结果 setCurrentJunctionCalData?: React.Dispatch>; currentPipeCalData?: any[]; // 当前计算结果 + pipeData?: any[]; // 管道数据（含坐标等信息） setCurrentPipeCalData?: React.Dispatch>; - pipeData?: any[]; // 管道数据（含坐标） showJunctionText?: boolean; // 是否显示节点文本 showPipeText?: boolean; // 是否显示管道文本 setShowJunctionTextLayer?: React.Dispatch>; setShowPipeTextLayer?: React.Dispatch>; setShowContourLayer?: React.Dispatch>; - // flowAnimation?: React.RefObject; isContourLayerAvailable?: boolean; setShowWaterflowLayer?: React.Dispatch>; setContourLayerAvailable?: React.Dispatch>; @@ -972,7 +971,6 @@ const MapComponent: React.FC = ({ children }) => { setShowJunctionTextLayer, setShowPipeTextLayer, setShowContourLayer, - // flowAnimation, isContourLayerAvailable, setContourLayerAvailable, isWaterflowLayerAvailable, diff --git a/src/components/olmap/HealthRiskAnalysis/types.ts b/src/components/olmap/HealthRiskAnalysis/types.ts index 1df3014..b44b481 100644 --- a/src/components/olmap/HealthRiskAnalysis/types.ts +++ b/src/components/olmap/HealthRiskAnalysis/types.ts @@ -14,29 +14,29 @@ export interface PredictionResult { } export const RAINBOW_COLORS = [ - "rgba(255, 0, 0, 0.9)", // 红 (0.0 - 0.1) - 高风险 - "rgba(255, 127, 0, 0.9)", // 橙 - "rgba(255, 215, 0, 0.9)", // 金黄 - "rgba(199, 224, 0, 0.9)", // 黄绿 - "rgba(76, 175, 80, 0.9)", // 中绿 - "rgba(0, 158, 115, 0.9)", // 青绿 - "rgba(0, 188, 212, 0.9)", // 青色 - "rgba(33, 150, 243, 0.9)", // 天蓝 - "rgba(63, 81, 181, 0.9)", // 靛青 - "rgba(142, 68, 173, 0.9)", // 紫 (0.9 - 1.0) - 低风险 + "rgba(211, 47, 47, 0.9)", // 深红 (0.0 - 0.1) - 极高风险 + "rgba(244, 67, 54, 0.9)", // 红色 (0.1 - 0.2) - 高风险 + "rgba(255, 87, 34, 0.9)", // 深橙 (0.2 - 0.3) + "rgba(255, 152, 0, 0.9)", // 橙色 (0.3 - 0.4) + "rgba(255, 193, 7, 0.9)", // 琥珀 (0.4 - 0.5) + "rgba(255, 235, 59, 0.9)", // 黄色 (0.5 - 0.6) + "rgba(205, 220, 57, 0.9)", // 柠檬 (0.6 - 0.7) + "rgba(139, 195, 74, 0.9)", // 浅绿 (0.7 - 0.8) + "rgba(76, 175, 80, 0.9)", // 绿色 (0.8 - 0.9) - 低风险 + "rgba(46, 125, 50, 0.9)", // 深绿 (0.9 - 1.0) - 极低风险 ]; export const RISK_BREAKS = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0]; export const RISK_LABELS = [ "0.0 - 0.1 (极高风险)", - "0.1 - 0.2", - "0.2 - 0.3", - "0.3 - 0.4", - "0.4 - 0.5", - "0.5 - 0.6", - "0.6 - 0.7", - "0.7 - 0.8", - "0.8 - 0.9", + "0.1 - 0.2 (高风险)", + "0.2 - 0.3 (较高风险)", + "0.3 - 0.4 (中高风险)", + "0.4 - 0.5 (中等风险)", + "0.5 - 0.6 (中等风险)", + "0.6 - 0.7 (中低风险)", + "0.7 - 0.8 (较低风险)", + "0.8 - 0.9 (低风险)", "0.9 - 1.0 (极低风险)", ];