关键词热度榜
diff --git a/src/views/components/dataEngine/topHeader.vue b/src/views/components/dataEngine/topHeader.vue
index aca2867..60367cc 100644
--- a/src/views/components/dataEngine/topHeader.vue
+++ b/src/views/components/dataEngine/topHeader.vue
@@ -3,8 +3,8 @@
行业大类
diff --git a/src/views/components/workplace/modules/product.vue b/src/views/components/workplace/modules/product.vue
index ba97097..c59c429 100644
--- a/src/views/components/workplace/modules/product.vue
+++ b/src/views/components/workplace/modules/product.vue
@@ -1,6 +1,6 @@
-
+
+
diff --git a/src/views/property-marketing/media-account/account-manage/components/batch-tag-modal/index.vue b/src/views/property-marketing/media-account/account-manage/components/batch-tag-modal/index.vue
index fdf8c94..bb173bb 100644
--- a/src/views/property-marketing/media-account/account-manage/components/batch-tag-modal/index.vue
+++ b/src/views/property-marketing/media-account/account-manage/components/batch-tag-modal/index.vue
@@ -47,7 +47,7 @@
-
+
diff --git a/src/views/property-marketing/media-account/account-manage/components/group-manage-modal/index.vue b/src/views/property-marketing/media-account/account-manage/components/group-manage-modal/index.vue
index 1ce5664..d451d51 100644
--- a/src/views/property-marketing/media-account/account-manage/components/group-manage-modal/index.vue
+++ b/src/views/property-marketing/media-account/account-manage/components/group-manage-modal/index.vue
@@ -32,6 +32,7 @@
+
![]()
已开通
未开通
@@ -21,7 +21,7 @@
{{ props.product.desc }}
-
@@ -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/media-account/account-detail/components/note-table/index.vue b/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue
index 96e673d..85e88f2 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
@@ -49,7 +49,15 @@
重置
- 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);
diff --git a/src/views/property-marketing/put-account/account-manage/components/authorized-account-modal/index.vue b/src/views/property-marketing/put-account/account-manage/components/authorized-account-modal/index.vue
index 6f8efa2..4f5bb36 100644
--- a/src/views/property-marketing/put-account/account-manage/components/authorized-account-modal/index.vue
+++ b/src/views/property-marketing/put-account/account-manage/components/authorized-account-modal/index.vue
@@ -16,9 +16,9 @@
![]()
@@ -65,14 +65,18 @@
import dayjs from 'dayjs';
import { defineExpose, ref, computed, defineEmits } from 'vue';
import { exactFormatTime } from '@/utils/tools';
-import { putPlacementAccountsAuthorized, getPlacementAccountsAuthorizedStatus } from '@/api/all/propertyMarketing';
+import {
+ putPlacementAccountsAuthorized,
+ getPlacementAccountsAuthorizedStatus,
+ postPlacementAccountsSync,
+} from '@/api/all/propertyMarketing';
import icon1 from '@/assets/img/media-account/icon-warn-1.png';
import icon2 from '@/assets/img/media-account/icon-feedback-success.png';
import icon3 from '@/assets/img/media-account/icon-feedback-fail.png';
const emits = defineEmits(['update']);
-
+const INITIAL_SYNC_TYPE = 'sync';
const visible = ref(false);
const isLoading = ref(false);
const isCompleted = ref(false);
@@ -81,9 +85,10 @@ const formRef = ref(null);
const failReason = ref('');
const progress = ref(0);
const id = ref('');
-const lastSyncedAt = ref(null);
-const syncType = ref('sync'); // sync ｜ no_sync
+
+const lastSyncedAt = ref(null); // 上次同步时间戳
const showSyncTip = ref(false);
+const syncType = ref(INITIAL_SYNC_TYPE); // sync ｜ no_sync
const INITIAL_FORM = {
account: '',
@@ -111,6 +116,15 @@ const confirmBtnText = computed(() => {
return isSuccess.value ? '继续添加' : '重试';
});
+const getDaysDiffText = (lastSyncedAt) => {
+ if (!lastSyncedAt) return '0天';
+
+ const daysDiff = dayjs().diff(dayjs(lastSyncedAt * 1000), 'day');
+
+ if (daysDiff === 0) return '不到1天';
+ return `${daysDiff}天`;
+};
+
const open = (accountId, last_synced_at = null) => {
id.value = accountId;
lastSyncedAt.value = last_synced_at;
@@ -129,7 +143,7 @@ const close = () => {
progress.value = 0;
id.value = '';
lastSyncedAt.value = null;
- syncType.value = 'sync';
+ syncType.value = INITIAL_SYNC_TYPE;
showSyncTip.value = false;
clearFakeProgressTimer();
clearStatusPollingTimer();
@@ -206,8 +220,8 @@ const clearFakeProgressTimer = () => {
}
};
-const handleOk = () => {
- if (lastSyncedAt.value) {
+const handleSyncData = () => {
+ if (!showSyncTip.value) {
formRef.value.validate(async (errors) => {
if (!errors) {
showSyncTip.value = true;
@@ -216,6 +230,23 @@ const handleOk = () => {
return;
}
+ if (syncType.value === INITIAL_SYNC_TYPE) {
+ postPlacementAccountsSync(id.value).then((res) => {
+ if (res.code === 200) {
+ close();
+ }
+ });
+ } else {
+ close();
+ }
+};
+
+const handleOk = () => {
+ if (lastSyncedAt.value && lastSyncedAt.value < dayjs().startOf('day').valueOf()) {
+ handleSyncData();
+ return;
+ }
+
if (isCompleted.value) {
if (isSuccess.value) {
emits('update');
diff --git a/vite.config.ts b/vite.config.ts
index 94e04ca..70c8cae 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -40,8 +40,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''),
// 目标地址
- target: 'http://192.168.40.3/api',
- // target: 'https://lingjiapi.lvfunai.com/api',
+ target: 'https://lingjiapi.lvfunai.com/api',
},
},
},
- 检测到该账户最后更新日期为{{ exactFormatTime(lastSyncedAt, 'MM-DD', 'YYYY-MM-DD') }}，已有{{ - dayjs().diff(dayjs(lastSyncedAt * 1000), 'day') - }}天未同步最新数据。 + 检测到该账户最后更新日期为{{ exactFormatTime(lastSyncedAt, 'MM月DD日HH:mm', 'YYYY年MM月DD日 HH:mm') }}，已有{{ + getDaysDiffText(lastSyncedAt) + }}未同步最新数据。