From cc47d9398832f3749740ed9f9eb39c99f24444d8 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Tue, 12 Dec 2023 11:02:15 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E3=80=90=E4=BC=98=E5=8C=96=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E4=BB=BB=E5=8A=A1=E3=80=91=E6=94=AF=E6=8C=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=E6=89=A7=E8=A1=8C=E5=91=A8=E6=9C=9F=E3=80=81?=
 =?UTF-8?q?=E4=B8=8B=E6=AC=A1=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json               |  2 ++
 src/i18n/langs/ja.json               |  2 ++
 src/i18n/langs/zh.json               |  2 ++
 src/views/settings/Task/TaskList.vue | 16 +++++++++++++++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 6cc160b2f..8b1e1fd84 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1110,6 +1110,8 @@
     "SaveAdhoc": "Save Adhoc",
     "AdhocManage": "Adhoc manage",
     "LastPublishedTime": "Last published",
+    "ExecuteCycle": "Execute cycle",
+    "ExpectedNextExecuteTime": "Expected next execute time",
     "CloseConfirmMessage": "The file has changed, do you want to save it?",
     "privilegeOnly": "Select only privileged accounts",
     "UploadPlaybook": "Upload Playbook",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 38d792309..83385369f 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -1104,6 +1104,8 @@
     "SaveAdhoc": "保存コマンド",
     "AdhocManage": "コマンド管理",
     "LastPublishedTime": "最終公開",
+    "ExecuteCycle": "実行サイクル",
+    "ExpectedNextExecuteTime": "次回実行予定時刻",
     "CloseConfirmMessage": "ファイルが変更されました，保存しますか？",
     "privilegeOnly": "特権アカウントのみを選択",
     "UploadPlaybook": "アップロード Playbook",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 4be2f32ef..8f1885b48 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1129,6 +1129,8 @@
     "AdhocDetail": "命令详情",
     "Queue": "队列",
     "State": "状态",
+    "ExecuteCycle": "执行周期",
+    "ExpectedNextExecuteTime": "预计下次执行时间",
     "LastPublishedTime": "最后发布时间",
     "Variable": "变量",
     "Description": "描述",
diff --git a/src/views/settings/Task/TaskList.vue b/src/views/settings/Task/TaskList.vue
index b1ec17766..b80df3f2e 100644
--- a/src/views/settings/Task/TaskList.vue
+++ b/src/views/settings/Task/TaskList.vue
@@ -16,7 +16,7 @@ export default {
       tableConfig: {
         url: '/api/v1/ops/tasks/',
         columns: [
-          'name', 'queue', 'count', 'state', 'date_last_publish'
+          'name', 'queue', 'count', 'state', 'date_last_publish', 'exec_cycle', 'next_exec_time'
         ],
         columnsMeta: {
           name: {
@@ -56,6 +56,20 @@ export default {
               return row.last_published_time != null ? row.last_published_time : '-'
             }
           },
+          exec_cycle: {
+            label: this.$t('ops.ExecuteCycle'),
+            width: '120px',
+            formatter: (row) => {
+              return row.exec_cycle ? row.exec_cycle : '-'
+            }
+          },
+          next_exec_time: {
+            label: this.$t('ops.ExpectedNextExecuteTime'),
+            width: '210px',
+            formatter: (row) => {
+              return row.next_exec_time ? row.next_exec_time : '-'
+            }
+          },
           count: {
             width: '80px',
             label: `${this.$t('ops.success')}/${this.$t('ops.total')}`,