From 1351215bb66656b748d6debc3c4430a6d916d71f Mon Sep 17 00:00:00 2001
From: zory <791736813@qq.com>
Date: Tue, 10 May 2022 07:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/job/index.vue | 46 +++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 04748a5..5e19e73 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -57,7 +57,7 @@
         <el-table-column prop="remark" align="center" label="备注" :show-overflow-tooltip="true" />
         <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button type="text" icon="view" v-hasPermi="['monitor:job:query']" @click="handleJobLog(scope.row.id, scope.row.name)">
+            <el-button type="text" icon="view" v-hasPermi="['monitor:job:query']" @click="handleJobLog(scope.row)">
               {{ $t('btn.log') }}
             </el-button>
             <el-button
@@ -251,6 +251,15 @@
     </el-dialog>
 
     <el-drawer :title="logTitle" v-model="drawer">
+      <el-form :inline="true" @submit.prevent>
+        <el-form-item>
+          <el-date-picker v-model="logForm.beginTime" clearable type="date" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="search" @click="handleJobLog">{{ $t('btn.search') }}</el-button>
+        </el-form-item>
+      </el-form>
+
       <el-timeline>
         <el-timeline-item :timestamp="item.createTime" placement="top" v-for="(item, i) in jobLogList" :key="i">
           <h4>{{ item.jobMessage }}</h4>
@@ -373,19 +382,6 @@ function handleUpdate(row) {
   })
 }
 
-/** 任务日志列表查询 */
-function handleJobLog(id, title) {
-  if (id == undefined) {
-    router.push({ path: 'job/log' })
-  } else {
-    drawer.value = true
-    jobLogList.value = []
-    logTitle.value = title
-    listJobLog({ JobId: id }).then((response) => {
-      jobLogList.value = response.data.result
-    })
-  }
-}
 /** cron表达式按钮操作 */
 function handleShowCron() {
   // expression.value = form.value.cron
@@ -545,4 +541,26 @@ watch(
     immediate: true,
   },
 )
+
+/** 任务日志 */
+
+const logForm = reactive({
+  beginTime: undefined,
+  jobId: undefined,
+  title: undefined,
+})
+/** 任务日志列表查询 */
+function handleJobLog(row) {
+  if (undefined != row.id) {
+    logForm.jobId = row.id
+    logForm.title = row.name
+  }
+
+  drawer.value = true
+  jobLogList.value = []
+  logTitle.value = logForm.title
+  listJobLog(logForm).then((response) => {
+    jobLogList.value = response.data.result
+  })
+}
 </script>