Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-内容上传审核_rxd

# Conflicts:
#	src/components/_base/navbar/components/navbar-menu/index.vue
This commit is contained in:
rd
2025-07-31 11:27:09 +08:00
22 changed files with 617 additions and 308 deletions

View File

@ -132,8 +132,8 @@ import BatchGroupModal from './components/batch-group-modal';
import { INITIAL_QUERY, INITIAL_PAGE_INFO } from './constants';
import { showImportResultNotification } from '@/utils/arcoD';
import { EnumStatus } from '@/views/property-marketing/media-account/components/status-select/constants';
import { getTaskStatus } from '@/api/all/common';
import { EnumStatus } from '@/views/property-marketing/media-account/components/status-select/status-box.tsx';
import {
getMediaAccounts,
getMediaAccountsHealth,
@ -167,7 +167,7 @@ const healthData = ref({});
const syncMediaAccounts = ref([]);
const isLoadingTaskStatus = ref(false); // 正在查询状态中
const isAbNormalStatus = computed(() => healthData.value?.total_abnormal_number > 0);
const isAbNormalStatus = computed(() => healthData.value?.abnormal_number > 0);
const isDisabledBatchSyncData = computed(() => selectedItems.value.some((item) => item.status !== EnumStatus.NORMAL));
const checkedAll = computed(() => selectedItems.value.length === dataSource.value.length);
@ -181,12 +181,11 @@ const tipLabel = computed(() => {
}
const {
total_abnormal_number = 0,
abnormal_number = 0,
login_invalid_number = 0,
too_many_requests_number = 0,
account_frozen_number = 0,
miss_data_number = 0,
abnormal_number = 0,
} = healthData.value;
// 定义异常类型映射
@ -195,13 +194,13 @@ const tipLabel = computed(() => {
{ count: too_many_requests_number, label: '请求频繁' },
{ count: account_frozen_number, label: '账号被封' },
{ count: miss_data_number, label: '数据缺失' },
{ count: abnormal_number, label: '其他异常' },
// { count: abnormal_number, label: '其他异常' },
];
// 过滤出有异常的项并格式化
const abnormalLabels = abnormalTypes.filter(({ count }) => count > 0).map(({ count, label }) => `${count}${label}`);
return `共有 ${total_abnormal_number} 个账号存在授权异常,其中:${abnormalLabels.join('')}`;
return `共有 ${abnormal_number} 个账号存在授权异常,其中:${abnormalLabels.join('')}`;
});
const getData = () => {
@ -297,11 +296,11 @@ const getAsyncStatus = async () => {
}
}
};
const handleUpdateSyncStatus = (item) => {
const target = syncMediaAccounts.value.find((v) => v.id === item.id);
// 点击取消,设置状态为成功
if (target) {
target.status = 1;
target.status = EnumStatus.NORMAL;
}
};
@ -346,7 +345,7 @@ const onBatchSuccess = () => {
getData();
};
const handleOpenAbnormalAccount = () => {
query.value.status = 2;
query.value.status = 3;
reload();
};