From 4428e3b44de3803d9528b6f9dd10d21946a577f5 Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Thu, 25 Sep 2025 17:54:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=BA=A2=E5=87=BA=E6=8F=90=E7=A4=BA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/export-task/constants.ts | 2 +- .../components/export-task/index.vue | 12 ++++++++---- .../components/export-task/style.scss | 13 +++++++++++++ .../components/import-task/index.vue | 5 ++++- .../components/import-task/style.scss | 13 +++++++++++++ .../components/account-table/index.vue | 2 +- .../account-detail/components/note-table/index.vue | 2 +- .../media-account/node-detail/index.vue | 2 +- 8 files changed, 42 insertions(+), 9 deletions(-) diff --git a/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts b/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts index 1134c9a..33af223 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts +++ b/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts @@ -20,7 +20,7 @@ export const TABLE_COLUMNS = [ { title: '状态', dataIndex: 'status', - width: 100, + width: 80, }, { title: '创建时间', diff --git a/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue b/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue index da31b73..e171ab3 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue +++ b/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue @@ -4,6 +4,8 @@ import { Button, Checkbox, Input, Table, Pagination, message, notification } fro import SvgIcon from '@/components/svg-icon/index.vue'; import NoData from '@/components/no-data'; +import TextOverTips from '@/components/text-over-tips/index.vue'; + import { getTask, postRedoTask, postBatchDownload, batchQueryTaskStatus } from '@/api/all/common'; import { INITIAL_FORM, TABLE_COLUMNS } from './constants'; import { EXPORT_TASK_STATUS, enumTaskStatus } from '../../constants'; @@ -213,7 +215,7 @@ export default { allowClear onChange={handleSearch} v-slots={{ - prefix: () => , + prefix: () => , }} /> @@ -227,7 +229,7 @@ export default { allowClear onChange={handleSearch} v-slots={{ - prefix: () => , + prefix: () => , }} /> @@ -308,8 +310,10 @@ export default { {EXPORT_TASK_STATUS.find((v) => v.value === record.status)?.label} ); + } else if (column.dataIndex === 'name') { + return ; } else if (column.dataIndex === 'operator.name') { - return record.operator?.name || record.operator?.mobile; + return {record.operator?.name || record.operator?.mobile}; } else if (column.dataIndex === 'created_at') { return exactFormatTime(record.created_at, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm:ss'); } else { @@ -320,7 +324,7 @@ export default { ))} record.status !== enumTaskStatus.Exporting) ? 120 : 60} + width={dataSource.value.some((record) => record.status !== enumTaskStatus.Exporting) ? 120 : 80} fixed="right" title="操作" customRender={({ record }) => ( diff --git a/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss b/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss index 6fe18d5..977f002 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss +++ b/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss @@ -83,4 +83,17 @@ } } } + :deep(.ant-table) { + .ant-table-container { + display: flex; + flex-direction: column; + .ant-table-header { + flex-shrink: 0; + } + .ant-table-body { + // flex: 1; + // overflow: hidden; + } + } + } } diff --git a/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue b/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue index 43ec333..b898022 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue +++ b/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue @@ -3,6 +3,7 @@ import { ref, computed } from 'vue'; import { Button, Table, Pagination } from 'ant-design-vue'; import NoData from '@/components/no-data'; import DeleteTaskModal from './delete-task-modal.vue'; +import TextOverTips from '@/components/text-over-tips/index.vue'; import { getTask } from '@/api/all/common'; import { INITIAL_FORM, TABLE_COLUMNS } from './constants'; @@ -156,6 +157,8 @@ export default { {IMPORT_TASK_STATUS.find((v) => v.value === record.status)?.label} ); + } else if (column.dataIndex === 'name') { + return ; } else if (column.dataIndex === 'operator.name') { return {record.operator?.name || record.operator?.mobile}; } else if (column.dataIndex === 'created_at') { @@ -168,7 +171,7 @@ export default { ))} record.status === enumTaskStatus.Failed) ? 180 : 60} + width={dataSource.value.some((record) => record.status === enumTaskStatus.Failed) ? 180 : 80} fixed="right" title="操作" customRender={({ record }) => ( diff --git a/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss b/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss index 216880a..b49a423 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss +++ b/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss @@ -83,4 +83,17 @@ } } } + :deep(.ant-table) { + .ant-table-container { + display: flex; + flex-direction: column; + .ant-table-header { + flex-shrink: 0; + } + .ant-table-body { + // flex: 1; + // overflow: hidden; + } + } + } } diff --git a/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue index 21f911c..cdf564f 100644 --- a/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue +++ b/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue @@ -63,7 +63,7 @@ {{ column.title }} - + diff --git a/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue b/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue index 6ed27e3..17436a0 100644 --- a/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue +++ b/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue @@ -68,7 +68,7 @@