diff --git a/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/index.vue index f76889b..bb32412 100644 --- a/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/index.vue +++ b/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/index.vue @@ -28,7 +28,7 @@ :disabled="option.is_require === ENUM_STATUS.NO" @change="(checked) => onCheckChange(checked, option)" > - {{ option.label }} + {{ localFields.find((item) => item.prop === option.value)?.title }} @@ -77,7 +77,7 @@ import { ref, defineExpose } from 'vue'; import { VueDraggable } from 'vue-draggable-plus'; import { getCustomColumns, updateCustomColumns } from '@/api/all/common'; -import { getPropPrefix } from '@/views/property-marketing/media-account/account-dashboard/constants'; +import { getPropPrefix, getDefaultColumns } from '@/views/property-marketing/media-account/account-dashboard/constants'; import icon1 from './img/icon-lock.png'; @@ -106,9 +106,13 @@ const dataSource = ref([]); const checkColumns = ref([]); // 选中字段 const allColumns = ref([]); // 所有字段 const requiredGroupNames = ref([]); // 必选分组名称 +const localFields = ref([]); const open = () => { initData(); + + localFields.value = getDefaultColumns(props.dateType); + visible.value = true; }; @@ -118,6 +122,7 @@ const close = () => { dataSource.value = []; checkColumns.value = []; allColumns.value = []; + localFields.value = []; requiredGroupNames.value = []; }; @@ -150,8 +155,8 @@ const isCheck = (option) => { return checkColumns.value.includes(option.value); }; const getCheckColumnLabel = (value) => { - const column = allColumns.value.find((column) => column.value === value); - return column?.label; + const column = localFields.value.find((column) => column.prop === value); + return column?.title; }; const isRequiredColumn = (value) => { const column = allColumns.value.find((column) => column.value === value); diff --git a/src/views/property-marketing/media-account/account-dashboard/constants.ts b/src/views/property-marketing/media-account/account-dashboard/constants.ts index 9ca7e76..898c27c 100644 --- a/src/views/property-marketing/media-account/account-dashboard/constants.ts +++ b/src/views/property-marketing/media-account/account-dashboard/constants.ts @@ -72,7 +72,7 @@ export const getDefaultColumns = (type = 'week') => { fixed: 'left', }, { - title: '项目分组', + title: '账号分组', dataIndex: 'group.name', prop: 'group', width: 180, @@ -111,7 +111,7 @@ export const getDefaultColumns = (type = 'week') => { { title: '总赞藏数', dataIndex: 'like_collect_number', - prop: 'like_collect_number', + prop: 'like_number', width: 180, tooltip: '账号所有内容获得的点赞数与收藏数总和，用于衡量历史内容的整体吸引力与认可度。', align: 'right', @@ -222,6 +222,17 @@ export const getDefaultColumns = (type = 'week') => { sortDirections: ['ascend', 'descend'], }, }, + { + title: '次新作品收藏数', + dataIndex: 'second_new_work_collect_number', + prop: 'second_new_work_collect_number', + width: 180, + tooltip: '次新作品内容的收藏数', + align: 'right', + sortable: { + sortDirections: ['ascend', 'descend'], + }, + }, { title: '次新作品评论数', dataIndex: 'second_new_work_comment_number', 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 0c2764a..4bed58a 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 @@ -20,7 +20,7 @@ export const TABLE_COLUMNS = [ { title: '运营人员', dataIndex: 'operator_ame', - prop: 'operator_ame', + prop: 'operator', width: 180, }, { @@ -73,8 +73,8 @@ export const TABLE_COLUMNS = [ }, // { // title: '账户余额', - // dataIndex: 'balance', - // prop: 'balance', + // dataIndex: 'balance_amount', + // prop: 'balance_amount', // width: 180, // tooltip: '当前账户剩余的可用余额，用于后续广告投放。', // prefix: '¥', @@ -83,23 +83,23 @@ export const TABLE_COLUMNS = [ // sortDirections: ['ascend', 'descend'], // }, // }, - // { - // title: 'AI评价', - // dataIndex: 'ai_evaluate', - // prop: 'ai_evaluate', - // width: 260, - // }, - // { - // title: '投资回报率', - // dataIndex: 'roi', - // prop: 'roi', - // width: 180, - // tooltip: '投入产出比（ROI），等于收益 ÷ 投入，反映投放带来的商业价值。', - // align: 'right', - // sortable: { - // sortDirections: ['ascend', 'descend'], - // }, - // }, + { + title: 'AI评价', + dataIndex: 'ai_evaluate', + prop: 'ai_evaluate', + width: 260, + }, + { + title: '投资回报率', + dataIndex: 'roi', + prop: 'roi', + width: 180, + tooltip: '投入产出比（ROI），等于收益 ÷ 投入，反映投放带来的商业价值。', + align: 'right', + sortable: { + sortDirections: ['ascend', 'descend'], + }, + }, // { // title: '投资回报率环比', // dataIndex: 'roi_chain', @@ -114,7 +114,7 @@ export const TABLE_COLUMNS = [ // }, // }, { - title: '展示量', + title: '展示数', dataIndex: 'show_number', prop: 'show_number', width: 180, @@ -124,21 +124,21 @@ export const TABLE_COLUMNS = [ sortDirections: ['ascend', 'descend'], }, }, - // { - // title: '展示量环比', - // dataIndex: 'view_number_chain', - // prop: 'view_number_chain', - // width: 180, - // tooltip: '展示量与上一周期的变化百分比，反映广告曝光趋势。', - // align: 'right', - // suffix: '%', - // isRateField: true, - // sortable: { - // sortDirections: ['ascend', 'descend'], - // }, - // }, { - title: '点击量', + title: '展示数环比', + dataIndex: 'show_number_chain', + prop: 'show_number_chain', + width: 180, + tooltip: '展示数与上一周期的变化百分比，反映广告曝光趋势。', + align: 'right', + suffix: '%', + isRateField: true, + sortable: { + sortDirections: ['ascend', 'descend'], + }, + }, + { + title: '点击数', dataIndex: 'click_number', prop: 'click_number', width: 180, @@ -148,19 +148,19 @@ export const TABLE_COLUMNS = [ sortDirections: ['ascend', 'descend'], }, }, - // { - // title: '点击量环比', - // dataIndex: 'click_number_chain', - // prop: 'click_number_chain', - // width: 180, - // tooltip: '当前周期点击量相较上一周期的变化百分比。', - // align: 'right', - // suffix: '%', - // isRateField: true, - // sortable: { - // sortDirections: ['ascend', 'descend'], - // }, - // }, + { + title: '点击数环比', + dataIndex: 'click_number_chain', + prop: 'click_number_chain', + width: 180, + tooltip: '当前周期点击数相较上一周期的变化百分比。', + align: 'right', + suffix: '%', + isRateField: true, + sortable: { + sortDirections: ['ascend', 'descend'], + }, + }, { title: '点击率', dataIndex: 'click_rate', @@ -172,19 +172,19 @@ export const TABLE_COLUMNS = [ sortDirections: ['ascend', 'descend'], }, }, - // { - // title: '点击率环比', - // dataIndex: 'click_rate_chain', - // prop: 'click_rate_chain', - // width: 180, - // tooltip: '当前 CTR 相较上一周期的变化百分比，评估广告表现是否优化。', - // align: 'right', - // suffix: '%', - // isRateField: true, - // sortable: { - // sortDirections: ['ascend', 'descend'], - // }, - // }, + { + title: '点击率环比', + dataIndex: 'click_rate_chain', + prop: 'click_rate_chain', + width: 180, + tooltip: '当前 CTR 相较上一周期的变化百分比，评估广告表现是否优化。', + align: 'right', + suffix: '%', + isRateField: true, + sortable: { + sortDirections: ['ascend', 'descend'], + }, + }, { title: '平均点击成本', dataIndex: 'avg_click_cost', @@ -197,7 +197,7 @@ export const TABLE_COLUMNS = [ }, }, { - title: '千次展现费用', + title: '千次展示费用', dataIndex: 'thousand_show_cost', prop: 'thousand_show_cost', width: 180, @@ -296,14 +296,4 @@ export const TABLE_COLUMNS = [ // prop: 'newest_work_title', // width: 260, // }, - // { - // title: '投放回报率', - // dataIndex: 'roi_chain1', - // prop: 'roi_chain1', - // width: 180, - // align: 'right', - // sortable: { - // sortDirections: ['ascend', 'descend'], - // }, - // }, ]; 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 80ddf5b..1e661c1 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 @@ -48,7 +48,7 @@
activeTab.value === '1'); +const init = () => { + query.value = cloneDeep(INITIAL_QUERY); + dataSource.value = []; + pageInfo.value = cloneDeep(INITIAL_PAGE_INFO); + selectedRowKeys.value = []; + accountTableRef.value?.resetTable(); + + const data_time = [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]; + query.value.data_time = data_time; + + getData(); +}; + const getData = async () => { const _fn = isAccountTab.value ? getPlacementAccountData : getPlacementAccountDataList; const { page, page_size } = pageInfo.value; @@ -113,14 +126,6 @@ const reload = () => { getData(); }; -const handleReset = () => { - pageInfo.value = cloneDeep(INITIAL_PAGE_INFO); - selectedRowKeys.value = []; - accountTableRef.value?.resetTable(); - query.value = cloneDeep(INITIAL_QUERY); - reload(); -}; - const handleSorterChange = (column, order) => { query.value.column = column; query.value.order = order; @@ -132,8 +137,7 @@ const handleSelectionChange = (selectedRows) => { const handleTabClick = (key) => { activeTab.value = key; - dataSource.value = []; - handleReset(); + init(); }; const handleExport = () => { @@ -153,7 +157,7 @@ const handleOpenGroupModal = () => { }; onMounted(() => { - getData(); + init(); }); diff --git a/src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue b/src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue index fda9e1d..021d701 100644 --- a/src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue +++ b/src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue @@ -119,14 +119,14 @@ - + - + @@ -173,7 +173,7 @@ const INITIAL_FORM = { operator_name: '', holder_name: '', platform: 0, - is_sync: 0, + is_sync_project: 0, }; const visible = ref(false);