feat(taskcenter): 前端看板页面(页签/筛选/汇总卡/设备条/详情抽屉)
- 路由 task-center/board(menuKey admin_task_center)+ guides 文案,both 由既有门禁守 - api 层 5 个只读接口;详情接口把后端 data:null 归一为 null(unwrap 对 null data 回传信封) - 页签一:5 项汇总卡 + 设备卡条(点击按设备筛选/再点取消)+ 10 列任务表(stuck/网页/失败角标、进度条)+ 详情抽屉(分组明细) - 页签二:变体采集专列(不显示设备与店铺),展示麦象 res_mes 与任务参数 - 30s 轮询:页面隐藏跳过、回前台立即刷新、卸载清理;另有手动刷新 - 顺带补 admin_device_logs 缺失的 guide(79b5d403 登记路由时漏补,align-operation-guide 一直红) Tests run: 1634, Failures: 0(node --test 全量)+ vue-tsc 无错误 + vite build 通过, 浏览器真跑:页签切换、设备卡筛选、详情抽屉均正常,控制台无报错
This commit is contained in:
@@ -0,0 +1,119 @@
|
||||
import { http } from './http'
|
||||
import { unwrap } from './envelope'
|
||||
|
||||
/** 客户端任务管理(后台看板):按账号 × 设备 × 业务统一查看客户端任务,全部只读。 */
|
||||
|
||||
/** 查询参数(由页面侧 buildTaskQuery / buildVariantQuery 产出,空白项不下传)。 */
|
||||
type QueryParams = Record<string, string | number>
|
||||
|
||||
export interface TaskCenterOverview {
|
||||
deviceTotal: number
|
||||
deviceOnline: number
|
||||
runningTasks: number
|
||||
todayFinishedTasks: number
|
||||
stuckTasks: number
|
||||
}
|
||||
|
||||
export interface TaskCenterDevice {
|
||||
deviceId: string
|
||||
deviceName: string | null
|
||||
lastActiveAt: string | null
|
||||
online: boolean
|
||||
runningTasks: number
|
||||
recentTaskAt: string | null
|
||||
webDevice: boolean
|
||||
}
|
||||
|
||||
export interface TaskCenterTaskRow {
|
||||
id: number
|
||||
taskNo: string
|
||||
moduleType: string
|
||||
moduleLabel: string
|
||||
status: string
|
||||
userId: number | null
|
||||
username: string | null
|
||||
deviceId: string | null
|
||||
deviceName: string | null
|
||||
webDevice: boolean
|
||||
shopName: string | null
|
||||
shopCount: number
|
||||
createdAt: string | null
|
||||
finishedAt: string | null
|
||||
progressTotal: number
|
||||
progressSuccess: number
|
||||
progressFailed: number
|
||||
currentScope: string | null
|
||||
message: string | null
|
||||
stuck: boolean
|
||||
}
|
||||
|
||||
export interface TaskCenterTaskPage {
|
||||
items: TaskCenterTaskRow[]
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
}
|
||||
|
||||
export interface TaskCenterShopStat {
|
||||
scopeKey: string
|
||||
total: number
|
||||
success: number
|
||||
failed: number
|
||||
}
|
||||
|
||||
export interface TaskCenterTaskDetail extends TaskCenterTaskRow {
|
||||
shops: TaskCenterShopStat[]
|
||||
errorMessage: string | null
|
||||
}
|
||||
|
||||
export interface TaskCenterVariantTaskRow {
|
||||
taskId: string
|
||||
uid: string | null
|
||||
username: string | null
|
||||
status: number | null
|
||||
statusLabel: string | null
|
||||
resMes: string | null
|
||||
taskData: string | null
|
||||
createTime: string | null
|
||||
updateTime: string | null
|
||||
}
|
||||
|
||||
export interface TaskCenterVariantPage {
|
||||
items: TaskCenterVariantTaskRow[]
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
}
|
||||
|
||||
/** 汇总卡:GET /api/admin/task-center/overview */
|
||||
export async function fetchTaskCenterOverview(): Promise<TaskCenterOverview> {
|
||||
const { data } = await http.get('/api/admin/task-center/overview')
|
||||
return unwrap<TaskCenterOverview>(data)
|
||||
}
|
||||
|
||||
/** 设备花名册(任务设备近 30 天 ∪ 日志设备近 7 天):GET /api/admin/task-center/devices */
|
||||
export async function fetchTaskCenterDevices(): Promise<TaskCenterDevice[]> {
|
||||
const { data } = await http.get('/api/admin/task-center/devices')
|
||||
return unwrap<TaskCenterDevice[]>(data)
|
||||
}
|
||||
|
||||
/** 任务分页列表:GET /api/admin/task-center/tasks */
|
||||
export async function fetchTaskCenterTasks(params: QueryParams): Promise<TaskCenterTaskPage> {
|
||||
const { data } = await http.get('/api/admin/task-center/tasks', { params })
|
||||
return unwrap<TaskCenterTaskPage>(data)
|
||||
}
|
||||
|
||||
/** 任务详情(品牌任务 taskNo 形如 brand-1):GET /api/admin/task-center/tasks/detail
|
||||
* 任务不存在或不在可见范围时后端返回 success + data:null,这里归一为 null 供页面提示(unwrap 对 null data 会回传信封)。 */
|
||||
export async function fetchTaskCenterTaskDetail(taskNo: string): Promise<TaskCenterTaskDetail | null> {
|
||||
const { data } = await http.get('/api/admin/task-center/tasks/detail', { params: { taskNo } })
|
||||
const envelope = data as { data?: unknown } | null
|
||||
if (envelope && typeof envelope === 'object' && 'data' in envelope && envelope.data == null) return null
|
||||
return unwrap<TaskCenterTaskDetail>(data)
|
||||
}
|
||||
|
||||
/** 变体采集(代理麦象 console,取当前可见用户集合):GET /api/admin/task-center/variant-tasks */
|
||||
export async function fetchTaskCenterVariantTasks(params: QueryParams): Promise<TaskCenterVariantPage> {
|
||||
const { data } = await http.get('/api/admin/task-center/variant-tasks', { params })
|
||||
return unwrap<TaskCenterVariantPage>(data)
|
||||
}
|
||||
@@ -82,10 +82,18 @@ export const OPERATION_GUIDES: Record<string, OperationGuideData> = {
|
||||
text: '数字人版本需先上传草稿,再发布并标记最新版本。',
|
||||
steps: ['上传草稿', '确认更新日志', '发布或设为最新'],
|
||||
},
|
||||
admin_device_logs: {
|
||||
text: '桌面客户端与麦象采集机上报的日志按来源、日期和关键字筛选;可查看日志尾部、下载完整文件或删除云端记录,云端日志按保留期自动清理。',
|
||||
steps: ['选择来源与日期', '查看或下载日志', '必要时删除'],
|
||||
},
|
||||
admin_user_secret_usage: {
|
||||
text: '按日期范围统计各用户的密钥调用次数(货源查询与外观专利按 LLM 请求次数、代理按提取次数),用于评估用户资源损耗。',
|
||||
steps: ['选择日期范围', '筛选用户或分组', '核对各模块次数'],
|
||||
},
|
||||
admin_task_center: {
|
||||
text: '按账号和设备查看客户端任务执行情况;点击设备可筛选该设备任务,点任务查看明细。',
|
||||
steps: ['选择筛选条件', '查看设备与任务', '打开任务详情'],
|
||||
},
|
||||
}
|
||||
|
||||
/** 全部有独立/兜底提示的后台业务菜单 key。 */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,197 @@
|
||||
/** 客户端任务管理看板纯逻辑:下拉选项、状态/设备/店铺/进度展示映射、查询参数构建。
|
||||
* 无框架依赖,可直接被 node 单测导入(对齐 tasks 域 image-video-model 的拆法)。 */
|
||||
|
||||
export interface TaskCenterTaskFilter {
|
||||
username: string
|
||||
moduleType: string
|
||||
status: string
|
||||
deviceId: string
|
||||
shop: string
|
||||
startTime: string
|
||||
endTime: string
|
||||
}
|
||||
|
||||
export interface TaskCenterVariantFilter {
|
||||
/** 麦象状态码字符串(''=全部 / 0 等待 / 1 处理中 / 2 已完成 / 3 失败)。 */
|
||||
status: string
|
||||
}
|
||||
|
||||
export type TaskCenterQueryParams = Record<string, string | number>
|
||||
|
||||
export function createTaskFilter(): TaskCenterTaskFilter {
|
||||
return { username: '', moduleType: '', status: '', deviceId: '', shop: '', startTime: '', endTime: '' }
|
||||
}
|
||||
|
||||
export function createVariantFilter(): TaskCenterVariantFilter {
|
||||
return { status: '' }
|
||||
}
|
||||
|
||||
/** 业务下拉:与后端 TaskModuleRegistry 的客户端模块(biz_file_task 12 个 + 品牌检测)对齐。 */
|
||||
export const MODULE_OPTIONS: Array<{ value: string; label: string }> = [
|
||||
{ value: '', label: '全部业务' },
|
||||
{ value: 'PUBLISH', label: '上架' },
|
||||
{ value: 'DELETE_BRAND', label: '删除ASIN' },
|
||||
{ value: 'PRODUCT_RISK_RESOLVE', label: '商品风险解决' },
|
||||
{ value: 'PRICE_TRACK', label: '跟价' },
|
||||
{ value: 'SHOP_MATCH', label: '定时匹配' },
|
||||
{ value: 'PATROL_DELETE', label: '巡店删除' },
|
||||
{ value: 'QUERY_ASIN', label: '查询ASIN' },
|
||||
{ value: 'WITHDRAW', label: '取款' },
|
||||
{ value: 'APPEARANCE_PATENT', label: '外观专利检测' },
|
||||
{ value: 'SIMILAR_ASIN', label: '货源查询' },
|
||||
{ value: 'COLLECT_DATA', label: '采集数据' },
|
||||
{ value: 'SHOP_DATA_CRAWL', label: '店铺数据抓取' },
|
||||
{ value: 'BRAND', label: '品牌检测' },
|
||||
]
|
||||
|
||||
export const TASK_STATUS_OPTIONS: Array<{ value: string; label: string }> = [
|
||||
{ value: '', label: '全部状态' },
|
||||
{ value: 'PENDING', label: '待执行' },
|
||||
{ value: 'RUNNING', label: '执行中' },
|
||||
{ value: 'SCHEDULED', label: '已排期' },
|
||||
{ value: 'SUCCESS', label: '已完成' },
|
||||
{ value: 'FAILED', label: '失败' },
|
||||
{ value: 'CANCELLED', label: '已取消' },
|
||||
]
|
||||
|
||||
export const VARIANT_STATUS_OPTIONS: Array<{ value: string; label: string }> = [
|
||||
{ value: '', label: '全部状态' },
|
||||
{ value: '0', label: '等待执行' },
|
||||
{ value: '1', label: '处理中' },
|
||||
{ value: '2', label: '已完成' },
|
||||
{ value: '3', label: '处理失败' },
|
||||
]
|
||||
|
||||
const TASK_STATUS_LABELS: Record<string, string> = {
|
||||
PENDING: '待执行',
|
||||
RUNNING: '执行中',
|
||||
SCHEDULED: '已排期',
|
||||
SUCCESS: '已完成',
|
||||
COMPLETED: '已完成',
|
||||
FAILED: '失败',
|
||||
ERROR: '失败',
|
||||
CANCELLED: '已取消',
|
||||
CANCELED: '已取消',
|
||||
}
|
||||
|
||||
const VARIANT_STATUS_LABELS: Record<number, string> = {
|
||||
0: '等待执行',
|
||||
1: '处理中',
|
||||
2: '已完成',
|
||||
3: '处理失败',
|
||||
}
|
||||
|
||||
export type TaskStatusType = 'pending' | 'running' | 'success' | 'failed' | 'cancelled'
|
||||
|
||||
export function taskStatusLabel(status: string | null | undefined): string {
|
||||
const key = (status || '').toUpperCase()
|
||||
return TASK_STATUS_LABELS[key] || key || '未知'
|
||||
}
|
||||
|
||||
export function taskStatusType(status: string | null | undefined): TaskStatusType {
|
||||
const key = (status || '').toUpperCase()
|
||||
if (key === 'SUCCESS' || key === 'COMPLETED') return 'success'
|
||||
if (key === 'FAILED' || key === 'ERROR') return 'failed'
|
||||
if (key === 'CANCELLED' || key === 'CANCELED') return 'cancelled'
|
||||
if (key === 'PENDING') return 'pending'
|
||||
return 'running'
|
||||
}
|
||||
|
||||
/** 麦象批量任务状态:0 等待 / 1 处理中 / 2 已完成 / 3 失败(不冒充成功)。 */
|
||||
export function variantStatusLabel(status: number | string | null | undefined): string {
|
||||
if (status == null || status === '') return '未知'
|
||||
const code = Number(status)
|
||||
if (!Number.isFinite(code)) return '未知'
|
||||
return VARIANT_STATUS_LABELS[code] || '未知'
|
||||
}
|
||||
|
||||
export function variantStatusType(status: number | string | null | undefined): TaskStatusType {
|
||||
const code = Number(status)
|
||||
if (code === 2) return 'success'
|
||||
if (code === 3) return 'failed'
|
||||
if (code === 0) return 'pending'
|
||||
return 'running'
|
||||
}
|
||||
|
||||
const DEVICE_ID_DISPLAY_MAX = 18
|
||||
|
||||
/** 设备展示名:优先设备名,缺失时截断设备号(任务侧没有主机名)。 */
|
||||
export function deviceDisplayName(
|
||||
deviceName: string | null | undefined,
|
||||
deviceId: string | null | undefined,
|
||||
): string {
|
||||
const name = (deviceName || '').trim()
|
||||
if (name) return name
|
||||
const id = (deviceId || '').trim()
|
||||
if (!id) return '未记录'
|
||||
return id.length > DEVICE_ID_DISPLAY_MAX ? `${id.slice(0, DEVICE_ID_DISPLAY_MAX - 1)}…` : id
|
||||
}
|
||||
|
||||
/** 店铺展示:主店铺名 + 多店铺数量(口径 = 主来源命中数)。 */
|
||||
export function shopDisplayName(shopName: string | null | undefined, shopCount: number | null | undefined): string {
|
||||
const name = (shopName || '').trim()
|
||||
if (!name) return '—'
|
||||
const count = Number(shopCount || 0)
|
||||
return count > 1 ? `${name} 等${count}个` : name
|
||||
}
|
||||
|
||||
export function progressText(row: { progressSuccess: number; progressTotal: number }): string {
|
||||
const total = Number(row.progressTotal || 0)
|
||||
if (total <= 0) return '—'
|
||||
return `成功 ${Number(row.progressSuccess || 0)} / 总 ${total}`
|
||||
}
|
||||
|
||||
export function progressPercent(row: { progressSuccess: number; progressTotal: number }): number {
|
||||
const total = Number(row.progressTotal || 0)
|
||||
if (total <= 0) return 0
|
||||
const percent = Math.round((Number(row.progressSuccess || 0) / total) * 100)
|
||||
return Math.min(100, Math.max(0, percent))
|
||||
}
|
||||
|
||||
/** datetime-local 原生值(YYYY-MM-DDTHH:mm) → 后端 LocalDateTime 兼容的秒级格式。 */
|
||||
export function toApiTime(value: string | null | undefined): string | undefined {
|
||||
const text = (value || '').trim().replace(' ', 'T')
|
||||
const match = /^(\d{4}-\d{2}-\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/.exec(text)
|
||||
if (!match) return undefined
|
||||
return `${match[1]}T${match[2]}:${match[3]}:${match[4] ?? '00'}`
|
||||
}
|
||||
|
||||
function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value.trim() : ''
|
||||
}
|
||||
|
||||
/** 任务列表查询参数:空白项不下传(后端按缺省处理)。 */
|
||||
export function buildTaskQuery(
|
||||
filter: TaskCenterTaskFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
): TaskCenterQueryParams {
|
||||
const query: TaskCenterQueryParams = { page, pageSize }
|
||||
const put = (key: string, value: string | undefined) => {
|
||||
if (value) query[key] = value
|
||||
}
|
||||
put('username', text(filter.username))
|
||||
put('moduleType', text(filter.moduleType))
|
||||
put('status', text(filter.status))
|
||||
put('deviceId', text(filter.deviceId))
|
||||
put('shop', text(filter.shop))
|
||||
put('startTime', toApiTime(filter.startTime))
|
||||
put('endTime', toApiTime(filter.endTime))
|
||||
return query
|
||||
}
|
||||
|
||||
export function buildVariantQuery(
|
||||
filter: TaskCenterVariantFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
): TaskCenterQueryParams {
|
||||
const query: TaskCenterQueryParams = { page, pageSize }
|
||||
const status = text(filter.status)
|
||||
if (status !== '') query.status = Number(status)
|
||||
return query
|
||||
}
|
||||
|
||||
/** 变体采集账号列:平台账号名缺失(历史伪 uid)时回落显示 uid。 */
|
||||
export function variantAccountText(row: { username: string | null; uid: string | null }): string {
|
||||
return (row.username || '').trim() || (row.uid || '').trim() || '—'
|
||||
}
|
||||
@@ -26,6 +26,7 @@ export const adminPages: AdminPageDef[] = [
|
||||
{ path: 'records/software-version', menuKey: 'admin_version', title: '软件版本管理', load: () => import('@/pages/records/RecordsSoftwareVersionPage.vue') },
|
||||
{ path: 'records/tutorial', menuKey: 'admin_tutorial', title: '教程管理', load: () => import('@/pages/records/RecordsTutorialPage.vue') },
|
||||
{ path: 'records/device-logs', menuKey: 'admin_device_logs', title: '日志管理', load: () => import('@/pages/records/DeviceLogsPage.vue') },
|
||||
{ path: 'task-center/board', menuKey: 'admin_task_center', title: '客户端任务管理', load: () => import('@/pages/task-center/TaskCenterBoardPage.vue') },
|
||||
{ path: 'records/digital-human-version', menuKey: 'digital_human_version', title: '数字人版本管理', load: () => import('@/pages/records/RecordsDigitalHumanVersionPage.vue') },
|
||||
{ path: 'records/image-video-tasks', menuKey: 'admin_image_video_tasks', title: '视频任务记录', load: () => import('@/pages/tasks/ImageVideoTasksPage.vue') },
|
||||
{ path: 'shop-center/data-tasks', menuKey: 'admin_shop_data_crawl_tasks', title: '店铺数据记录', load: () => import('@/pages/tasks/ShopDataTasksPage.vue') },
|
||||
|
||||
Reference in New Issue
Block a user