From fac89a8121c911e14483888c28f2547d63327b3d Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Wed, 22 May 2024 16:47:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E8=B0=83=E6=95=B4=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E5=9C=BA=E6=99=AF=E5=92=8C=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/modules/job-task-operate-drawer.vue  | 29 ++++++------
 .../scene/modules/scene-operate-drawer.vue    | 47 ++++++++-----------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/views/job/task/modules/job-task-operate-drawer.vue b/src/views/job/task/modules/job-task-operate-drawer.vue
index 3d6c65f..0a3cd44 100644
--- a/src/views/job/task/modules/job-task-operate-drawer.vue
+++ b/src/views/job/task/modules/job-task-operate-drawer.vue
@@ -284,18 +284,7 @@ watch(visible, () => {
       <NFormItem :label="$t('page.jobTask.groupName')" path="groupName">
         <SelectGroup v-model:value="model.groupName" />
       </NFormItem>
-      <NFormItem :label="$t('page.jobTask.jobStatus')" path="jobStatus">
-        <NRadioGroup v-model:value="model.jobStatus" name="jobStatus">
-          <NSpace>
-            <NRadio
-              v-for="item in enableStatusNumberOptions"
-              :key="item.value"
-              :value="item.value"
-              :label="$t(item.label)"
-            />
-          </NSpace>
-        </NRadioGroup>
-      </NFormItem>
+
       <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
         <NGi>
           <NFormItem :label="$t('page.jobTask.executorType')" path="executorType">
@@ -303,11 +292,23 @@ watch(visible, () => {
           </NFormItem>
         </NGi>
         <NGi>
-          <NFormItem :label="$t('page.jobTask.executorInfo')" path="executorInfo">
-            <NInput v-model:value="model.executorInfo" :placeholder="$t('page.jobTask.form.executorInfo')" />
+          <NFormItem :label="$t('page.jobTask.jobStatus')" path="jobStatus">
+            <NRadioGroup v-model:value="model.jobStatus" name="jobStatus">
+              <NSpace>
+                <NRadio
+                  v-for="item in enableStatusNumberOptions"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="$t(item.label)"
+                />
+              </NSpace>
+            </NRadioGroup>
           </NFormItem>
         </NGi>
       </NGrid>
+      <NFormItem :label="$t('page.jobTask.executorInfo')" path="executorInfo">
+        <NInput v-model:value="model.executorInfo" :placeholder="$t('page.jobTask.form.executorInfo')" />
+      </NFormItem>
       <NFormItem :label="$t('page.jobTask.taskType')" path="taskType">
         <TaskType v-model:value="model.taskType" :placeholder="$t('page.jobTask.form.taskType')" />
       </NFormItem>
diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue
index 669fdc2..929e258 100644
--- a/src/views/retry/scene/modules/scene-operate-drawer.vue
+++ b/src/views/retry/scene/modules/scene-operate-drawer.vue
@@ -238,34 +238,27 @@ watch(
           :placeholder="$t('page.retryScene.form.sceneName')"
         />
       </NFormItem>
-      <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
-        <NGi>
-          <NFormItem :label="$t('page.retryScene.groupName')" path="groupName">
-            <NSelect
-              v-model:value="model.groupName"
-              :disabled="props.operateType === 'edit'"
-              :placeholder="$t('page.retryScene.form.groupName')"
-              :options="translateOptions2(groupNameList)"
-              clearable
+      <NFormItem :label="$t('page.retryScene.groupName')" path="groupName">
+        <NSelect
+          v-model:value="model.groupName"
+          :disabled="props.operateType === 'edit'"
+          :placeholder="$t('page.retryScene.form.groupName')"
+          :options="translateOptions2(groupNameList)"
+          clearable
+        />
+      </NFormItem>
+      <NFormItem :label="$t('page.retryScene.sceneStatus')" path="sceneStatus">
+        <NRadioGroup v-model:value="model.sceneStatus" name="sceneStatus">
+          <NSpace>
+            <NRadio
+              v-for="item in enableStatusNumberOptions"
+              :key="item.value"
+              :value="item.value"
+              :label="$t(item.label)"
             />
-          </NFormItem>
-        </NGi>
-        <NGi>
-          <NFormItem :label="$t('page.retryScene.sceneStatus')" path="sceneStatus">
-            <NRadioGroup v-model:value="model.sceneStatus" name="sceneStatus">
-              <NSpace>
-                <NRadio
-                  v-for="item in enableStatusNumberOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="$t(item.label)"
-                />
-              </NSpace>
-            </NRadioGroup>
-          </NFormItem>
-        </NGi>
-      </NGrid>
-
+          </NSpace>
+        </NRadioGroup>
+      </NFormItem>
       <NGrid cols="2 s:1 m:2" responsive="screen" x-gap="20">
         <NGi>
           <NFormItem :label="$t('common.routeKey.routeLabel')" path="routeKey">