Harmon/insar-management-system-v2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Represent partial D-InSAR success separately

Browse Source
This commit is contained in:
Harmon
2026-06-30 17:44:54 +08:00
parent d19c9d4d3e
commit 05f0c62d15
7 changed files with 172 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/App.css
+6
View File
@@ -5857,6 +5857,12 @@ input[type="checkbox"] {
border-color: rgba(245, 158, 11, 0.25);
}
.dinsar-status-pill.tone-partial {
background: rgba(217, 119, 6, 0.13);
color: #92400e;
border-color: rgba(217, 119, 6, 0.28);
}
.dinsar-status-pill.tone-error {
background: rgba(220, 38, 38, 0.12);
color: #b91c1c;
frontend/src/DinsarProductionPanel.jsx
+29 -6
View File
@@ -18,7 +18,18 @@ const RUN_HISTORY_PAGE_SIZE = 200;
const TASK_HISTORY_PAGE_SIZE = 200;
const TASK_LOG_PAGE_SIZE = 1000;
const INLINE_TASK_LOG_LIMIT = 200;
const TERMINAL_STATUS_VALUES = new Set(['COMPLETED', 'FAILED', 'CANCELLED', 'CANCELED', 'success', 'failed', 'cancelled', 'canceled']);
const TERMINAL_STATUS_VALUES = new Set([
'COMPLETED',
'PARTIAL_SUCCESS',
'FAILED',
'CANCELLED',
'CANCELED',
'success',
'partial_success',
'failed',
'cancelled',
'canceled',
]);
const ENGINE_STATUS_COLOR = {
ok: '#22c55e',
@@ -54,10 +65,12 @@ const STATUS_LABEL = {
PENDING: '等待中',
RUNNING: '运行中',
COMPLETED: '已完成',
PARTIAL_SUCCESS: '部分成功',
FAILED: '失败',
CANCELLED: '已取消',
CANCELED: '已取消',
success: '成功',
partial_success: '部分成功',
failed: '失败',
running: '运行中',
pending: '等待中',
@@ -133,6 +146,7 @@ function taskTypeToEngine(taskType) {
function taskStatusToRunStatus(status) {
const normalized = String(status || '').toUpperCase();
if (normalized === 'COMPLETED') return 'success';
if (normalized === 'PARTIAL_SUCCESS') return 'partial_success';
if (normalized === 'FAILED') return 'failed';
if (normalized === 'CANCELLED' || normalized === 'CANCELED') return 'cancelled';
if (normalized === 'RUNNING') return 'running';
@@ -309,6 +323,7 @@ function formatRunCounts(run) {
function statusToneClass(status) {
const normalized = String(status || '').toLowerCase();
if (normalized === 'success' || normalized === 'completed') return 'tone-ready';
if (normalized === 'partial_success' || normalized === 'partial' || normalized === 'completed_with_errors') return 'tone-partial';
if (normalized === 'failed') return 'tone-error';
if (normalized === 'running') return 'tone-info';
if (normalized === 'cancelled' || normalized === 'canceled') return 'tone-neutral';
@@ -828,7 +843,10 @@ export default function DinsarProductionPanel({ readOnly = false, onJobQueued })
? (latestRunWithTask.mode === 'cluster' ? 'LANDSAR_CLUSTER_RUN' : 'LANDSAR_RUN')
: 'IDL_RUN_DINSAR',
status: latestRunWithTask.raw_status || latestRunWithTask.status,
progress: latestRunWithTask.raw_status === 'COMPLETED' || latestRunWithTask.status === 'success' ? 100 : null,
progress: ['COMPLETED', 'PARTIAL_SUCCESS'].includes(String(latestRunWithTask.raw_status || '').toUpperCase())
|| ['success', 'partial_success'].includes(String(latestRunWithTask.status || '').toLowerCase())
? 100
: null,
message: latestRunWithTask.message || '最近一次任务',
}
: null
@@ -836,7 +854,12 @@ export default function DinsarProductionPanel({ readOnly = false, onJobQueued })
const logTaskId = monitoredTask?.task_id || '';
const showingRecentTask = !taskMonitor.isBusy && !!monitoredTask;
const activeRunCount = runs.filter(run => ['running', 'pending'].includes(String(run.status || '').toLowerCase())).length;
const failedRunCount = runs.filter(run => ['failed', 'FAILED'].includes(String(run.status || ''))).length;
const issueRunCount = runs.filter(run => {
const status = String(run.status || '').toLowerCase();
const rawStatus = String(run.raw_status || '').toUpperCase();
return ['failed', 'partial_success'].includes(status)
|| ['FAILED', 'PARTIAL_SUCCESS'].includes(rawStatus);
}).length;
const productionReady = !!currentEngineObj?.available && !!rootDir.trim() && !pyintPreviewBlocksSubmit && !readOnly;
const loadEngines = useCallback(async () => {
@@ -1471,9 +1494,9 @@ export default function DinsarProductionPanel({ readOnly = false, onJobQueued })
<span>运行中</span>
<strong>{activeRunCount}</strong>
</div>
<div className={`dinsar-production-signal ${failedRunCount > 0 ? 'warn' : ''}`}>
<span>失败记录</span>
<strong>{failedRunCount}</strong>
<div className={`dinsar-production-signal ${issueRunCount > 0 ? 'warn' : ''}`}>
<span>异常记录</span>
<strong>{issueRunCount}</strong>
</div>
</div>
</div>
frontend/src/components/tasks/TaskStatusPanel.jsx
+25 -2
View File
@@ -25,6 +25,22 @@ const toneColor = {
text: '#b91c1c',
fill: '#dc2626',
},
partial: {
border: '#fcd34d',
bg: '#fffbeb',
text: '#92400e',
fill: '#d97706',
},
};
const TASK_STATUS_LABEL = {
PENDING: '等待中',
RUNNING: '运行中',
COMPLETED: '已完成',
PARTIAL_SUCCESS: '部分成功',
FAILED: '失败',
CANCELLED: '已取消',
CANCELED: '已取消',
};
const normalizeProgress = (value) => {
@@ -34,6 +50,11 @@ const normalizeProgress = (value) => {
};
const isFailed = (task) => String(task?.status || '').toUpperCase() === 'FAILED';
const isPartialSuccess = (task) => String(task?.status || '').toUpperCase() === 'PARTIAL_SUCCESS';
const formatTaskStatus = (status) => {
const normalized = String(status || '-').toUpperCase();
return TASK_STATUS_LABEL[normalized] || normalized;
};
export default function TaskStatusPanel({
title = '任务状态',
@@ -48,7 +69,9 @@ export default function TaskStatusPanel({
}) {
const task = latestTask || activeTasks[0] || recentTasks[0] || null;
const showingRecent = !isBusy && !!task;
const tone = task ? (isFailed(task) ? 'error' : (showingRecent ? 'recent' : 'active')) : 'idle';
const tone = task
? (isFailed(task) ? 'error' : (isPartialSuccess(task) ? 'partial' : (showingRecent ? 'recent' : 'active')))
: 'idle';
const colors = toneColor[tone];
const progress = normalizeProgress(task?.progress);
@@ -82,7 +105,7 @@ export default function TaskStatusPanel({
<div style={{ marginTop: 8, color: colors.text, fontSize: 12, wordBreak: 'break-all' }}>
<span style={{ fontWeight: 700 }}>{getTaskTypeLabel(task.task_type)}</span>
<span style={{ margin: '0 6px' }}>·</span>
<span>{String(task.status || '-').toUpperCase()}</span>
<span>{formatTaskStatus(task.status)}</span>
{task.task_id && (
<>
<span style={{ margin: '0 6px' }}>·</span>
frontend/src/hooks/useGlobalTaskControl.js
+3 -2
View File
@@ -3,6 +3,7 @@ import apiClient from '../api/client';
import { normalizeTaskStatus } from '../utils/appUiHelpers';
const ACTIVE_TASK_FALLBACK_POLL_MS = 10000;
const TERMINAL_TASK_STATUSES = new Set(['COMPLETED', 'PARTIAL_SUCCESS', 'FAILED', 'CANCELLED', 'CANCELED']);
export default function useGlobalTaskControl({
currentUser,
@@ -56,7 +57,7 @@ export default function useGlobalTaskControl({
const taskStatus = normalizeTaskStatus(taskInfo?.status);
// 检查任务是否真正完成：解析 message 中的进度信息
let isReallyFinished = taskStatus === 'COMPLETED' || taskStatus === 'FAILED';
let isReallyFinished = TERMINAL_TASK_STATUSES.has(taskStatus);
// 如果任务状态是 PENDING，检查进度信息
if (taskStatus === 'PENDING' && taskInfo?.message) {
@@ -77,7 +78,7 @@ export default function useGlobalTaskControl({
if (isReallyFinished) {
reallyFinishedIds.push(taskId);
if (taskStatus === 'COMPLETED' || taskStatus === 'FAILED') {
if (TERMINAL_TASK_STATUSES.has(taskStatus)) {
handleTaskCompletionRef.current?.(taskInfo);
}
}