From 9a2fed61d29bc7aad56c723d7c2af9eb85c195a8 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, 15 Dec 2022 10:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/job/index.vue | 133 +++++++++++++++++---------------
 src/views/monitor/job/log.vue   |   5 +-
 2 files changed, 74 insertions(+), 64 deletions(-)

diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index a41b205..4b44569 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -66,11 +66,7 @@
           label="任务分组"
           width="80"
           v-if="columns.showColumn('jobGroup')" />
-        <el-table-column
-          prop="assemblyName"
-          label="程序集名称"
-          v-if="columns.showColumn('assemblyName')"
-          :show-overflow-tooltip="true" />
+        <el-table-column prop="assemblyName" label="程序集名称" v-if="columns.showColumn('assemblyName')" :show-overflow-tooltip="true" />
         <el-table-column prop="className" label="任务类名" v-if="columns.showColumn('className')" />
         <el-table-column prop="runTimes" align="center" label="运行次数" width="80" />
         <el-table-column prop="intervalSecond" align="center" label="执行间隔(s)" v-if="columns.showColumn('intervalSecond')" width="90" />
@@ -84,67 +80,61 @@
           :show-overflow-tooltip="true"
           v-if="columns.showColumn('lastRunTime')" />
         <el-table-column prop="apiUrl" label="网络请求地址" v-if="columns.showColumn('apiUrl')" />
-        <el-table-column label="操作" width="250" class-name="small-padding fixed-width">
+        <el-table-column label="操作" width="190" align="center">
           <template #default="scope">
-            <el-link size="small" class="ml10" icon="view" v-hasPermi="['monitor:job:query']" @click="handleDetails(scope.row)">
+            <el-button text icon="view" v-hasPermi="['monitor:job:query']" @click="handleDetails(scope.row)">
               {{ $t('btn.details') }}
-            </el-link>
-            <el-link size="small" class="ml10" icon="view" v-hasPermi="['monitor:job:query']" @click="handleJobLog(scope.row)">
+            </el-button>
+            <el-button text icon="view" v-hasPermi="['monitor:job:query']" @click="handleJobLog(scope.row)">
               {{ $t('btn.log') }}
-            </el-link>
-            <el-link
-              size="small"
-              class="ml10"
-              v-if="scope.row.isStart"
-              v-hasPermi="['monitor:job:run']"
-              icon="remove"
-              title="运行一次"
-              @click="handleRun(scope.row)">
-              {{ $t('btn.run') }}一次
-            </el-link>
-            <el-link
-              size="small"
-              class="ml10"
-              v-if="scope.row.isStart"
-              v-hasPermi="['monitor:job:stop']"
-              icon="video-pause"
-              style="color: red"
-              title="停止"
-              @click="handleStop(scope.row)">
-              {{ $t('btn.stop') }}
-            </el-link>
+            </el-button>
 
-            <el-link
-              size="small"
-              class="ml10"
-              v-if="!scope.row.isStart"
-              v-hasPermi="['monitor:job:start']"
-              icon="video-play"
-              title="启动"
-              @click="handleStart(scope.row)">
-              {{ $t('btn.start') }}
-            </el-link>
-            <el-link
-              class="ml10"
-              size="small"
-              v-if="!scope.row.isStart"
-              v-hasPermi="['monitor:job:edit']"
-              icon="edit"
-              title="编辑"
-              @click="handleUpdate(scope.row)">
-              {{ $t('btn.edit') }}
-            </el-link>
+            <el-dropdown @command="handleCommand($event, scope.row)">
+              <el-button text class="ml5">
+                {{ $t('btn.more') }}
+                <el-icon class="el-icon--right">
+                  <arrow-down />
+                </el-icon>
+              </el-button>
 
-            <el-link
-              class="ml10"
-              size="small"
-              v-if="!scope.row.isStart"
-              v-hasPermi="['monitor:job:delete']"
-              icon="delete"
-              title="删除"
-              @click="handleDelete(scope.row)">
-              {{ $t('btn.delete') }}
-            </el-link>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <div v-hasPermi="['monitor:job:run']" v-if="scope.row.isStart">
+                    <el-dropdown-item command="run">
+                      <el-button icon="remove" title="运行一次"> {{ $t('btn.run') }}一次 </el-button>
+                    </el-dropdown-item>
+                  </div>
+                  <div v-if="scope.row.isStart" v-hasPermi="['monitor:job:stop']">
+                    <el-dropdown-item command="stop">
+                      <el-button type="danger" icon="video-pause" title="停止">
+                        {{ $t('btn.stop') }}
+                      </el-button>
+                    </el-dropdown-item>
+                  </div>
+                  <div v-if="!scope.row.isStart" v-hasPermi="['monitor:job:start']">
+                    <el-dropdown-item command="start">
+                      <el-button icon="video-play" title="启动">
+                        {{ $t('btn.start') }}
+                      </el-button>
+                    </el-dropdown-item>
+                  </div>
+                  <div v-if="!scope.row.isStart" v-hasPermi="['monitor:job:edit']">
+                    <el-dropdown-item command="update">
+                      <el-button icon="edit" title="编辑">
+                        {{ $t('btn.edit') }}
+                      </el-button>
+                    </el-dropdown-item>
+                  </div>
+                  <div v-if="!scope.row.isStart" v-hasPermi="['monitor:job:delete']">
+                    <el-dropdown-item command="delete">
+                      <el-button icon="delete" title="删除">
+                        {{ $t('btn.delete') }}
+                      </el-button>
+                    </el-dropdown-item>
+                  </div>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
@@ -646,4 +636,25 @@ function handleDetails(row) {
     btnVisible.value = false
   })
 }
+
+function handleCommand(command, row) {
+  console.log(command, row)
+  switch (command) {
+    case 'update':
+      handleUpdate(row)
+      break
+    case 'start':
+      handleStart(row)
+      break
+    case 'stop':
+      handleStop(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    case 'run':
+      handleRun(row)
+      break
+  }
+}
 </script>
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 39b777e..be63b78 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -17,9 +17,8 @@
       <el-form-item label="执行时间">
         <el-date-picker
           v-model="dateRange"
-          style="width: 240px"
-          value-format="YYYY-MM-DD"
-          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="datetimerange"
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"