From dc60dacb02d8d0947619ca741b1d6ff7b72446b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?= Date: Thu, 11 Sep 2025 14:36:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor(contact-import):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E5=AF=BC=E5=85=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89=E5=92=8C=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将ContactImportTask相关类型统一为Allocation类型 - 优化详情页样式和布局 - 移除冗余样式和代码 --- .../contact-import/detail/index.module.scss | 61 ++++---- .../workspace/contact-import/detail/index.tsx | 95 +++++++------ .../workspace/contact-import/form/api.ts | 10 +- .../workspace/contact-import/form/data.ts | 131 ++++++++++++++++++ .../workspace/contact-import/form/index.tsx | 7 +- 5 files changed, 215 insertions(+), 89 deletions(-) diff --git a/Cunkebao/src/pages/mobile/workspace/contact-import/detail/index.module.scss b/Cunkebao/src/pages/mobile/workspace/contact-import/detail/index.module.scss index aaf113753..1404f16fb 100644 --- a/Cunkebao/src/pages/mobile/workspace/contact-import/detail/index.module.scss +++ b/Cunkebao/src/pages/mobile/workspace/contact-import/detail/index.module.scss @@ -1,7 +1,5 @@ .container { padding: 12px; - background-color: #f5f5f5; - min-height: 100vh; } .loading { @@ -25,8 +23,7 @@ background: #fff; border-radius: 8px; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06); - margin-bottom: 16px; - + :global(.adm-card-body) { padding: 16px; } @@ -61,8 +58,8 @@ .actions { display: flex; - gap: 8px; - + gap: 20px; + :global(.adm-button) { flex: 1; border-radius: 6px; @@ -75,21 +72,21 @@ border-radius: 8px; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06); overflow: hidden; - + :global(.adm-tabs-header) { background: #fafafa; border-bottom: 1px solid #f0f0f0; } - + :global(.adm-tabs-tab) { font-size: 15px; font-weight: 500; - + &.adm-tabs-tab-active { color: #1890ff; } } - + :global(.adm-tabs-tab-line) { background: #1890ff; } @@ -106,7 +103,7 @@ background: #fff; border-radius: 8px; border: 1px solid #f0f0f0; - + :global(.adm-card-body) { padding: 16px; } @@ -158,11 +155,11 @@ border-radius: 8px; border: 1px solid #f0f0f0; margin-bottom: 12px; - + :global(.adm-list-item-content) { padding: 16px; } - + &:last-child { margin-bottom: 0; } @@ -201,12 +198,12 @@ display: flex; align-items: center; font-size: 13px; - + .label { min-width: 70px; color: #666; } - + .value { color: #333; } @@ -237,19 +234,19 @@ border-radius: 12px; font-size: 12px; padding: 2px 8px; - + &.adm-tag-success { background: #f6ffed; border-color: #b7eb8f; color: #52c41a; } - + &.adm-tag-danger { background: #fff2f0; border-color: #ffccc7; color: #ff4d4f; } - + &.adm-tag-warning { background: #fff7e6; border-color: #ffd591; @@ -267,47 +264,43 @@ // 响应式设计 @media (max-width: 480px) { - .container { - padding: 8px; - } - .taskName { font-size: 16px; } - + .taskStatus { font-size: 13px; padding: 3px 10px; } - + .cardTitle { font-size: 15px; } - + .infoItem { font-size: 13px; } - + .label { min-width: 70px; } - + .recordDevice { font-size: 13px; } - + .recordTime { font-size: 11px; } - + .recordDetail { font-size: 12px; - + .label { min-width: 60px; } } - + .recordError { font-size: 12px; padding: 6px 10px; @@ -317,16 +310,16 @@ // 空状态样式 :global(.adm-empty) { padding: 40px 20px; - + .adm-empty-image { width: 60px; height: 60px; opacity: 0.3; } - + .adm-empty-description { color: #999; font-size: 14px; margin-top: 12px; } -} \ No newline at end of file +} diff --git a/Cunkebao/src/pages/mobile/workspace/contact-import/detail/index.tsx b/Cunkebao/src/pages/mobile/workspace/contact-import/detail/index.tsx index 06ad03106..e50de7e7a 100644 --- a/Cunkebao/src/pages/mobile/workspace/contact-import/detail/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/contact-import/detail/index.tsx @@ -21,10 +21,7 @@ import { triggerImport, toggleContactImportTask, } from "../list/api"; -import { - ContactImportTask, - ContactImportRecord, -} from "../list/data"; +import { ContactImportTask, ContactImportRecord } from "../list/data"; import { PlayCircleOutlined, PauseCircleOutlined, @@ -39,7 +36,7 @@ import style from "./index.module.scss"; const ContactImportDetail: React.FC = () => { const navigate = useNavigate(); const { id } = useParams<{ id: string }>(); - + const [task, setTask] = useState(null); const [records, setRecords] = useState([]); const [loading, setLoading] = useState(false); @@ -51,7 +48,7 @@ const ContactImportDetail: React.FC = () => { // 获取任务详情 const loadTaskDetail = async () => { if (!id) return; - + setLoading(true); try { const response = await fetchContactImportTaskDetail(id); @@ -71,7 +68,7 @@ const ContactImportDetail: React.FC = () => { // 获取导入记录 const loadRecords = async (pageNum: number = 1, reset: boolean = false) => { if (!id) return; - + setRecordsLoading(true); try { const response = await fetchImportRecords(id, pageNum, 20); @@ -96,7 +93,7 @@ const ContactImportDetail: React.FC = () => { // 切换任务状态 const handleToggleStatus = async () => { if (!task) return; - + try { await toggleContactImportTask({ id: task.id, @@ -118,7 +115,7 @@ const ContactImportDetail: React.FC = () => { // 手动触发导入 const handleTriggerImport = async () => { if (!task) return; - + try { await triggerImport(task.id); Toast.show({ @@ -250,31 +247,20 @@ const ContactImportDetail: React.FC = () => { return ( navigate("/workspace/contact-import/list")} - > - 返回 - - } - title="任务详情" - right={ - - } - /> - } - > - -
+ <> + + navigate(`/workspace/contact-import/form/${task.id}`) + } + > + 编辑 + + } + /> {/* 任务操作栏 */}
@@ -290,14 +276,17 @@ const ContactImportDetail: React.FC = () => {
- + + } + > + +
{/* 标签页 */} {
设备组数: - {task.deviceGroups?.length || 0} + + {task.deviceGroups?.length || 0} +
导入数量: @@ -363,11 +358,15 @@ const ContactImportDetail: React.FC = () => {
每日最大导入: - {task.maxImportsPerDay} + + {task.maxImportsPerDay} +
导入间隔: - {task.importInterval}分钟 + + {task.importInterval}分钟 +
@@ -378,11 +377,15 @@ const ContactImportDetail: React.FC = () => {
今日导入: - {task.todayImportCount} + + {task.todayImportCount} +
总导入数: - {task.totalImportCount} + + {task.totalImportCount} +
创建时间: @@ -403,7 +406,7 @@ const ContactImportDetail: React.FC = () => { ) : ( - {records.map((record) => ( + {records.map(record => (
@@ -440,7 +443,7 @@ const ContactImportDetail: React.FC = () => { ))} )} - + { ); }; -export default ContactImportDetail; \ No newline at end of file +export default ContactImportDetail; diff --git a/Cunkebao/src/pages/mobile/workspace/contact-import/form/api.ts b/Cunkebao/src/pages/mobile/workspace/contact-import/form/api.ts index 3b3217e9d..d9abded4c 100644 --- a/Cunkebao/src/pages/mobile/workspace/contact-import/form/api.ts +++ b/Cunkebao/src/pages/mobile/workspace/contact-import/form/api.ts @@ -1,6 +1,6 @@ import request from "@/api/request"; import { - ContactImportTask, + Allocation, CreateContactImportTaskData, UpdateContactImportTaskData, ContactImportRecord, @@ -21,16 +21,12 @@ export function fetchContactImportTaskDetail(id: number) { } // 创建通讯录导入任务 -export function createContactImportTask( - data: CreateContactImportTaskData, -): Promise { +export function createContactImportTask(data: Allocation): Promise { return request("/v1/workbench/create", { ...data, type: 6 }, "POST"); } // 更新通讯录导入任务 -export function updateContactImportTask( - data: UpdateContactImportTaskData, -): Promise { +export function updateContactImportTask(data: Allocation): Promise { return request("/v1/workbench/update", { ...data, type: 6 }, "POST"); } diff --git a/Cunkebao/src/pages/mobile/workspace/contact-import/form/data.ts b/Cunkebao/src/pages/mobile/workspace/contact-import/form/data.ts index 8031789fb..4847665ee 100644 --- a/Cunkebao/src/pages/mobile/workspace/contact-import/form/data.ts +++ b/Cunkebao/src/pages/mobile/workspace/contact-import/form/data.ts @@ -35,3 +35,134 @@ export interface Allocation { endTime?: string | null; [key: string]: any; } +// 通讯录导入任务状态 +export type ContactImportTaskStatus = 1 | 2; // 1: 开启, 2: 关闭 + +// 设备组信息 +export interface DeviceGroup { + id: string; + name: string; + deviceCount: number; + status: "online" | "offline"; + lastActive: string; +} + +// 通讯录导入记录 +export interface ContactImportRecord { + id: string; + workbenchId: string; + wechatAccountId: string; + deviceId: string; + num: number; + clientId: string; + remarkType: string; + remarkValue: string; + startTime: string; + endTime: string; + createTime: string; + operatorName: string; + operatorAvatar: string; + deviceName: string; + importStatus: "success" | "failed" | "pending"; + errorMessage?: string; +} + +// 通讯录导入任务配置 +export interface ContactImportTaskConfig { + id: number; + workbenchId: number; + devices: number[]; + pools: number[]; + num: number; + clearContact: number; + remarkType: number; + remark: string; + startTime: string; + endTime: string; + createTime: string; +} + +// 通讯录导入任务 +export interface ContactImportTask { + id: number; + companyId: number; + name: string; + type: number; + status: ContactImportTaskStatus; + autoStart: number; + userId: number; + createTime: string; + updateTime: string; + config: ContactImportTaskConfig; + creatorName: string; + auto_like: any; + moments_sync: any; + traffic_config: any; + group_push: any; + group_create: any; + // 计算属性，用于向后兼容 + deviceGroups?: string[]; + todayImportCount?: number; + totalImportCount?: number; + maxImportsPerDay?: number; + importInterval?: number; +} + +// 创建通讯录导入任务数据 +export interface CreateContactImportTaskData { + name: string; + type: number; + config: { + devices: number[]; + pools: number[]; + num: number; + clearContact: number; + remarkType: number; + remark: string; + startTime: string; + endTime: string; + }; +} + +// 更新通讯录导入任务数据 +export interface UpdateContactImportTaskData + extends CreateContactImportTaskData { + id: number; +} + +// 任务配置 +export interface TaskConfig { + deviceGroups: string[]; + num: number; + clientId: string; + remarkType: string; + remarkValue: string; + startTime: string; + endTime: string; + maxImportsPerDay: number; + importInterval: number; +} + +// API响应 +export interface ApiResponse { + code: number; + msg: string; + data: T; +} + +// 分页响应 +export interface PaginatedResponse { + list: T[]; + total: number; + page: number; + limit: number; +} + +// 统计数据 +export interface ImportStats { + totalTasks: number; + activeTasks: number; + todayImports: number; + totalImports: number; + successRate: number; +} diff --git a/Cunkebao/src/pages/mobile/workspace/contact-import/form/index.tsx b/Cunkebao/src/pages/mobile/workspace/contact-import/form/index.tsx index 3364540d8..a76062407 100644 --- a/Cunkebao/src/pages/mobile/workspace/contact-import/form/index.tsx +++ b/Cunkebao/src/pages/mobile/workspace/contact-import/form/index.tsx @@ -135,10 +135,13 @@ const ContactImportForm: React.FC = () => { }; if (isEdit && id) { - await updateContactImportTask({ ...submitData, id: Number(id) }); + await updateContactImportTask({ + ...submitData, + id: Number(id), + } as Allocation); message.success("更新成功"); } else { - await createContactImportTask(submitData); + await createContactImportTask(submitData as Allocation); message.success("创建成功"); }