diff --git a/.env.local b/.env.local index 6004804..3656e2a 100644 --- a/.env.local +++ b/.env.local @@ -4,8 +4,8 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -# VITE_BASE_URL='http://192.168.2.21:48080' -VITE_BASE_URL='https://backstageapi.yolozs.com' +VITE_BASE_URL='http://192.168.2.21:48080' +# VITE_BASE_URL='https://backstageapi.yolozs.com' # VITE_BASE_URL='https://testapi.tknb.net' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 diff --git a/src/views/server/bigbrother/index.vue b/src/views/server/bigbrother/index.vue index b607c7e..264a1d3 100644 --- a/src/views/server/bigbrother/index.vue +++ b/src/views/server/bigbrother/index.vue @@ -271,6 +271,7 @@ const queryParams = reactive({ createTimeStart: '', createTimeEnd: '', countryName: undefined, + deleteFlag: false, //导出 是否删除 }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 @@ -352,12 +353,32 @@ const handleDelete = async (id: number) => { /** 导出按钮操作 */ const handleExport = async () => { try { - // 导出的二次确认 - await message.exportConfirm() - // 发起导出 - exportLoading.value = true - const data = await BigBrotherApi.exportBigBrother(queryParams) - download.excel(data, '大哥数据.xls') + + // 先确认是否删除导出的数据 + await ElMessageBox.confirm( + '导出后是否删除导出的数据?', + '删除确认', + { + distinguishCancelAndClose: true, + confirmButtonText: '删除并导出', + cancelButtonText: '仅导出', + type: 'warning', + } + ).then(async () => { + queryParams.deleteFlag = true + exportLoading.value = true + const data = await BigBrotherApi.exportBigBrother(queryParams) + download.excel(data, '主播数据管理.xls') + }).catch(async (err) => { + if (err === 'cancel' || err?.action === 'cancel') { + queryParams.deleteFlag = false + exportLoading.value = true + const data = await BigBrotherApi.exportBigBrother(queryParams) + download.excel(data, '主播数据管理.xls') + } + + }); + } catch { } finally { exportLoading.value = false diff --git a/src/views/server/manageemployeehosts/index.vue b/src/views/server/manageemployeehosts/index.vue index 7abb8f6..6f46688 100644 --- a/src/views/server/manageemployeehosts/index.vue +++ b/src/views/server/manageemployeehosts/index.vue @@ -127,6 +127,10 @@ {{ t('newHosts.allocation') }} + + {{ t('newHosts.export') }} + + {{ $t('employee.exportAi') }} diff --git a/src/views/server/newhosts/index.vue b/src/views/server/newhosts/index.vue index 0cd8520..d22cc64 100644 --- a/src/views/server/newhosts/index.vue +++ b/src/views/server/newhosts/index.vue @@ -518,6 +518,7 @@ const handleExport = async () => { download.excel(data, '主播数据管理.xls') }).catch(async (err) => { if (err === 'cancel' || err?.action === 'cancel') { + queryParams.deleteFlag = false exportLoading.value = true const data = await NewHostsApi.exportNewHosts(queryParams) download.excel(data, '主播数据管理.xls')