{[
- ['洪涝分类栅格', selectedImpactEvent ? `结果 #${selectedImpactEvent.id}` : '请选择结果', selectedImpactEvent ? 'ok' : 'muted'],
- ['洪涝矢量化', impactResult?.warnings?.includes?.('overlay has not been run') ? '未生成' : (impactResult ? '已生成' : '待运行'), impactResult && !impactResult?.warnings?.includes?.('overlay has not been run') ? 'ok' : 'warn'],
+ ['分类栅格', selectedImpactEvent ? `检测 #${selectedImpactEvent.id}` : '请选择成果', selectedImpactEvent ? 'ok' : 'muted'],
+ ['洪涝范围矢量', impactResult?.warnings?.includes?.('overlay has not been run') ? '未生成' : (impactResult ? '已生成' : '待评估'), impactResult && !impactResult?.warnings?.includes?.('overlay has not been run') ? 'ok' : 'warn'],
['灾害点命中', impactResult ? `${impactResult.hazard_points?.inside_flood?.length || 0} 个` : '待运行', impactResult ? 'ok' : 'muted'],
['近洪涝风险点', impactResult ? `${impactResult.hazard_points?.near_flood?.length || 0} 个` : '待运行', impactResult ? 'info' : 'muted'],
- ['DInSAR关联', impactResult ? `${impactResult.dinsar_products?.length || 0} 个` : '待运行', impactResult ? 'info' : 'muted'],
+ ['D-InSAR 关联', impactResult ? `${impactResult.dinsar_products?.length || 0} 个` : '待运行', impactResult ? 'info' : 'muted'],
['行政区统计', impactResult?.affected_aois?.length ? `${impactResult.affected_aois.length} 个` : '暂无数据', impactResult ? 'muted' : 'muted'],
].map(([name, status, tone]) => (
@@ -1387,9 +1387,9 @@ export default function FloodAnalysisWorkspace({
-
+
- {doneFloodEvents.length === 0 &&
暂无已完成洪涝结果。}
+ {doneFloodEvents.length === 0 &&
暂无已完成洪涝检测成果。}
{doneFloodEvents.map(event => {
const active = String(selectedImpactEvent?.id) === String(event.id);
return (
@@ -1406,39 +1406,39 @@ export default function FloodAnalysisWorkspace({
}}
>
- 洪涝 #{event.id}
+ 洪涝检测 #{event.id}
{active ? '当前' : '可选'}
-
+
);
})}
-
-
+
+
-
- {impactLoading && 套合结果加载中...}
- {!impactLoading && !impactResult && 选择一个已完成的洪涝结果后运行套合分析。}
+
+ {impactLoading && 影响评估结果加载中...}
+ {!impactLoading && !impactResult && 选择一个已完成的洪涝检测成果后执行影响评估。}
{!impactLoading && impactResult && (
-
+
-
+
{impactResult.warnings?.length > 0 && (
@@ -1490,19 +1490,19 @@ export default function FloodAnalysisWorkspace({
-
-
-
+
+
+
)}
/>
{resultMode === 'flood' && (
- {floodEvents.length === 0 &&
暂无洪涝检测结果。}
+ {floodEvents.length === 0 &&
暂无洪涝检测成果。}
{floodEvents.map(event => (
- {waterResults.length === 0 && 暂无水体提取结果。}
+ {waterResults.length === 0 && 暂无水体提取成果。}
{waterResults.map(item => (
))}
@@ -1528,8 +1528,8 @@ export default function FloodAnalysisWorkspace({
)}
{resultMode === 'products' && (
- {productLoading &&
洪涝产品加载中...}
- {!productLoading && floodProducts.length === 0 &&
暂无洪涝产品。可在洪涝结果行点击“生成产品”。}
+ {productLoading &&
发布成果加载中...}
+ {!productLoading && floodProducts.length === 0 &&
暂无发布成果。可在洪涝检测成果中点击“发布成果”。}
{!productLoading && floodProducts.map(product => (
))}
@@ -1538,9 +1538,9 @@ export default function FloodAnalysisWorkspace({
-
+
-
+
diff --git a/frontend/src/LoginPage.jsx b/frontend/src/LoginPage.jsx
index 582a129..4a2c3ef 100644
--- a/frontend/src/LoginPage.jsx
+++ b/frontend/src/LoginPage.jsx
@@ -1,11 +1,5 @@
import React, { useEffect, useState } from 'react';
-import axios from 'axios';
-
-
-const apiClient = axios.create({
- baseURL: '/api',
- withCredentials: true,
-});
+import apiClient from './api/client';
const LoginPage = ({ onLoginSuccess }) => {
@@ -32,15 +26,22 @@ const LoginPage = ({ onLoginSuccess }) => {
setLoading(true);
setMessage('');
try {
- await apiClient.post('/auth/login', {
- username,
+ const response = await apiClient.post('/auth/login', {
+ username: username.trim(),
password,
});
if (onLoginSuccess) {
- await onLoginSuccess();
+ await onLoginSuccess(response.data?.user || null);
}
} catch (error) {
- setMessage(error.response?.data?.detail || '登录失败，请检查用户名和密码。');
+ const status = error.response?.status;
+ if (status === 401) {
+ setMessage('用户名或密码不正确。');
+ } else if (status === 429) {
+ setMessage(error.response?.data?.detail || '登录尝试过于频繁，请稍后再试。');
+ } else {
+ setMessage(error.response?.data?.detail || '登录请求失败，请稍后重试。');
+ }
} finally {
setLoading(false);
}
diff --git a/frontend/src/hooks/useAppAuthLifecycle.js b/frontend/src/hooks/useAppAuthLifecycle.js
index c847a85..d768da3 100644
--- a/frontend/src/hooks/useAppAuthLifecycle.js
+++ b/frontend/src/hooks/useAppAuthLifecycle.js
@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
import apiClient from '../api/client';
import { getHealth } from '../api/health';
@@ -28,22 +28,41 @@ export default function useAppAuthLifecycle({
setAllData,
setRadarPagination,
}) {
- const fetchCurrentUser = useCallback(async () => {
+ const authGenerationRef = useRef(0);
+
+ const fetchCurrentUser = useCallback(async (options = {}) => {
+ const { clearOnFailure = true } = options;
+ const requestGeneration = authGenerationRef.current;
try {
- const response = await apiClient.get('/auth/me');
- setCurrentUser(response.data || null);
+ const response = await apiClient.get('/auth/me', {
+ skipAuthReset: !clearOnFailure,
+ authGeneration: requestGeneration,
+ });
+ if (requestGeneration === authGenerationRef.current) {
+ setCurrentUser(response.data || null);
+ }
} catch {
- setCurrentUser(null);
+ if (clearOnFailure && requestGeneration === authGenerationRef.current) {
+ setCurrentUser(null);
+ }
} finally {
- setAuthChecked(true);
+ if (requestGeneration === authGenerationRef.current || !clearOnFailure) {
+ setAuthChecked(true);
+ }
}
}, [setCurrentUser, setAuthChecked]);
- const handleLoginSuccess = useCallback(async () => {
- await fetchCurrentUser();
- }, [fetchCurrentUser]);
+ const handleLoginSuccess = useCallback(async (userFromLogin = null) => {
+ authGenerationRef.current += 1;
+ if (userFromLogin) {
+ setCurrentUser(userFromLogin);
+ setAuthChecked(true);
+ }
+ await fetchCurrentUser({ clearOnFailure: !userFromLogin });
+ }, [fetchCurrentUser, setCurrentUser, setAuthChecked]);
const handleLogout = useCallback(async () => {
+ authGenerationRef.current += 1;
try {
await apiClient.post('/auth/logout');
} catch (error) {
@@ -127,7 +146,9 @@ export default function useAppAuthLifecycle({
const interceptorId = apiClient.interceptors.response.use(
(response) => response,
(error) => {
- if (error?.response?.status === 401) {
+ const requestGeneration = error?.config?.authGeneration;
+ const staleAuthFailure = typeof requestGeneration === 'number' && requestGeneration < authGenerationRef.current;
+ if (error?.response?.status === 401 && !error?.config?.skipAuthReset && !staleAuthFailure) {
radarSearchRequestSeqRef.current += 1;
setHasRadarSearched(false);
if (aoeLayerRef.current) {