feat: 7月迭代
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 4m21s

This commit is contained in:
luo
2026-07-28 14:00:22 +08:00
parent f0a2b84e53
commit 2706c52a47
63 changed files with 4113 additions and 3945 deletions

View File

@@ -2,7 +2,6 @@
<ArtTableFullScreen>
<div class="task-detail-page" id="table-full-screen">
<ElCard shadow="never" class="art-table-card">
<!-- 页面头部 -->
<div class="detail-header">
<ElButton @click="goBack">
<template #icon>
@@ -10,35 +9,59 @@
</template>
返回
</ElButton>
<h2 class="detail-title">任务详情</h2>
<h2 class="detail-title">{{ taskTitle }}</h2>
</div>
<!-- 使用 DetailPage 组件显示任务信息 -->
<DetailPage v-if="taskDetail" :sections="detailSections" :data="taskDetail" />
<!-- 失败记录 -->
<div class="failure-section" v-if="taskDetail?.fail_count && taskDetail.fail_count > 0">
<div v-if="taskDetail?.fail_count && taskDetail.fail_count > 0" class="result-section">
<ElDivider content-position="left">
<span class="section-title">失败记录 ({{ taskDetail.fail_count }})</span>
<span class="section-title"
>{{ resultAction }}失败记录 ({{ taskDetail.fail_count }})</span
>
</ElDivider>
<ElTable :data="taskDetail.failed_items || []" border style="width: 100%">
<ElTableColumn prop="line" label="行号" width="100" />
<ElTableColumn v-if="taskType === 'card'" prop="iccid" label="ICCID" min-width="180" />
<ElTableColumn v-else prop="virtual_no" label="设备号" min-width="180" />
<ElTableColumn prop="reason" label="失败原因" min-width="300" />
<ElTableColumn v-else label="设备标识" min-width="180" show-overflow-tooltip>
<template #default="scope">
{{ scope.row.device_identifier || scope.row.virtual_no || '-' }}
</template>
</ElTableColumn>
<ElTableColumn prop="reason" :label="`${resultAction}失败原因`" min-width="300" />
</ElTable>
</div>
<!-- 跳过记录 -->
<div class="skipped-section" v-if="taskDetail?.skip_count && taskDetail.skip_count > 0">
<div v-if="taskDetail?.skip_count && taskDetail.skip_count > 0" class="result-section">
<ElDivider content-position="left">
<span class="section-title">跳过记录 ({{ taskDetail.skip_count }})</span>
<span class="section-title"
>{{ resultAction }}跳过记录 ({{ taskDetail.skip_count }})</span
>
</ElDivider>
<ElTable :data="taskDetail.skipped_items || []" border style="width: 100%">
<ElTableColumn prop="line" label="行号" width="100" />
<ElTableColumn v-if="taskType === 'card'" prop="iccid" label="ICCID" min-width="180" />
<ElTableColumn v-else prop="virtual_no" label="设备号" min-width="180" />
<ElTableColumn prop="reason" label="跳过原因" min-width="300" />
<ElTableColumn v-else label="设备标识" min-width="180" show-overflow-tooltip>
<template #default="scope">
{{ scope.row.device_identifier || scope.row.virtual_no || '-' }}
</template>
</ElTableColumn>
<ElTableColumn prop="reason" :label="`${resultAction}跳过原因`" min-width="300" />
</ElTable>
</div>
<div v-if="warningCount > 0" class="result-section">
<ElDivider content-position="left">
<span class="section-title">{{ resultAction }}警告记录 ({{ warningCount }})</span>
</ElDivider>
<ElTable :data="warningItems" border style="width: 100%">
<ElTableColumn prop="line" label="行号" width="100" />
<ElTableColumn label="设备标识" min-width="180" show-overflow-tooltip>
<template #default="scope">
{{ scope.row.device_identifier || scope.row.virtual_no || '-' }}
</template>
</ElTableColumn>
<ElTableColumn prop="reason" label="警告原因" min-width="300" />
</ElTable>
</div>
</ElCard>
@@ -47,16 +70,15 @@
</template>
<script setup lang="ts">
import { computed, h } from 'vue'
import { computed, h, onMounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { ref, onMounted } from 'vue'
import { CardService, DeviceService } from '@/api/modules'
import { ElDivider, ElIcon, ElMessage, ElTable, ElTableColumn, ElTag } from 'element-plus'
import type { TagProps } from 'element-plus'
import { ArrowLeft } from '@element-plus/icons-vue'
import { formatDateTime } from '@/utils/business/format'
import type { IotCardImportTaskDetail } from '@/types/api/card'
import type { DeviceImportTaskDetail } from '@/types/api/device'
import type { DeviceImportTaskDetail, DeviceImportTaskOperationType } from '@/types/api/device'
import type { DetailSection } from '@/components/common/DetailPage.vue'
import DetailPage from '@/components/common/DetailPage.vue'
import { useUserStore } from '@/store/modules/user'
@@ -72,12 +94,53 @@
type TaskDetail = IotCardImportTaskDetail | DeviceImportTaskDetail
const taskDetail = ref<TaskDetail | null>(null)
const loading = ref(false)
const taskType = ref<TaskType>('card')
const loading = ref(false)
const getOperationLabel = (operationType?: DeviceImportTaskOperationType) => {
switch (operationType) {
case 'assign_shop':
return '分配目标代理'
case 'assign_series':
return '设置套餐系列'
case 'recall':
return '批量回收设备'
case 'import':
return '导入设备'
default:
return '设备任务'
}
}
const deviceTask = computed(() =>
taskType.value === 'device' ? (taskDetail.value as DeviceImportTaskDetail | null) : null
)
const taskTitle = computed(() =>
taskType.value === 'device'
? `${getOperationLabel(deviceTask.value?.operation_type)}任务详情`
: 'ICCID导入任务详情'
)
const resultAction = computed(() => {
if (taskType.value !== 'device') return '导入'
switch (deviceTask.value?.operation_type) {
case 'assign_shop':
return '分配'
case 'assign_series':
return '设置套餐系列'
case 'recall':
return '回收'
default:
return '导入'
}
})
const warningCount = computed(() =>
taskType.value === 'device' ? deviceTask.value?.warning_count || 0 : 0
)
const warningItems = computed(() =>
taskType.value === 'device' ? deviceTask.value?.warning_items || [] : []
)
// 获取状态标签类型
const getStatusType = (status?: number): TagProps['type'] => {
if (!status) return 'info'
switch (status) {
case 1:
return 'info'
@@ -92,8 +155,54 @@
}
}
// 详情页配置
const detailSections = computed((): DetailSection[] => {
const deviceFields: DetailSection['fields'] =
taskType.value === 'device'
? [
{
label: '操作名称',
prop: 'operation_name',
formatter: (value: string) =>
value || getOperationLabel(deviceTask.value?.operation_type)
},
{
label: '目标 ID',
prop: 'target_id',
formatter: (value: number | null) => String(value ?? '-')
}
]
: []
const cardFields: DetailSection['fields'] =
taskType.value === 'card'
? [
{
label: '运营商',
prop: 'carrier_name',
formatter: (value: string) => value || '-'
},
{
label: '卡业务类型',
render: (data: any) => {
if (!data.card_category) return h('span', '-')
return h(
ElTag,
{
type: data.card_category === 'industry' ? 'warning' : 'success',
size: 'small'
},
() =>
data.card_category === 'normal'
? '普通卡'
: data.card_category === 'industry'
? '行业卡'
: data.card_category
)
}
}
]
: []
return [
{
title: '任务基本信息',
@@ -101,69 +210,44 @@
{ label: '任务编号', prop: 'task_no', formatter: (value: string) => value || '-' },
{
label: '任务类型',
render: () => {
return h(
render: () =>
h(
ElTag,
{ type: taskType.value === 'device' ? 'warning' : 'primary', size: 'small' },
() => (taskType.value === 'device' ? '设备导入' : 'ICCID导入')
() =>
taskType.value === 'device'
? getOperationLabel(deviceTask.value?.operation_type)
: 'ICCID导入'
)
}
},
...deviceFields,
{ label: '批次号', prop: 'batch_no', formatter: (value: string) => value || '-' },
{ label: '文件名', prop: 'file_name', formatter: (value: string) => value || '-' },
{
label: '操作人',
prop: 'creator_name',
formatter: (value: string) => value || '-'
},
{ label: '操作人', prop: 'creator_name', formatter: (value: string) => value || '-' },
{
label: '任务状态',
render: (data: TaskDetail) => {
return h(ElTag, { type: getStatusType(data.status) }, () => data.status_text)
}
render: (data: TaskDetail) =>
h(
ElTag,
{ type: getStatusType(data.status) },
() => (data as DeviceImportTaskDetail).status_name || data.status_text || '-'
)
},
...(taskType.value === 'card'
? [
{
label: '运营商',
prop: 'carrier_name',
formatter: (value: any) => value || '-'
},
{
label: '卡业务类型',
render: (data: any) => {
if (!data.card_category) return h('span', '-')
return h(
ElTag,
{
type: data.card_category === 'industry' ? 'warning' : 'success',
size: 'small'
},
() =>
data.card_category === 'normal'
? '普通卡'
: data.card_category === 'industry'
? '行业卡'
: data.card_category
)
}
}
]
: []),
...cardFields,
{
label: '创建时间',
prop: 'created_at',
formatter: (value: Date) => (value ? formatDateTime(value) : '-')
formatter: (value: string) => (value ? formatDateTime(value) : '-')
},
{
label: '开始处理时间',
prop: 'started_at',
formatter: (value: Date) => (value ? formatDateTime(value) : '-')
formatter: (value: string | null) => (value ? formatDateTime(value) : '-')
},
{
label: '完成时间',
prop: 'completed_at',
formatter: (value: Date) => (value ? formatDateTime(value) : '-')
formatter: (value: string | null) => (value ? formatDateTime(value) : '-')
},
...(taskDetail.value?.error_message
? [
@@ -171,13 +255,12 @@
label: '错误信息',
prop: 'error_message',
fullWidth: true,
render: (data: TaskDetail) => {
return h(
render: (data: TaskDetail) =>
h(
'span',
{ style: { color: 'var(--el-color-danger)' } },
data.error_message || ''
)
}
}
]
: [])
@@ -189,64 +272,57 @@
fields: [
{
label: '总数',
render: (data: TaskDetail) => {
return h(
render: (data: TaskDetail) =>
h(
'span',
{
style: {
fontSize: '16px',
fontWeight: 'bold',
color: 'var(--el-color-primary)'
}
style: { fontSize: '16px', fontWeight: 'bold', color: 'var(--el-color-primary)' }
},
String(data.total_count || 0)
)
}
},
{
label: '成功数',
render: (data: TaskDetail) => {
return h(ElTag, { type: 'success' }, () => String(data.success_count || 0))
}
render: (data: TaskDetail) =>
h(ElTag, { type: 'success' }, () => String(data.success_count || 0))
},
{
label: '失败数',
render: (data: TaskDetail) => {
return h(ElTag, { type: 'danger' }, () => String(data.fail_count || 0))
}
render: (data: TaskDetail) =>
h(ElTag, { type: 'danger' }, () => String(data.fail_count || 0))
},
{
label: '跳过数',
render: (data: TaskDetail) => {
return h(ElTag, { type: 'warning' }, () => String(data.skip_count || 0))
}
}
render: (data: TaskDetail) =>
h(ElTag, { type: 'warning' }, () => String(data.skip_count || 0))
},
...(taskType.value === 'device'
? [
{
label: '警告数',
render: (data: TaskDetail) =>
h(ElTag, { type: 'info' }, () =>
String((data as DeviceImportTaskDetail).warning_count || 0)
)
}
]
: [])
]
}
]
})
// 返回列表
const goBack = () => {
router.back()
}
const goBack = () => router.back()
// 获取任务详情
const getTaskDetail = async () => {
const taskId = route.query.id
const queryTaskType = route.query.task_type as TaskType | undefined
if (!taskId) {
ElMessage.error('缺少任务ID参数')
ElMessage.error('缺少任务 ID 参数')
goBack()
return
}
// 设置任务类型
if (queryTaskType) {
taskType.value = queryTaskType
}
if (queryTaskType) taskType.value = queryTaskType
if (taskType.value === 'device' && !isPlatformAccount.value) {
ElMessage.error('当前账号无权查看设备任务详情')
goBack()
@@ -256,28 +332,22 @@
loading.value = true
try {
if (taskType.value === 'device') {
// 获取设备导入任务详情
const res = await DeviceService.getImportTaskDetail(Number(taskId))
if (res.code === 0) {
taskDetail.value = res.data
}
if (res.code === 0) taskDetail.value = res.data
} else {
// 获取ICCID导入任务详情
const res = await CardService.getIotCardImportTaskDetail(Number(taskId))
if (res.code === 0) {
taskDetail.value = res.data
}
if (res.code === 0) taskDetail.value = res.data
}
} catch (error) {
console.error(error)
console.log('获取任务详情失败')
console.error('获取任务详情失败:', error)
ElMessage.error('获取任务详情失败')
} finally {
loading.value = false
}
}
onMounted(() => {
getTaskDetail()
void getTaskDetail()
})
</script>
@@ -285,8 +355,8 @@
.task-detail-page {
.detail-header {
display: flex;
gap: 16px;
align-items: center;
gap: 16px;
padding-bottom: 16px;
.detail-title {
@@ -297,8 +367,7 @@
}
}
.failure-section,
.skipped-section {
.result-section {
margin-top: 20px;
.section-title {