feat(login): 增加登录任务账号信息与筛选

This commit is contained in:
yml
2026-11-20 20:58:25 +08:00
parent 00c30cc24e
commit 8869e427d2
6 changed files with 651 additions and 66 deletions
+36 -11
View File
@@ -1,5 +1,8 @@
import api from './client';
import type { BatchLoginResult, LoginTaskItem, MessageDeletedResponse, MessageResponse, TaskSummary } from './types';
import type {
BatchLoginResult, LoginTaskFilterOptions, LoginTaskItem, MessageDeletedResponse,
MessageResponse, TaskSummary,
} from './types';
interface CreateBatchParams {
account_ids: number[];
@@ -17,35 +20,57 @@ export interface TaskPage {
page_size: number;
}
export interface LoginTaskFilters {
batch_id?: string;
status?: string;
search?: string;
tag?: string;
assigned_user_id?: number;
assign_status?: string;
ck_status?: string;
account_status?: string;
}
const filterParams = (params: LoginTaskFilters) => ({
batch_id: params.batch_id ?? '',
status: params.status ?? '',
search: params.search ?? '',
tag: params.tag ?? '',
assigned_user_id: params.assigned_user_id,
assign_status: params.assign_status ?? '',
ck_status: params.ck_status ?? '',
account_status: params.account_status ?? '',
});
export const loginApi = {
createBatch: (params: CreateBatchParams) =>
api.post<BatchLoginResult, BatchLoginResult>('/login/batch', params),
// 不传 page 时后端返回裸数组(老调用方契约),传了才返回 {items,total}。
listTasks: (batch_id?: string) =>
api.get<LoginTaskItem[], LoginTaskItem[]>('/login/tasks', { params: batch_id ? { batch_id } : {} }),
listTasksPaged: (params: { page: number; page_size: number; batch_id?: string; status?: string }) =>
api.get<TaskPage, TaskPage>('/login/tasks', { params: { ...params, batch_id: params.batch_id ?? '' } }),
tasksSummary: () => api.get<TaskSummary, TaskSummary>('/login/tasks/summary'),
listTasksPaged: (params: LoginTaskFilters & { page: number; page_size: number }) =>
api.get<TaskPage, TaskPage>('/login/tasks', { params: { ...params, ...filterParams(params) } }),
taskFilterOptions: () =>
api.get<LoginTaskFilterOptions, LoginTaskFilterOptions>('/login/tasks/filters'),
tasksSummary: (params: LoginTaskFilters = {}) =>
api.get<TaskSummary, TaskSummary>('/login/tasks/summary', { params: filterParams(params) }),
/**
* 导出登录任务 CSV(按当前筛选,不分页)。
*
* `status` 传 'failed' 时后端会展开成 failed + error —— 页面上「失败」
* 本来就是一个组,导出与列表口径必须一致。
*/
exportTasks: (params: { batch_id?: string; status?: string }) =>
exportTasks: (params: LoginTaskFilters) =>
api.get<Blob, Blob>('/login/tasks/export', {
responseType: 'blob',
params: {
batch_id: params.batch_id ?? '',
status: params.status ?? '',
},
params: filterParams(params),
}),
stop: (batch_id: string) => api.post<MessageResponse, MessageResponse>(`/login/stop/${batch_id}`),
deleteTask: (id: number) => api.delete<MessageResponse, MessageResponse>(`/login/tasks/${id}`),
deleteTasks: (ids: number[]) => api.delete<MessageDeletedResponse, MessageDeletedResponse>(`/login/tasks`, { params: { task_ids: ids.join(',') } }),
// 跨页全选用:按当前筛选条件删除全部(后端会跳过在途任务)。
deleteTasksMatching: (params: { batch_id?: string; status?: string }) =>
deleteTasksMatching: (params: LoginTaskFilters) =>
api.delete<MessageDeletedResponse, MessageDeletedResponse>('/login/tasks', {
params: { all_matching: true, batch_id: params.batch_id ?? '', status: params.status ?? '' },
params: { all_matching: true, ...filterParams(params) },
}),
};
+12
View File
@@ -469,6 +469,13 @@ export interface LoginTaskItem {
batch_id: string;
account_id: number;
account_username: string;
account_tag: string;
assigned_to: number | null;
assigned_username: string;
account_status: string;
ck_check_status: string;
ck_checked_at: string | null;
cookie_updated_at: string | null;
status: string;
cookie: string;
message: string;
@@ -477,6 +484,11 @@ export interface LoginTaskItem {
finished_at: string | null;
}
export interface LoginTaskFilterOptions {
tags: string[];
assigned_users: { id: number; username: string }[];
}
export interface YybTask {
id: number;
task_id: string;
+239 -37
View File
@@ -1,19 +1,22 @@
import { useEffect, useState, useMemo, useCallback, useRef } from 'react';
import {
Table, Button, Select, Tag, Space, InputNumber, Tooltip, Popconfirm, theme, Modal, Form, Dropdown,
Table, Button, Select, Tag, Space, Input, InputNumber, Tooltip, Popconfirm, theme, Modal, Form, Dropdown, Typography,
} from 'antd';
import { message } from '../utils/antdMessage';
import {
PlayCircleOutlined, StopOutlined, FilterOutlined, ReloadOutlined, DeleteOutlined,
SettingOutlined, SafetyCertificateOutlined, DownloadOutlined,
SettingOutlined, SafetyCertificateOutlined, DownloadOutlined, ClearOutlined,
} from '@ant-design/icons';
import { accountApi, loginApi, type AccountItem, type LoginTaskItem, type TaskSummary } from '../api/modules';
import type { LoginTaskFilters } from '../api/login';
import RealtimeLogPanel from '../components/RealtimeLogPanel';
import { usePermissions } from '../hooks/usePermissions';
import { useWebSocketLogs } from '../hooks/useWebSocketLogs';
import { formatTime } from '../utils/time';
import { getErrorMessage } from '../utils/error';
const { Text } = Typography;
const STATUS_COLORS: Record<string, string> = {
pending: 'default',
running: 'processing',
@@ -40,6 +43,29 @@ const STATUS_LABELS: Record<string, string> = {
account_auth_unknown: '认证状态未知',
};
const ACCOUNT_STATUS_LABELS: Record<string, string> = {
imported: '未登录',
active: '正常',
invalid: 'CK 失效',
manual: '待人工',
disabled: '已停用',
archived: '已归档',
};
const CK_STATUS_LABELS: Record<string, string> = {
valid: '有效',
invalid: '失效',
error: '检测异常',
'': '未确认',
};
const CK_STATUS_COLORS: Record<string, string> = {
valid: 'green',
invalid: 'red',
error: 'orange',
'': 'default',
};
type BatchMode = 'login' | 'check';
const ACCOUNT_PAGE_SIZE = 50;
@@ -98,6 +124,13 @@ export default function LoginTasksPage() {
return v ? Math.max(1, Math.min(500, Number(v) || 50)) : 50;
});
const [taskStatus, setTaskStatus] = useState<string>('');
const [taskSearch, setTaskSearch] = useState('');
const [taskTag, setTaskTag] = useState<string | undefined>();
const [taskOwnerFilter, setTaskOwnerFilter] = useState<string | undefined>();
const [taskCkStatus, setTaskCkStatus] = useState<string | undefined>();
const [taskAccountStatus, setTaskAccountStatus] = useState<string | undefined>();
const [taskFilterTags, setTaskFilterTags] = useState<string[]>([]);
const [taskAssignedUsers, setTaskAssignedUsers] = useState<{ id: number; username: string }[]>([]);
const [taskTotal, setTaskTotal] = useState(0);
// 全局统计走 /tasks/summary:分页后 tasks 只是当前页,
// 用它算「成功/失败」会和「共 N 个任务」对不上(曾显示「共 8508,成功 48」)。
@@ -159,6 +192,16 @@ export default function LoginTasksPage() {
}
}, []);
const loadTaskFilterOptions = useCallback(async () => {
try {
const data = await loginApi.taskFilterOptions();
setTaskFilterTags(data.tags);
setTaskAssignedUsers(data.assigned_users);
} catch {
// 筛选项加载失败不影响任务列表本身。
}
}, []);
const loadAllAccountsByTag = useCallback(async (tag: string) => {
const items: AccountItem[] = [];
for (let page = 1; ; page += 1) {
@@ -209,16 +252,38 @@ export default function LoginTasksPage() {
}
}, [loadAllAccountsByTag, selectedTags]);
const taskFilterParams = useMemo<LoginTaskFilters>(() => {
const owner = taskOwnerFilter || '';
return {
batch_id: batchId || undefined,
status: taskStatus || undefined,
search: taskSearch.trim() || undefined,
tag: taskTag || undefined,
assigned_user_id: owner && owner !== 'unassigned' ? Number(owner) : undefined,
assign_status: owner === 'unassigned' ? 'unassigned' : undefined,
ck_status: taskCkStatus || undefined,
account_status: taskAccountStatus || undefined,
};
}, [batchId, taskStatus, taskSearch, taskTag, taskOwnerFilter, taskCkStatus, taskAccountStatus]);
const hasTaskFilters = useMemo(
() => Object.values(taskFilterParams).some((value) => value !== undefined && value !== ''),
[taskFilterParams],
);
const hasVisibleTaskFilters = useMemo(
() => Boolean(taskSearch || taskTag || taskOwnerFilter || taskCkStatus || taskAccountStatus || taskStatus),
[taskSearch, taskTag, taskOwnerFilter, taskCkStatus, taskAccountStatus, taskStatus],
);
const loadTasks = useCallback(async () => {
// 「最新请求获胜」而不是「有请求在跑就丢弃」:轮询请求在途时用户点了翻页,
// 旧写法会把这次翻页请求直接吞掉,页面停在上一页直到下次轮询。
const reqId = ++taskRequestRef.current;
try {
const data = await loginApi.listTasksPaged({
...taskFilterParams,
page: taskPage,
page_size: taskPageSize,
batch_id: batchId || undefined,
status: taskStatus || undefined,
});
if (reqId !== taskRequestRef.current) return; // 已有更新的请求,丢弃本次结果
setTasks(data.items);
@@ -226,7 +291,7 @@ export default function LoginTasksPage() {
} catch {
// 忽略轮询失败,下一次定时刷新会继续尝试。
}
}, [batchId, taskPage, taskPageSize, taskStatus]);
}, [taskFilterParams, taskPage, taskPageSize]);
const hasActiveTasks = useMemo(
() => tasks.some((task) => ['pending', 'running'].includes(task.status)),
@@ -256,15 +321,16 @@ export default function LoginTasksPage() {
useEffect(() => {
void loadTags();
void loadTaskFilterOptions();
void loadTasks();
}, [loadTags, loadTasks]);
}, [loadTags, loadTaskFilterOptions, loadTasks]);
// 全局统计:随任务刷新一起更新,保证与列表同频。
useEffect(() => {
let alive = true;
const loadSummary = async () => {
try {
const data = await loginApi.tasksSummary();
const data = await loginApi.tasksSummary(taskFilterParams);
if (alive) setTaskSummary(data);
} catch {
// 统计失败不影响列表使用
@@ -276,7 +342,7 @@ export default function LoginTasksPage() {
alive = false;
clearInterval(timer);
};
}, [taskTotal]);
}, [taskFilterParams, taskTotal]);
useEffect(() => {
const timer = window.setTimeout(() => {
@@ -376,10 +442,7 @@ export default function LoginTasksPage() {
}
try {
const res = selectedAllMatching
? await loginApi.deleteTasksMatching({
batch_id: batchId || undefined,
status: taskStatus || undefined,
})
? await loginApi.deleteTasksMatching(taskFilterParams)
: await loginApi.deleteTasks(selectedRowKeys);
message.success(res.message || `已删除 ${res.deleted} 个任务`);
setSelectedRowKeys([]);
@@ -399,13 +462,15 @@ export default function LoginTasksPage() {
* 导出的是**全部匹配记录**,不是当前页。
*/
const handleExport = async (scope: 'current' | 'all' | 'success' | 'failed') => {
const status =
scope === 'current' ? taskStatus : scope === 'all' ? '' : scope;
const params: LoginTaskFilters =
scope === 'all'
? { batch_id: batchId || undefined, status: '' }
: {
...taskFilterParams,
status: scope === 'current' ? taskStatus : scope,
};
try {
const blob = await loginApi.exportTasks({
batch_id: batchId || undefined,
status,
});
const blob = await loginApi.exportTasks(params);
const url = URL.createObjectURL(blob instanceof Blob ? blob : new Blob([blob]));
const a = document.createElement('a');
a.href = url;
@@ -423,7 +488,7 @@ export default function LoginTasksPage() {
const handleClearFailed = async () => {
try {
const res = await loginApi.deleteTasksMatching({
batch_id: batchId || undefined,
...taskFilterParams,
status: 'failed',
});
message.success(res.message || `已删除 ${res.deleted} 个任务`);
@@ -446,6 +511,17 @@ export default function LoginTasksPage() {
setSelectedRowKeys([]);
};
const clearTaskFilters = () => {
setTaskSearch('');
setTaskTag(undefined);
setTaskOwnerFilter(undefined);
setTaskCkStatus(undefined);
setTaskAccountStatus(undefined);
setTaskStatus('');
setTaskPage(1);
clearSelection();
};
const successCount = taskSummary?.success ?? 0;
const failedCount = taskSummary?.failed ?? 0;
const checkedCount = tasks.filter((t) => [
@@ -494,10 +570,39 @@ export default function LoginTasksPage() {
const columns = [
{ title: 'ID', dataIndex: 'id', width: 60 },
{ title: '账号', dataIndex: 'account_username' },
{ title: '登录账号', dataIndex: 'account_username' },
{
title: '状态',
title: '标签',
dataIndex: 'account_tag',
width: 110,
render: (tag: string) => tag ? <Tag color="blue">{tag}</Tag> : <Text type="secondary">-</Text>,
},
{
title: '当前归属客服',
dataIndex: 'assigned_username',
width: 130,
render: (name: string) => name || <Text type="secondary">未分配</Text>,
},
{
title: 'CK 状态',
dataIndex: 'ck_check_status',
width: 100,
render: (status: string) => (
<Tag color={CK_STATUS_COLORS[status] || 'default'}>
{CK_STATUS_LABELS[status] || status || '未确认'}
</Tag>
),
},
{
title: '账号状态',
dataIndex: 'account_status',
width: 100,
render: (status: string) => ACCOUNT_STATUS_LABELS[status] || status || '-',
},
{
title: '任务状态',
dataIndex: 'status',
width: 100,
render: (status: string) => <Tag color={STATUS_COLORS[status]}>{STATUS_LABELS[status] || status}</Tag>,
},
{ title: '消息', dataIndex: 'message', ellipsis: true },
@@ -536,7 +641,7 @@ export default function LoginTasksPage() {
<Select
mode="multiple"
style={{ minWidth: 200, maxWidth: 300 }}
placeholder="按标签筛选"
placeholder="登录选号标签"
value={selectedTags}
onChange={handleTagChange}
options={allTags.map((t) => ({ value: t, label: t }))}
@@ -549,7 +654,7 @@ export default function LoginTasksPage() {
<Select
mode="multiple"
style={{ minWidth: 280, flex: 1, maxWidth: 500 }}
placeholder="选择账号"
placeholder="选择要登录的账号"
value={selectedIds}
onChange={setSelectedIds}
options={accountSelectOptions}
@@ -652,6 +757,116 @@ export default function LoginTasksPage() {
)}
</div>
)}
<div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap', marginTop: 8 }}>
<Input.Search
allowClear
size="small"
placeholder="搜索登录账号"
value={taskSearch}
onChange={(event) => {
setTaskSearch(event.target.value);
setTaskPage(1);
clearSelection();
}}
style={{ width: 180 }}
/>
<Select
allowClear
showSearch
size="small"
placeholder="标签"
value={taskTag}
onChange={(value) => {
setTaskTag(value);
setTaskPage(1);
clearSelection();
}}
options={taskFilterTags.map((item) => ({ value: item, label: item }))}
style={{ width: 140 }}
/>
<Select
allowClear
showSearch
size="small"
placeholder="当前归属客服"
value={taskOwnerFilter}
onChange={(value) => {
setTaskOwnerFilter(value);
setTaskPage(1);
clearSelection();
}}
options={[
{ value: 'unassigned', label: '未分配' },
...taskAssignedUsers.map((user) => ({
value: String(user.id),
label: user.username,
})),
]}
style={{ width: 150 }}
/>
<Select
allowClear
size="small"
placeholder="任务状态"
value={taskStatus || undefined}
onChange={(value) => {
setTaskStatus(value || '');
setTaskPage(1);
clearSelection();
}}
options={[
{ value: 'success', label: '成功' },
{ value: 'failed', label: '失败' },
{ value: 'pending', label: '等待中' },
{ value: 'running', label: '进行中' },
{ value: 'stopped', label: '已停止' },
]}
style={{ width: 125 }}
/>
<Select
allowClear
size="small"
placeholder="CK 状态"
value={taskCkStatus}
onChange={(value) => {
setTaskCkStatus(value);
setTaskPage(1);
clearSelection();
}}
options={[
{ value: 'valid', label: '有效' },
{ value: 'invalid', label: '失效' },
{ value: 'error', label: '检测异常' },
{ value: 'unchecked', label: '未确认' },
]}
style={{ width: 125 }}
/>
<Select
allowClear
size="small"
placeholder="账号状态"
value={taskAccountStatus}
onChange={(value) => {
setTaskAccountStatus(value);
setTaskPage(1);
clearSelection();
}}
options={Object.entries(ACCOUNT_STATUS_LABELS).map(([value, label]) => ({
value,
label,
}))}
style={{ width: 125 }}
/>
{hasVisibleTaskFilters && (
<Button
size="small"
icon={<ClearOutlined />}
onClick={clearTaskFilters}
>
清除筛选
</Button>
)}
</div>
</div>
{/* 概览 + 任务列表区域 */}
@@ -661,22 +876,9 @@ export default function LoginTasksPage() {
<span>共 <b>{taskTotal}</b> 个任务</span>
<span>成功 <b style={{ color: token.colorSuccess }}>{successCount}</b></span>
<span>失败 <b style={{ color: token.colorError }}>{failedCount}</b></span>
{taskStatus && <span>(筛选后 {taskTotal} 条)</span>}
{hasTaskFilters && <span>(筛选后 {taskTotal} 条)</span>}
{checkedCount > 0 && <span>本页检测 <b>{checkedCount}</b></span>}
{effectiveBatchId && <span>批次: <b>{effectiveBatchId}</b></span>}
<Select
size="small"
style={{ width: 130 }}
value={taskStatus}
onChange={(v) => { setTaskStatus(v); setTaskPage(1); clearSelection(); }}
options={[
{ value: '', label: '全部状态' },
{ value: 'success', label: '成功' },
{ value: 'failed', label: '失败' },
{ value: 'pending', label: '等待中' },
{ value: 'running', label: '进行中' },
]}
/>
<Dropdown
menu={{
items: [