From 667c2d7cd1eb3b2e6edf59480c6abaaea6962356 Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Fri, 18 Jul 2025 14:10:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?perf:=20=E6=8A=95=E6=94=BE=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E6=A8=A1=E5=9D=97=E8=B5=B0=E6=9F=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account-data/components/board-table/constants.ts | 2 +- .../put-account/account-data/components/filter-block/index.vue | 2 +- .../account-data/components/plan-table/constants.ts | 2 +- .../property-marketing/put-account/account-data/index.vue | 3 ++- .../put-account/components/account-select/index.vue | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/property-marketing/put-account/account-data/components/board-table/constants.ts b/src/views/property-marketing/put-account/account-data/components/board-table/constants.ts index 4bed58a..5239138 100644 --- a/src/views/property-marketing/put-account/account-data/components/board-table/constants.ts +++ b/src/views/property-marketing/put-account/account-data/components/board-table/constants.ts @@ -7,7 +7,7 @@ export const TABLE_COLUMNS = [ title: '账户名称', dataIndex: 'name', prop: 'name', - width: 180, + width: 240, fixed: 'left', }, { diff --git a/src/views/property-marketing/put-account/account-data/components/filter-block/index.vue b/src/views/property-marketing/put-account/account-data/components/filter-block/index.vue index 1e661c1..be083c7 100644 --- a/src/views/property-marketing/put-account/account-data/components/filter-block/index.vue +++ b/src/views/property-marketing/put-account/account-data/components/filter-block/index.vue @@ -38,7 +38,7 @@
关联账户 - +
diff --git a/src/views/property-marketing/put-account/account-data/components/plan-table/constants.ts b/src/views/property-marketing/put-account/account-data/components/plan-table/constants.ts index f517a3a..9f592cf 100644 --- a/src/views/property-marketing/put-account/account-data/components/plan-table/constants.ts +++ b/src/views/property-marketing/put-account/account-data/components/plan-table/constants.ts @@ -7,7 +7,7 @@ export const TABLE_COLUMNS = [ title: '计划名称', dataIndex: 'name', prop: 'name', - width: 180, + width: 240, fixed: 'left', }, { diff --git a/src/views/property-marketing/put-account/account-data/index.vue b/src/views/property-marketing/put-account/account-data/index.vue index 5d6c39a..8ea8e92 100644 --- a/src/views/property-marketing/put-account/account-data/index.vue +++ b/src/views/property-marketing/put-account/account-data/index.vue @@ -91,7 +91,8 @@ const init = () => { selectedRowKeys.value = []; accountTableRef.value?.resetTable(); - const data_time = [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]; + const yesterday = dayjs().subtract(1, 'day').format('YYYY-MM-DD'); + const data_time = [yesterday, yesterday]; query.value.data_time = data_time; getData(); diff --git a/src/views/property-marketing/put-account/components/account-select/index.vue b/src/views/property-marketing/put-account/components/account-select/index.vue index 2c50673..8fe8606 100644 --- a/src/views/property-marketing/put-account/components/account-select/index.vue +++ b/src/views/property-marketing/put-account/components/account-select/index.vue @@ -9,6 +9,7 @@ size="medium" :placeholder="placeholder" allow-clear + allow-search @change="handleChange" > From 59b7c0dc6c158cc1d0f771a935b8c1800acc7999 Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Fri, 18 Jul 2025 14:24:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?perf:=20=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account-data/components/board-table/constants.ts | 2 +- .../property-marketing/put-account/account-data/index.vue | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/property-marketing/put-account/account-data/components/board-table/constants.ts b/src/views/property-marketing/put-account/account-data/components/board-table/constants.ts index 5239138..5b06da3 100644 --- a/src/views/property-marketing/put-account/account-data/components/board-table/constants.ts +++ b/src/views/property-marketing/put-account/account-data/components/board-table/constants.ts @@ -19,7 +19,7 @@ export const TABLE_COLUMNS = [ }, { title: '运营人员', - dataIndex: 'operator_ame', + dataIndex: 'operator_name', prop: 'operator', width: 180, }, diff --git a/src/views/property-marketing/put-account/account-data/index.vue b/src/views/property-marketing/put-account/account-data/index.vue index 8ea8e92..8f7a3e5 100644 --- a/src/views/property-marketing/put-account/account-data/index.vue +++ b/src/views/property-marketing/put-account/account-data/index.vue @@ -92,7 +92,7 @@ const init = () => { accountTableRef.value?.resetTable(); const yesterday = dayjs().subtract(1, 'day').format('YYYY-MM-DD'); - const data_time = [yesterday, yesterday]; + const data_time = [yesterday, yesterday]; query.value.data_time = data_time; getData(); @@ -137,9 +137,11 @@ const handleSelectionChange = (selectedRows) => { }; const handleTabClick = (key) => { + dataSource.value = []; + selectedRowKeys.value = []; + pageInfo.value = cloneDeep(INITIAL_PAGE_INFO); activeTab.value = key; getData(); - }; const handleExport = () => { From 09b14e5ceb6c824eba5bd506fb754a51a4bd6209 Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Fri, 18 Jul 2025 14:52:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E6=82=AC?= =?UTF-8?q?=E5=81=9C=E6=98=BE=E7=A4=BA=E5=AE=8C=E6=95=B4=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../put-account/components/account-select/index.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/property-marketing/put-account/components/account-select/index.vue b/src/views/property-marketing/put-account/components/account-select/index.vue index 8fe8606..ebfc7ce 100644 --- a/src/views/property-marketing/put-account/components/account-select/index.vue +++ b/src/views/property-marketing/put-account/components/account-select/index.vue @@ -12,9 +12,11 @@ allow-search @change="handleChange" > - - {{ item.name }} - + + + {{ item.name }} + + From 3bfad300281401c5b96950dca1be20dc6ec1b775 Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Fri, 18 Jul 2025 14:55:58 +0800 Subject: [PATCH 4/6] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7id=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../media-account/account-detail/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/property-marketing/media-account/account-detail/constants.ts b/src/views/property-marketing/media-account/account-detail/constants.ts index 1a13eeb..63a5105 100644 --- a/src/views/property-marketing/media-account/account-detail/constants.ts +++ b/src/views/property-marketing/media-account/account-detail/constants.ts @@ -30,7 +30,7 @@ export const getAccountInfoFields = (dateType: string, showMore: boolean) => { { title: '数据更新时间', dataIndex: 'last_synced_at', notDifferentiateDateType: true }, { title: '平台', dataIndex: 'platform', notDifferentiateDateType: true }, { title: '状态', dataIndex: 'status', type: 'status', notDifferentiateDateType: true }, - { title: '账号ID', dataIndex: 'id', notDifferentiateDateType: true }, + { title: '账号ID', dataIndex: 'account_id', notDifferentiateDateType: true }, { title: '手机号码', dataIndex: 'mobile', notDifferentiateDateType: true }, { title: '运营人员', dataIndex: 'operator.name', notDifferentiateDateType: true }, { title: '所属项目', dataIndex: 'group.name', notDifferentiateDateType: true }, From 3ed801ddc33e3c613d7dfd7e5934b9fe3ec3b2e5 Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Fri, 18 Jul 2025 16:11:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E6=89=B9=E9=87=8F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BB=BB=E5=8A=A1=E7=BB=93=E6=9D=9F=E5=90=8Eupdate?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/account-table/index.vue | 23 ++++++++++++++++--- .../media-account/account-manage/index.vue | 11 +++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue b/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue index 6a333b6..2c82938 100644 --- a/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue +++ b/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue @@ -28,9 +28,7 @@
数据更新时间 - {{ - exactFormatTime(item.last_synced_at, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm:ss') - }} + {{ getLastSyncedAt(item) }}
平台 @@ -144,6 +142,10 @@ const props = defineProps({ type: Array, default: () => [], }, + isLoadingTaskStatus: { + type: Boolean, + default: () => false, + }, }); const emits = defineEmits(['openEdit', 'update', 'selectionChange', 'delete']); @@ -172,6 +174,9 @@ const isSyncing = (item) => { if (!props.syncMediaAccounts.length) return false; const target = props.syncMediaAccounts.find((v) => v.id === item.id); + if(target) { + return target?.status === 0; + } return target?.status === 0; }; @@ -265,6 +270,18 @@ const onDeleteSyncStatus = async (item) => { await deleteSyncStatus(item.id); item.status = 1; }; +const formatTime = (time) => { + return exactFormatTime(time, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm:ss'); +}; +const getLastSyncedAt = (item) => { + const target = props.syncMediaAccounts.find((v) => v.id === item.id); + if (props.isLoadingTaskStatus && target) { + if (target?.status !== 0) { + return formatTime(target.last_synced_at); + } + } + return formatTime(item.last_synced_at); +};