From ff4b4f7bee0e003e5eb86eafe4679e9913eb8dbf Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 11 May 2024 21:26:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E4=BF=AE=E5=A4=8D=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/job/task/index.vue | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index 0b691cd..a9b78a4 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -171,7 +171,20 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
       fixed: 'right',
       render: row => (
         <div class="flex-center gap-8px">
-          <NButton type="primary" ghost size="small" onClick={() => edit(row.id!)}>
+          <NPopconfirm onPositiveClick={() => handleTriggerJob(row.id!)}>
+            {{
+              default: () => $t('common.confirmExecute'),
+              trigger: () => (
+                <NButton type="error" ghost size="small">
+                  {$t('common.execute')}
+                </NButton>
+              )
+            }}
+          </NPopconfirm>
+          <NButton type="primary" ghost size="small" onClick={() => goToBatch(row.id!)}>
+            {$t('common.batchList')}
+          </NButton>
+          <NButton type="warning" ghost size="small" onClick={() => edit(row.id!)}>
             {$t('common.edit')}
           </NButton>
           {hasAuth('R_ADMIN') ? (
@@ -188,20 +201,6 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
           ) : (
             ''
           )}
-
-          <NPopconfirm onPositiveClick={() => handleTriggerJob(row.id!)}>
-            {{
-              default: () => $t('common.confirmExecute'),
-              trigger: () => (
-                <NButton type="error" ghost size="small">
-                  {$t('common.execute')}
-                </NButton>
-              )
-            }}
-          </NPopconfirm>
-          <NButton type="primary" ghost size="small" onClick={() => goToBatch(row.id!)}>
-            {$t('common.batchList')}
-          </NButton>
         </div>
       )
     }
@@ -232,9 +231,9 @@ function edit(id: string) {
 async function handleTriggerJob(id: string) {
   const { error } = await fetchTriggerJob(id);
   if (error) {
-    window.$message?.success($t('common.executeSuccess'));
-  } else {
     window.$message?.error($t('common.executeFailed'));
+  } else {
+    window.$message?.success($t('common.executeSuccess'));
   }
 }