From 012025080d8a8cf23715730e092bc26b2a2b5358 Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Tue, 15 Jul 2025 14:47:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9B=B4=E6=96=B0element-plus=E8=87=B42.?=
 =?UTF-8?q?9.0=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/api/system/tools/job/sysJob.ts            |  4 +--
 .../system/sysJob/list/component/detail.vue   | 32 +++++--------------
 3 files changed, 11 insertions(+), 27 deletions(-)

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 @@
             <el-form-item label="状态">{{ proxy.getOptionValue(formData.status, statusOptions,'value','label') }}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="创建者">{{ formData.createdUser.userNickname }}</el-form-item>
+            <el-form-item label="创建者">{{ formData.createdUser?.userNickname }}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="更新者">{{ formData.updatedUser.userNickname }}</el-form-item>
+            <el-form-item label="更新者">{{ formData.updatedUser?.userNickname }}</el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注信息">{{ formData.remark }}</el-form-item>
@@ -51,9 +51,8 @@
           class="btn-del"
           type="danger"
           size="small"
-          :disabled="multiple"
-          @click="handleDelete(null)"
-      ><el-icon><ele-Delete /></el-icon>删除</el-button>
+          @click="handleDelete"
+      ><el-icon><ele-Delete /></el-icon>清空日志</el-button>
       <el-divider />
       <el-table v-loading="logList.loading" :data="logList.data" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
@@ -203,31 +202,16 @@ const handleSelectionChange = (selection:Array<SysJobLogData>) => {
   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(() => {});