From 647bb1f3df79f5ed9bca1e07d9293dfba3469f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 12 May 2022 13:43:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/job/index.vue |  5 ++++-
 src/views/monitor/job/log.vue   | 34 ++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 5e19e73..4cc35e8 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -32,7 +32,7 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button plain v-hasPermi="['monitor:job:query']" type="info" icon="operation" @click="handleJobLog()">
+        <el-button plain v-hasPermi="['monitor:job:query']" type="info" icon="operation" @click="onJobLogView()">
           {{ $t('btn.log') }}
         </el-button>
       </el-col>
@@ -549,6 +549,9 @@ const logForm = reactive({
   jobId: undefined,
   title: undefined,
 })
+function onJobLogView(){
+	router.push({ path: 'job/log' })
+}
 /** 任务日志列表查询 */
 function handleJobLog(row) {
   if (undefined != row.id) {
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index d3e1dd2..df449ee 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -22,8 +22,7 @@
           type="daterange"
           range-separator="-"
           start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+          end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
@@ -36,7 +35,9 @@
         <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['PRIV_JOBLOG_DELETE']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="delete" @click="handleClean" :disabled="total <= 0" v-hasPermi="['PRIV_JOBLOG_REMOVE']">清空</el-button>
+        <el-button type="danger" plain icon="delete" @click="handleClean" :disabled="total <= 0" v-hasPermi="['PRIV_JOBLOG_REMOVE']"
+          >清空</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['PRIV_JOBLOG_EXPORT']">导出</el-button>
@@ -54,7 +55,9 @@
       <el-table-column label="执行状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="作业用时" align="center" prop="elapsed">
         <template #default="scope">
-          <span :style="scope.row.elapsed < 1000 ? 'color:green' : scope.row.elapsed < 3000 ? 'color:orange' : 'color:red'">{{ scope.row.elapsed / 1000 }} ms</span>
+          <span :style="scope.row.elapsed < 1000 ? 'color:green' : scope.row.elapsed < 3000 ? 'color:orange' : 'color:red'">
+            {{ Math.floor(scope.row.elapsed) / 1000 }} ms
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="执行时间" align="center" prop="createTime" width="180">
@@ -73,7 +76,7 @@
 
     <!-- 调度日志详细 -->
     <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" label-width="100px">
+      <el-form ref="formRef" :model="form" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
@@ -125,6 +128,7 @@ const open = ref(false)
 const dateRange = ref([])
 const statusOptions = ref([])
 const jobGroupOptions = ref([])
+const formRef = ref()
 
 const data = reactive({
   form: {},
@@ -175,10 +179,24 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   dateRange.value = []
-  resetForm('queryForm')
+  proxy.resetForm('queryForm')
   handleQuery()
 }
-
+function reset() {
+  form.value = {
+    createTime: undefined,
+    elapsed: 0,
+    exception: undefined,
+    invokeTarget: undefined,
+    jobGroup: undefined,
+    jobId: 0,
+    jobLogId: 0,
+    jobMessage: undefined,
+    jobName: undefined,
+    status: undefined,
+  }
+  proxy.resetForm('formRef')
+}
 // 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map((item) => item.jobLogId)
@@ -186,8 +204,10 @@ function handleSelectionChange(selection) {
 }
 /** 详细按钮操作 */
 function handleView(row) {
+  reset()
   open.value = true
   form.value = row
+  console.log(row)
 }
 /** 删除按钮操作 */
 function handleDelete(row) {