diff --git a/src/components/olmap/BurstDetection/SchemeQuery.tsx b/src/components/olmap/BurstDetection/SchemeQuery.tsx index 3c696c0..4385e8c 100644 --- a/src/components/olmap/BurstDetection/SchemeQuery.tsx +++ b/src/components/olmap/BurstDetection/SchemeQuery.tsx @@ -127,12 +127,15 @@ const SchemeQuery: React.FC = ({ const handleQuery = async () => { setLoading(true); try { - const params: Record = { network: NETWORK_NAME }; + const params: Record = { + network: NETWORK_NAME, + scheme_type: "burst_detection", + }; if (!queryAll && queryDate) { params.query_date = queryDate.startOf("day").toISOString(); } - const response = await api.get("/api/v1/burst-detection/schemes/", { params }); + const response = await api.get("/api/v1/schemes", { params }); const nextSchemes = response.data as BurstDetectionSchemeRecord[]; setSchemes(nextSchemes); open?.({ @@ -154,8 +157,8 @@ const SchemeQuery: React.FC = ({ const handleViewSchemeResult = async (schemeName: string) => { try { const response = await api.get( - `/api/v1/burst-detection/schemes/${encodeURIComponent(schemeName)}`, - { params: { network: NETWORK_NAME } }, + `/api/v1/schemes/${encodeURIComponent(schemeName)}`, + { params: { network: NETWORK_NAME, scheme_type: "burst_detection" } }, ); const schemeRecord = response.data as BurstDetectionSchemeRecord & { result_payload?: BurstDetectionResult; diff --git a/src/components/olmap/BurstLocation/AnalysisParameters.tsx b/src/components/olmap/BurstLocation/AnalysisParameters.tsx index eefd57d..0ef27b3 100644 --- a/src/components/olmap/BurstLocation/AnalysisParameters.tsx +++ b/src/components/olmap/BurstLocation/AnalysisParameters.tsx @@ -125,7 +125,7 @@ const AnalysisParameters: React.FC = ({ setSchemeLoading(true); try { const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, { - params: { network: NETWORK_NAME }, + params: { network: NETWORK_NAME, scheme_type: "burst_analysis" }, }); const burstSchemes = (response.data as SchemeItem[]).filter( (scheme) => scheme.scheme_type === "burst_analysis", diff --git a/src/components/olmap/BurstLocation/SchemeQuery.tsx b/src/components/olmap/BurstLocation/SchemeQuery.tsx index ef0cd8b..a001daa 100644 --- a/src/components/olmap/BurstLocation/SchemeQuery.tsx +++ b/src/components/olmap/BurstLocation/SchemeQuery.tsx @@ -222,18 +222,18 @@ const SchemeQuery: React.FC = ({ const handleQuery = async () => { setLoading(true); try { - // API call to fetch schemes - // Adjust URL as needed - let url = `${config.BACKEND_URL}/api/v1/burst-location/schemes/`; - const params: Record = { network: NETWORK_NAME }; + const params: Record = { + network: NETWORK_NAME, + scheme_type: "burst_location", + }; if (!queryAll && queryDate) { params.query_date = queryDate.startOf("day").toISOString(); } const [response, simulationResponse] = await Promise.all([ - api.get(url, { params }), + api.get(`${config.BACKEND_URL}/api/v1/schemes`, { params }), api.get(`${config.BACKEND_URL}/api/v1/schemes`, { - params: { network: NETWORK_NAME }, + params: { network: NETWORK_NAME, scheme_type: "burst_analysis" }, }), ]); const nextSchemes = response.data as BurstSchemeRecord[]; @@ -274,8 +274,8 @@ const SchemeQuery: React.FC = ({ const handleViewSchemeResult = async (schemeName: string) => { try { const response = await api.get( - `${config.BACKEND_URL}/api/v1/burst-location/schemes/${encodeURIComponent(schemeName)}`, - { params: { network: NETWORK_NAME } }, + `${config.BACKEND_URL}/api/v1/schemes/${encodeURIComponent(schemeName)}`, + { params: { network: NETWORK_NAME, scheme_type: "burst_location" } }, ); const schemeRecord = response.data as BurstSchemeRecord & { result_payload?: BurstLocationResult; diff --git a/src/components/olmap/BurstSimulation/SchemeQuery.tsx b/src/components/olmap/BurstSimulation/SchemeQuery.tsx index c05b8c5..fa38b0e 100644 --- a/src/components/olmap/BurstSimulation/SchemeQuery.tsx +++ b/src/components/olmap/BurstSimulation/SchemeQuery.tsx @@ -152,9 +152,16 @@ const SchemeQuery: React.FC = ({ setLoading(true); try { - const response = await api.get( - `${config.BACKEND_URL}/api/v1/schemes?network=${network}`, - ); + const params: Record = { + network, + scheme_type: SCHEME_TYPE, + }; + if (!queryAll && queryDate) { + params.query_date = queryDate.startOf("day").toISOString(); + } + const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, { + params, + }); let filteredResults = response.data; if (!queryAll) { @@ -178,7 +185,7 @@ const SchemeQuery: React.FC = ({ if (filteredResults.length === 0) { open?.({ - type: "error", + type: "success", message: "查询结果", description: queryAll ? "没有找到任何方案" diff --git a/src/components/olmap/ContaminantSimulation/SchemeQuery.tsx b/src/components/olmap/ContaminantSimulation/SchemeQuery.tsx index 9fb159d..c9607f4 100644 --- a/src/components/olmap/ContaminantSimulation/SchemeQuery.tsx +++ b/src/components/olmap/ContaminantSimulation/SchemeQuery.tsx @@ -216,9 +216,16 @@ const SchemeQuery: React.FC = ({ if (!queryAll && !queryDate) return; setLoading(true); try { - const response = await api.get( - `${config.BACKEND_URL}/api/v1/schemes?network=${network}`, - ); + const params: Record = { + network, + scheme_type: SCHEME_TYPE, + }; + if (!queryAll && queryDate) { + params.query_date = queryDate.startOf("day").toISOString(); + } + const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, { + params, + }); let filteredResults = response.data; if (!queryAll) { @@ -244,7 +251,7 @@ const SchemeQuery: React.FC = ({ if (filteredResults.length === 0) { open?.({ - type: "error", + type: "success", message: "查询结果", description: queryAll ? "没有找到任何方案" diff --git a/src/components/olmap/DMALeakDetection/SchemeQuery.tsx b/src/components/olmap/DMALeakDetection/SchemeQuery.tsx index 3895d01..c92c110 100644 --- a/src/components/olmap/DMALeakDetection/SchemeQuery.tsx +++ b/src/components/olmap/DMALeakDetection/SchemeQuery.tsx @@ -79,18 +79,21 @@ const SchemeQuery: React.FC = ({ const handleQuery = async () => { setLoading(true); try { - const params: Record = { network: NETWORK_NAME }; + const params: Record = { + network: NETWORK_NAME, + scheme_type: "dma_leak_identification", + }; if (!queryAll && queryDate) { params.query_date = queryDate.startOf("day").toISOString(); } - const response = await api.get(`${config.BACKEND_URL}/api/v1/leakage/schemes/`, { + const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, { params, }); const nextSchemes = response.data as LeakageSchemeRecord[]; setSchemes(nextSchemes); if (nextSchemes.length === 0) { open?.({ - type: "error", + type: "success", message: "查询结果", description: queryAll ? "没有找到任何方案" @@ -117,8 +120,13 @@ const SchemeQuery: React.FC = ({ const handleViewSchemeResult = async (schemeName: string) => { try { const response = await api.get( - `${config.BACKEND_URL}/api/v1/leakage/schemes/${encodeURIComponent(schemeName)}`, - { params: { network: NETWORK_NAME } }, + `${config.BACKEND_URL}/api/v1/schemes/${encodeURIComponent(schemeName)}`, + { + params: { + network: NETWORK_NAME, + scheme_type: "dma_leak_identification", + }, + }, ); onViewResult(response.data as LeakageResultDetail); } catch (error: any) { diff --git a/src/components/olmap/FlushingAnalysis/SchemeQuery.tsx b/src/components/olmap/FlushingAnalysis/SchemeQuery.tsx index be64f71..fdd0203 100644 --- a/src/components/olmap/FlushingAnalysis/SchemeQuery.tsx +++ b/src/components/olmap/FlushingAnalysis/SchemeQuery.tsx @@ -262,9 +262,16 @@ const SchemeQuery: React.FC = ({ setLoading(true); try { - const response = await api.get( - `${config.BACKEND_URL}/api/v1/schemes?network=${network}`, - ); + const params: Record = { + network, + scheme_type: SCHEME_TYPE, + }; + if (!queryAll && queryDate) { + params.query_date = queryDate.startOf("day").toISOString(); + } + const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, { + params, + }); let filteredResults = response.data; @@ -292,7 +299,7 @@ const SchemeQuery: React.FC = ({ if (filteredResults.length === 0) { open?.({ - type: "error", + type: "success", message: "未找到相关方案", description: "请尝试更改查询条件", });