diff --git a/.env.production b/.env.production index 6e01c9d..63312ba 100644 --- a/.env.production +++ b/.env.production @@ -5,7 +5,7 @@ VITE_APP_TITLE = 短信发送小工具 VITE_APP_ENV = 'production' # 短信发送小工具/生产环境 -VITE_APP_BASE_API = '/ynMessage-prod-api/ynMessage' +VITE_APP_BASE_API = '/ynMessage-prod-api/ynMessage/' #静态资源路径(服务器目录) VITE_APP_PUBLIC_PATH = '/ynMessage' diff --git a/src/views/sMsSendManage/loopSend/edit.vue b/src/views/sMsSendManage/loopSend/edit.vue index 82deee5..f93f020 100644 --- a/src/views/sMsSendManage/loopSend/edit.vue +++ b/src/views/sMsSendManage/loopSend/edit.vue @@ -229,6 +229,7 @@ const formRef = ref(null) const crontabRef = ref(null) const personTableRef = ref(null) const cronExpression = ref('') +const taskStatus = ref('') // Cron表达式生成器弹窗配置 const cronDialogConfig = reactive({ @@ -368,6 +369,7 @@ const onSubmit = async () => { if (mode.value === 'edit' && route.query.id) { params.id = Number(route.query.id) params.jobId = Number(route.query.jobId) + params.taskStatus = taskStatus.value } const result = await API(params) @@ -400,6 +402,7 @@ const getDetail = async () => { recipientList: data.workerList || [], remark: data.remark || '', } + taskStatus.value = data.taskStatus || '' cronExpression.value = data.cronExpression || '' } } catch (error) { diff --git a/src/views/sMsSendManage/loopSend/index.vue b/src/views/sMsSendManage/loopSend/index.vue index a9ff56e..8e15bd6 100644 --- a/src/views/sMsSendManage/loopSend/index.vue +++ b/src/views/sMsSendManage/loopSend/index.vue @@ -105,28 +105,12 @@ const actionColumns = [ label: '发送详情', type: 'primary', link: true, - handler: (row) => { sendDetailsDialogConfig.outerTitle = `发送详情 - ${row.taskName || ''}` sendDetailsId.value = row.id sendDetailsDialogConfig.outerVisible = true }, }, - { - label: '删除', - type: 'danger', - link: true, - - handler: (row) => { - proxy.$modal.confirm('是否确认删除该循环发送任务?').then(async () => { - const result = await delLoopSendAPI({ id: row.id, jobId: row.jobId }) - if (result.code === 200) { - proxy.$modal.msgSuccess('删除成功') - comTableRef.value?.refresh() - } - }) - }, - }, { label: '编辑', type: 'primary', @@ -142,6 +126,21 @@ const actionColumns = [ }) }, }, + { + label: '删除', + type: 'danger', + link: true, + + handler: (row) => { + proxy.$modal.confirm('是否确认删除该循环发送任务?').then(async () => { + const result = await delLoopSendAPI({ id: row.id, jobId: row.jobId }) + if (result.code === 200) { + proxy.$modal.msgSuccess('删除成功') + comTableRef.value?.refresh() + } + }) + }, + }, ] // 新增