From df06fbe85ea7cc333c15540d463e92d136c7c46a Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Fri, 2 Dec 2022 12:23:05 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=8C=81=E7=BB=AD=E4=BC=98=E5=8C=96job?=
 =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/zh.json                |  3 +++
 src/views/ops/Executions/index.vue    | 11 ++++++-----
 src/views/ops/Job/JobCodeEditor.vue   |  4 ++--
 src/views/ops/Job/JobUpdateCreate.vue |  8 +++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 83350d20b..d27c8acfe 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -661,6 +661,9 @@
     "Weekly": "按周"
   },
   "ops": {
+    "OpenCommand": "打开命令",
+    "SaveCommand": "保存命令 ",
+    "Log": "日志",
     "Execute": "执行",
     "ID": "ID",
     "No": "否",
diff --git a/src/views/ops/Executions/index.vue b/src/views/ops/Executions/index.vue
index ca6916f1f..6b06f95ee 100644
--- a/src/views/ops/Executions/index.vue
+++ b/src/views/ops/Executions/index.vue
@@ -7,6 +7,7 @@
 <script>
 import { ActionsFormatter } from '@/components/TableFormatters'
 import { GenericListPage } from '@/layout/components'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   components: {
@@ -73,19 +74,19 @@ export default {
               hasClone: false,
               extraActions: [
                 {
-                  title: this.$t('详情'),
+                  title: this.$t('common.Detail'),
                   name: 'detail',
                   can: true,
                   callback: ({ row }) => {
-                    // this.$router.push({name: 'JobCreate', query: {type: 'adhoc', id: row.id}})
+                    console.log(1)
                   }
                 },
                 {
-                  title: this.$t('日志'),
-                  name: 'detail',
+                  title: this.$t('ops.output'),
+                  name: 'logging',
                   can: true,
                   callback: ({ row }) => {
-                    // this.$router.push({name: 'JobCreate', query: {type: 'adhoc', id: row.id}})
+                    openTaskPage(row.task_id)
                   }
                 }
               ]
diff --git a/src/views/ops/Job/JobCodeEditor.vue b/src/views/ops/Job/JobCodeEditor.vue
index c69a99517..9e2f76dce 100644
--- a/src/views/ops/Job/JobCodeEditor.vue
+++ b/src/views/ops/Job/JobCodeEditor.vue
@@ -35,7 +35,7 @@ export default {
         {
           type: 'button',
           icon: 'fa  fa-folder-open-o',
-          tip: 'Open Command',
+          tip: this.$t('ops.OpenCommand'),
           callback: () => {
             this.openAdhocSelectDialog()
           }
@@ -43,7 +43,7 @@ export default {
         {
           type: 'button',
           icon: 'fa  fa-save',
-          tip: 'Save Command',
+          tip: this.$t('ops.SaveCommand'),
           callback: () => {
             this.openAdhocSaveDialog()
           }
diff --git a/src/views/ops/Job/JobUpdateCreate.vue b/src/views/ops/Job/JobUpdateCreate.vue
index bcee65c90..005702d32 100644
--- a/src/views/ops/Job/JobUpdateCreate.vue
+++ b/src/views/ops/Job/JobUpdateCreate.vue
@@ -25,10 +25,10 @@ export default {
       url: '/api/v1/ops/jobs/',
       fields: [
         [this.$t('common.Basic'), ['name', 'type', 'instant', 'comment']],
-        [this.$t('common.Task'), ['module', 'args', 'playbook', 'chdir', 'timeout']],
+        [this.$t('common.Task'), ['module', 'args', 'playbook', 'chdir']],
         [this.$t('ops.Asset'), ['assets', 'runas', 'runas_policy']],
         [this.$t('ops.Parameter'), ['use_parameter_define', 'parameters_define']],
-        [this.$t('ops.Plan'), ['runAfterSave', 'is_periodic', 'crontab']]
+        [this.$t('ops.Plan'), ['run_after_save', 'is_periodic', 'crontab']]
       ],
       initial: {
         type: 'adhoc',
@@ -38,7 +38,6 @@ export default {
         runAfterSave: false,
         instant: false,
         parameters_define: '{}',
-        timeout: 60,
         is_periodic: false,
         crontab: '0 0 * * *'
       },
@@ -113,8 +112,7 @@ export default {
             return formValue.type !== 'adhoc'
           }
         },
-        runAfterSave: {
-          label: '保存后立即执行',
+        run_after_save: {
           type: 'checkbox',
           hidden: (formValue) => {
             return this.instantTask