From 3d8b2d35d771d72f416bcfb9ccf3ae73b5042271 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 10 Jan 2024 15:21:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E5=BA=A6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/job/index.vue | 23 ++++++++++++++---------
 src/views/monitor/job/log.vue   | 12 +++++++++---
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 1cac34dc..f7ef985d 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -109,39 +109,45 @@ let tableColumns: ColumnsType = [
     title: t('views.monitor.job.jobName'),
     dataIndex: 'jobName',
     align: 'left',
+    width: 200,
   },
   {
     title: t('views.monitor.job.jobGroup'),
     dataIndex: 'jobGroup',
     key: 'jobGroup',
     align: 'center',
+    width: 100,
   },
   {
     title: t('views.monitor.job.invokeTarget'),
     dataIndex: 'invokeTarget',
     align: 'left',
+    width: 100,
   },
   {
     title: t('views.monitor.job.cronExpression'),
     dataIndex: 'cronExpression',
     align: 'left',
+    width: 100,
   },
   {
     title: t('views.monitor.job.status'),
     dataIndex: 'status',
     key: 'status',
     align: 'center',
+    width: 100,
   },
   {
     title: t('views.monitor.job.saveLog'),
     dataIndex: 'saveLog',
     key: 'saveLog',
     align: 'center',
+    width: 100,
   },
   {
     title: t('common.operate'),
     key: 'jobId',
-    align: 'center',
+    align: 'left',
   },
 ];
 
@@ -756,7 +762,7 @@ onMounted(() => {
         :size="tableState.size"
         :row-class-name="fnTableStriped"
         :pagination="tablePagination"
-        :scroll="{ x: true }"
+        :scroll="{ x: tableColumns.length * 120 }"
         :row-selection="{
           type: 'checkbox',
           selectedRowKeys: tableState.selectedRowKeys,
@@ -769,16 +775,15 @@ onMounted(() => {
           </template>
           <template v-if="column.key === 'status'">
             <a-switch
-              v-if="hasPermissions(['monitor:job:changeStatus'])"
+              v-if="
+                dict.sysJobStatus.length > 0 &&
+                hasPermissions(['monitor:job:changeStatus'])
+              "
               v-model:checked="record.status"
               checked-value="1"
-              :checked-children="
-                dict.sysJobStatus.find(s => s.value === '1')?.label
-              "
+              :checked-children="dict.sysJobStatus[0].label"
               un-checked-value="0"
-              :un-checked-children="
-                dict.sysJobStatus.find(s => s.value === '0')?.label
-              "
+              :un-checked-children="dict.sysJobStatus[1].label"
               size="small"
               @change="fnRecordStatus(record)"
             />
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 6b167b8a..cf6ac3c7 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -127,28 +127,33 @@ let tableColumns: ColumnsType = [
     title: t('views.monitor.jobLog.jobName'),
     dataIndex: 'jobName',
     align: 'left',
+    width: 200,
   },
   {
     title: t('views.monitor.jobLog.jobGroup'),
     dataIndex: 'jobGroup',
     key: 'jobGroup',
     align: 'center',
+    width: 100,
   },
   {
     title: t('views.monitor.jobLog.invokeTarget'),
     dataIndex: 'invokeTarget',
     align: 'left',
+    width: 100,
   },
   {
     title: t('views.monitor.jobLog.status'),
     dataIndex: 'status',
     key: 'status',
     align: 'center',
+    width: 100,
   },
   {
     title: t('views.monitor.jobLog.createTime'),
     dataIndex: 'createTime',
     align: 'center',
+    width: 150,
     customRender(opt) {
       if (+opt.value <= 0) return '';
       return parseDateToStr(+opt.value);
@@ -158,7 +163,8 @@ let tableColumns: ColumnsType = [
     title: t('views.monitor.jobLog.costTime'),
     dataIndex: 'costTime',
     key: 'costTime',
-    align: 'center',
+    align: 'right',
+    width: 100,
     customRender(opt) {
       return `${opt.value} ms`;
     },
@@ -166,7 +172,7 @@ let tableColumns: ColumnsType = [
   {
     title: t('common.operate'),
     key: 'jobLogId',
-    align: 'center',
+    align: 'left',
   },
 ];
 
@@ -592,7 +598,7 @@ onMounted(() => {
         :data-source="tableState.data"
         :size="tableState.size"
         :row-class-name="fnTableStriped"
-        :scroll="{ x: true }"
+        :scroll="{ x: tableColumns.length * 120 }"
         :pagination="tablePagination"
         :row-selection="{
           type: 'checkbox',