From 6b68b7d081b9564c9294fea4e45a2387f1ff46d1 Mon Sep 17 00:00:00 2001 From: JIANG Date: Sat, 7 Mar 2026 14:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=AD=A3=E5=B8=B8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=8F=82=E6=95=B0=EF=BC=8C=E7=AE=80=E5=8C=96=E5=88=86?= =?UTF-8?q?=E6=9E=90=E5=8F=82=E6=95=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BurstLocation/AnalysisParameters.tsx | 61 ++----------------- src/components/olmap/BurstLocation/types.ts | 4 -- 2 files changed, 4 insertions(+), 61 deletions(-) diff --git a/src/components/olmap/BurstLocation/AnalysisParameters.tsx b/src/components/olmap/BurstLocation/AnalysisParameters.tsx index 96f2d60..88c5cd5 100644 --- a/src/components/olmap/BurstLocation/AnalysisParameters.tsx +++ b/src/components/olmap/BurstLocation/AnalysisParameters.tsx @@ -1,6 +1,6 @@ "use client"; -import React, { useCallback, useEffect, useMemo, useState } from "react"; +import React, { useCallback, useMemo, useState } from "react"; import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; import RefreshIcon from "@mui/icons-material/Refresh"; import { @@ -59,12 +59,6 @@ const AnalysisParameters: React.FC = ({ onResult }) => { const [burstEndTime, setBurstEndTime] = useState( dayjs().subtract(5, "minute"), ); - const [normalStartTime, setNormalStartTime] = useState( - dayjs().subtract(2, "hour"), - ); - const [normalEndTime, setNormalEndTime] = useState( - dayjs().subtract(90, "minute"), - ); const [minDpressure, setMinDpressure] = useState(2); const [basicPressure, setBasicPressure] = useState(10); const [advancedOpen, setAdvancedOpen] = useState(false); @@ -78,16 +72,8 @@ const AnalysisParameters: React.FC = ({ onResult }) => { setBurstStartTime(start); setBurstEndTime(end); - setNormalStartTime(start); - setNormalEndTime(end); }, []); - useEffect(() => { - if (!isSimulationMode) return; - setNormalStartTime(burstStartTime); - setNormalEndTime(burstEndTime); - }, [burstEndTime, burstStartTime, isSimulationMode]); - const fetchSchemes = useCallback( async ({ force = false, notify = false }: { force?: boolean; notify?: boolean } = {}) => { if (schemeLoading || (!force && schemes.length > 0)) return; @@ -152,35 +138,24 @@ const AnalysisParameters: React.FC = ({ onResult }) => { const isValid = useMemo(() => { if (!Number.isFinite(burstLeakage) || burstLeakage <= 0) return false; - if (!burstStartTime || !burstEndTime || !normalStartTime || !normalEndTime) { + if (!burstStartTime || !burstEndTime) { return false; } if (dataSource === "simulation" && !selectedSchemeId) { return false; } - return ( - burstStartTime.isBefore(burstEndTime) && - normalStartTime.isBefore(normalEndTime) - ); + return burstStartTime.isBefore(burstEndTime); }, [ burstLeakage, burstStartTime, burstEndTime, - normalStartTime, - normalEndTime, dataSource, selectedSchemeId, ]); const handleRun = async () => { - if ( - !isValid || - !burstStartTime || - !burstEndTime || - !normalStartTime || - !normalEndTime - ) { + if (!isValid || !burstStartTime || !burstEndTime) { open?.({ type: "error", message: "请完善参数并确认时间范围合法" }); return; } @@ -210,8 +185,6 @@ const AnalysisParameters: React.FC = ({ onResult }) => { basic_pressure: basicPressure, scada_burst_start: burstStartTime.toISOString(), scada_burst_end: burstEndTime.toISOString(), - scada_normal_start: normalStartTime.toISOString(), - scada_normal_end: normalEndTime.toISOString(), use_scada_flow: enableFlow || undefined, simulation_scheme_name: selectedScheme?.scheme_name, simulation_scheme_type: selectedScheme?.scheme_type, @@ -347,32 +320,6 @@ const AnalysisParameters: React.FC = ({ onResult }) => { slotProps={{ textField: { size: "small", fullWidth: true } }} /> - - - 正常开始时间 - - - - - - 正常结束时间 - - - diff --git a/src/components/olmap/BurstLocation/types.ts b/src/components/olmap/BurstLocation/types.ts index 0500a36..8c2ffae 100644 --- a/src/components/olmap/BurstLocation/types.ts +++ b/src/components/olmap/BurstLocation/types.ts @@ -23,8 +23,6 @@ export interface BurstLocationResult { scada_window?: { burst_start?: string; burst_end?: string; - normal_start?: string; - normal_end?: string; }; pressure_samples?: { burst?: number; @@ -53,8 +51,6 @@ export interface BurstLocationSchemeDetail { scada_window?: { burst_start?: string; burst_end?: string; - normal_start?: string; - normal_end?: string; }; result_summary?: { located_pipe?: string;