diff --git a/package.json b/package.json index dca1e34..22d6d36 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "echarts": "^5.5.0", "echarts-gl": "^2.0.9", "echarts-wordcloud": "^2.1.0", - "element-plus": "^2.8.7", + "element-plus": "^2.9.0", "js-cookie": "^3.0.5", "jsplumb": "^2.15.6", "lodash": "^4.17.21", diff --git a/src/api/system/tools/job/sysJob.ts b/src/api/system/tools/job/sysJob.ts index 66d0ab3..491ea18 100644 --- a/src/api/system/tools/job/sysJob.ts +++ b/src/api/system/tools/job/sysJob.ts @@ -88,12 +88,12 @@ export function getJobLogs(req:object){ } // 删除定时任务日志 -export function delSysJobLog(logIds:number[]) { +export function delSysJobLog(targetName:string) { return request({ url: '/api/v1/system/sysJob/deleteLogs', method: 'delete', data:{ - logIds:logIds + targetName } }) } diff --git a/src/views/system/sysJob/list/component/detail.vue b/src/views/system/sysJob/list/component/detail.vue index 54b05f8..d2ce0f1 100644 --- a/src/views/system/sysJob/list/component/detail.vue +++ b/src/views/system/sysJob/list/component/detail.vue @@ -32,10 +32,10 @@ {{ proxy.getOptionValue(formData.status, statusOptions,'value','label') }} - {{ formData.createdUser.userNickname }} + {{ formData.createdUser?.userNickname }} - {{ formData.updatedUser.userNickname }} + {{ formData.updatedUser?.userNickname }} {{ formData.remark }} @@ -51,9 +51,8 @@ class="btn-del" type="danger" size="small" - :disabled="multiple" - @click="handleDelete(null)" - >删除 + @click="handleDelete" + >清空日志 @@ -203,31 +202,16 @@ const handleSelectionChange = (selection:Array) => { logList.logIds = selection.map(item => item.id) multiple.value = !selection.length }; -const handleDelete = (row: SysJobLogData) => { - let msg = '你确定要删除所选数据?'; - let logId:number[] = [] ; - let targetName:string=''; - if(row){ - msg = `此操作将永久删除数据,是否继续?` - logId = [row.id] - targetName = row.targetName - }else{ - logId = logList.logIds - targetName=state.formData.invokeTarget! - } - if(logId.length===0){ - ElMessage.error('请选择要删除的数据。'); - return - } - ElMessageBox.confirm(msg, '提示', { +const handleDelete = () => { + ElMessageBox.confirm('你确定要清空日志?', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning', }) .then(() => { - delSysJobLog(logId).then(()=>{ + delSysJobLog(logList.param.targetName!).then(()=>{ ElMessage.success('删除成功'); - getLogList(targetName); + getLogList(logList.param.targetName!); }) }) .catch(() => {});