diff --git a/package.json b/package.json index 1fed2eb..a1c4938 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "dayjs": "^1.11.7", "echarts": "^5.6.0", "html2canvas": "^1.4.1", + "jspdf": "^3.0.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", "normalize.css": "^8.0.1", diff --git a/src/api/all/index.ts b/src/api/all/index.ts index 2a0510f..f1f4383 100644 --- a/src/api/all/index.ts +++ b/src/api/all/index.ts @@ -140,6 +140,11 @@ export const fetchImageUploadFile = (params: any) => { return Http.get(`/v1/oss/image-pre-signed-url`, params); }; +// 获取预上传文件后缀 +export const fetchUploadFile = (params: any) => { + return Http.get(`/v1/oss/file-pre-signed-url`, params); +}; + // 移除企业子账号 export const removeEnterpriseAccount = (userId: number) => { return Http.delete(`/v1/enterprises/users/${userId}`); diff --git a/src/views/property-marketing/component.scss b/src/views/property-marketing/component.scss index 14e6920..c23d0db 100644 --- a/src/views/property-marketing/component.scss +++ b/src/views/property-marketing/component.scss @@ -7,7 +7,8 @@ border-color: #d7d7d9; background-color: #fff; &:focus-within, - &.arco-input-focus { + &.arco-input-focus, + &.arco-textarea-focus { background-color: var(--color-bg-2); border-color: rgb(var(--primary-6)); box-shadow: 0 0 0 0 var(--color-primary-light-2); 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 076a8b1..3eaaba4 100644 --- a/src/views/property-marketing/media-account/account-detail/constants.ts +++ b/src/views/property-marketing/media-account/account-detail/constants.ts @@ -36,7 +36,7 @@ export const getAccountInfoFields = (dateType: string, showMore: boolean) => { { title: '账号名称', dataIndex: 'name' }, { title: '项目分组', dataIndex: 'group.name' }, { title: '状态', dataIndex: 'status', type: 'status' }, - { title: '运营人员', dataIndex: 'operator_name' }, + { title: '运营人员', dataIndex: 'operator.name' }, ], [ { title: 'AI评价', dataIndex: 'ai_evaluation' }, diff --git a/src/views/property-marketing/media-account/account-manage/components/account-table/delete-account.vue b/src/views/property-marketing/media-account/account-manage/components/account-table/delete-account.vue index e132358..ac6f06e 100644 --- a/src/views/property-marketing/media-account/account-manage/components/account-table/delete-account.vue +++ b/src/views/property-marketing/media-account/account-manage/components/account-table/delete-account.vue @@ -53,7 +53,7 @@ const open = (record) => { async function onDelete() { const _fn = isBatch.value ? batchDeleteMediaAccounts : deleteMediaAccount; - const _params = isBatch.value ? { ids: accountId.value } : { id: accountId.value }; + const _params = isBatch.value ? { ids: accountId.value } : accountId.value; const { code } = await _fn(_params); if (code === 200) { AMessage.success('删除成功'); diff --git a/src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue b/src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue index 567df68..206659d 100644 --- a/src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue +++ b/src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue @@ -115,6 +115,21 @@ + + + +