From b02508ef19546c58220dc3e21fdf6a964cdc12f9 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Wed, 8 Apr 2020 19:37:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../el-data-table/el-data-table.vue           |  1 +
 src/i18n/langs/cn.js                          |  8 +-
 src/views/jobcenter/TaskList.vue              | 83 ++++++++++++-------
 3 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
index 74d78fd45..efe36b50a 100644
--- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
@@ -910,6 +910,7 @@ export default {
           }
 
           this.data = data
+          console.log(this.data)
 
           // 树形结构逻辑
           if (this.isTree) {
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index fc12efae1..28ec59499 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -384,10 +384,10 @@ const cn = {
   },
   jobcenter: {
     'RunTimes': '执行次数',
-    'hosts': '主机',
-    'success': '成功',
-    'date': '日期',
-    'time': '时间',
+    'Hosts': '主机',
+    'Success': '成功',
+    'Date': '日期',
+    'Time': '时间',
     'run': '执行'
   },
   tickets: {
diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
index 432e9bdaf..1946064de 100644
--- a/src/views/jobcenter/TaskList.vue
+++ b/src/views/jobcenter/TaskList.vue
@@ -3,8 +3,9 @@
 </template>
 
 <script>
+import { timeOffset, toSafeLocalDateStr } from '@/utils/common'
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
+import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -14,47 +15,65 @@ export default {
     return {
       tableConfig: {
         url: '/api/v1/ops/tasks/',
-        columns: [
-          {
-            prop: 'name',
-            label: this.$tc('Name'),
-            formatter: DetailFormatter,
-            sortable: 'custom',
-            route: 'UserDetail'
+        columns: ['name', 'runtimes', 'host_amount', 'is_success', 'date_start', 'time', 'actions'],
+        columnsMeta: {
+          name: {
+            label: this.$tc('Name')
           },
-          {
-            prop: 'latest_execution',
-            label: this.$t('jobcenter.RunTimes')
+          runtimes: {
+            label: this.$t('jobcenter.RunTimes'),
+            formatter: function(row) {
+              const successTime = row.summary.success
+              const failedTime = row.summary.failed
+              const total = row.summary.total
+              return (successTime + '/' + failedTime + '/' + total)
+            }
           },
-          {
-            prop: 'latest_execution.hosts_amount',
-            label: this.$t('jobcenter.hosts')
+          host_amount: {
+            label: this.$t('jobcenter.Hosts'),
+            formatter: function(row) {
+              return row.latest_execution.hosts_amount
+            }
           },
-          {
-            prop: 'latest_execution.is_success',
-            label: this.$t('jobcenter.success')
+          is_success: {
+            label: this.$t('jobcenter.Success'),
+            formatter: function(row) {
+              return row.latest_execution.is_success
+            }
           },
-          {
-            prop: 'latest_execution.date_start',
-            label: this.$t('jobcenter.date'),
-            sortable: 'custom'
+          date_start: {
+            label: this.$t('jobcenter.Date'),
+            formatter: function(row) {
+              return toSafeLocalDateStr(row.latest_execution.date_start)
+            }
           },
-          {
-            prop: 'latest_execution.timedelta',
-            label: this.$t('jobcenter.time')
+          time: {
+            label: this.$t('jobcenter.Time'),
+            formatter: function(row) {
+              return timeOffset(row.latest_execution.date_start, row.latest_execution.date_finished)
+            }
           },
-          {
+          actions: {
             prop: 'id',
             label: this.$tc('Action'),
-            align: 'center',
             formatter: ActionsFormatter,
-            width: '200px',
-            actions: [
-            ]
+            actions: {
+              hasUpdate: false,
+              extraActions: [
+                {
+                  name: 'run',
+                  title: this.$t('jobcenter.run'),
+                  type: 'primary',
+                  callback: function({ cellValue, tableData }) {
+                    // 跳转页面
+                    const replayUrl = '/ops/celery/task/' + cellValue
+                    window.open(replayUrl)
+                  }
+                }
+              ]
+            }
           }
-        ],
-        hasEdit: false,
-        hasDelete: false
+        }
       },
       headerActions: {
         hasCreate: false,

From e804ac972aa22ad1407726fe5739f97ce4e81a34 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Wed, 8 Apr 2020 20:23:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jobcenter/TaskList.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
index 1946064de..1c08ea5bc 100644
--- a/src/views/jobcenter/TaskList.vue
+++ b/src/views/jobcenter/TaskList.vue
@@ -18,15 +18,18 @@ export default {
         columns: ['name', 'runtimes', 'host_amount', 'is_success', 'date_start', 'time', 'actions'],
         columnsMeta: {
           name: {
-            label: this.$tc('Name')
+            label: this.$tc('Name'),
+            showOverflowTooltip: true
           },
           runtimes: {
             label: this.$t('jobcenter.RunTimes'),
             formatter: function(row) {
-              const successTime = row.summary.success
-              const failedTime = row.summary.failed
-              const total = row.summary.total
-              return (successTime + '/' + failedTime + '/' + total)
+              const summary = <div>
+                <span class='text-primary'>{row.summary.success}</span>/
+                <span class='text-danger'>{row.summary.failed}</span>/
+                <span>{row.summary.total}</span>
+              </div>
+              return summary
             }
           },
           host_amount: {
@@ -37,8 +40,11 @@ export default {
           },
           is_success: {
             label: this.$t('jobcenter.Success'),
-            formatter: function(row) {
-              return row.latest_execution.is_success
+            formatter: row => {
+              if (row.latest_execution.is_success) {
+                return <i class='fa fa-check text-primary'/>
+              }
+              return <i class='fa fa-times text-danger'/>
             }
           },
           date_start: {

From 7a0787daaa6e490e0cb5ff3b0153e3f4f3390e28 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Wed, 8 Apr 2020 20:28:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?[Update]=20=E5=8E=BB=E6=8E=89=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataTable/compenents/el-data-table/el-data-table.vue         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
index efe36b50a..74d78fd45 100644
--- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
@@ -910,7 +910,6 @@ export default {
           }
 
           this.data = data
-          console.log(this.data)
 
           // 树形结构逻辑
           if (this.isTree) {

From 95a373ae68408fc853b0b54fe21fc447c6271ef5 Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Thu, 9 Apr 2020 10:56:17 +0800
Subject: [PATCH 4/5] command list view

---
 .../formatters/OutputExpandFormatter.vue      | 21 +++++++
 src/views/sessions/CommandList.vue            | 57 ++++++++-----------
 2 files changed, 45 insertions(+), 33 deletions(-)
 create mode 100644 src/components/ListTable/formatters/OutputExpandFormatter.vue

diff --git a/src/components/ListTable/formatters/OutputExpandFormatter.vue b/src/components/ListTable/formatters/OutputExpandFormatter.vue
new file mode 100644
index 000000000..1594ff04f
--- /dev/null
+++ b/src/components/ListTable/formatters/OutputExpandFormatter.vue
@@ -0,0 +1,21 @@
+<template>
+  <pre style="border: none; background: none; white-space: pre-wrap">
+      {{ '$ '+ row.input }}
+      <br>
+      {{ row.output }}
+  </pre>
+</template>
+
+<script>
+import BaseFormatter from '@/components/ListTable/formatters/base'
+
+export default {
+  name: 'OutputExpandFormatter',
+  extends: BaseFormatter
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index c3544ff95..92bcf4400 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -4,6 +4,8 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
+import { toSafeLocalDateStr } from '@/utils/common'
+import OutputExpandFormatter from '@/components/ListTable/formatters/OutputExpandFormatter'
 
 export default {
   components: {
@@ -12,55 +14,44 @@ export default {
   data() {
     return {
       tableConfig: {
-        axiosConfig: {
-          raw: 1,
-          params: {
-            display: 1,
-            is_finished: 0
-          }
-        },
         hasSelection: false,
-        hasOperation: false,
         url: '/api/v1/terminal/commands/',
         columns: [
-          {
-            type: 'expand'
+          'expandCol', 'input', 'risk_level', 'user',
+          'asset', 'system_user', 'session', 'timestamp'
+        ],
+        columnsMeta: {
+          expandCol: {
+            type: 'expand',
+            prop: 'output',
+            formatter: OutputExpandFormatter
           },
-          {
-            prop: 'input',
+          input: {
             label: this.$t('sessions.command')
           },
-          {
-            prop: 'output',
-            label: '命令输出结果 (怎么放到隐藏内容 ？？)',
-            expand: true
-          },
-          {
-            prop: 'risk_level',
+          risk_level: {
             label: this.$t('sessions.RiskLevel')
           },
-          {
-            prop: 'user',
-            label: this.$t('sessions.user'),
-            sortable: true
+          user: {
+            label: this.$t('sessions.user')
           },
-          {
-            prop: 'asset',
+          asset: {
             label: this.$t('sessions.asset')
           },
-          {
-            prop: 'system_user',
+          system_user: {
             label: this.$t('sessions.systemUser')
           },
-          {
-            prop: 'session',
+          session: {
             label: this.$t('sessions.session')
           },
-          {
-            prop: 'timestamp',
-            label: this.$t('sessions.date')
+          timestamp: {
+            label: this.$t('sessions.date'),
+            formatter: function(row) {
+              return toSafeLocalDateStr(row.timestamp * 1000)
+            }
           }
-        ],
+
+        },
         tableActions: {
           hasEdit: false,
           hasDelete: false

From a1959fd44af7aec09d109a96667332c3854512c6 Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Thu, 9 Apr 2020 19:30:46 +0800
Subject: [PATCH 5/5] Session detail view link

---
 .../ListTable/formatters/RouterFormatter.vue  | 23 +++++++++++++++++++
 src/components/ListTable/formatters/index.js  |  2 ++
 src/i18n/langs/cn.js                          |  4 +++-
 src/i18n/langs/en.js                          |  9 ++++++--
 src/router/index.js                           |  7 ++++++
 src/views/sessions/CommandList.vue            |  7 ++++--
 src/views/sessions/SessionDetail.vue          | 13 +++++++++++
 src/views/sessions/SessionOfflineList.vue     |  6 +++--
 src/views/sessions/SessionOnlineList.vue      |  6 +++--
 9 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 src/components/ListTable/formatters/RouterFormatter.vue
 create mode 100644 src/views/sessions/SessionDetail.vue

diff --git a/src/components/ListTable/formatters/RouterFormatter.vue b/src/components/ListTable/formatters/RouterFormatter.vue
new file mode 100644
index 000000000..062ab04fa
--- /dev/null
+++ b/src/components/ListTable/formatters/RouterFormatter.vue
@@ -0,0 +1,23 @@
+<template>
+  <el-link class="detail" :type="col.type || 'success'" @click="goDetail">{{ col.linkName }}</el-link>
+</template>
+
+<script>
+import BaseFormatter from './base'
+
+export default {
+  name: 'RouterFormatter',
+  extends: BaseFormatter,
+  methods: {
+    goDetail() {
+      const routeName = this.col.route || ''
+      this.$router.push({ name: routeName, params: { id: this.cellValue }})
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/ListTable/formatters/index.js b/src/components/ListTable/formatters/index.js
index d92f9ba0f..3af4df17e 100644
--- a/src/components/ListTable/formatters/index.js
+++ b/src/components/ListTable/formatters/index.js
@@ -4,3 +4,5 @@ export { default as BooleanFormatter } from './ChoicesFormatter'
 export { default as ActionsFormatter } from './ActionsFormatter'
 export { default as ExpandPreFormatter } from './ExpandPreFormatter'
 export { default as LengthFormatter } from './LengthFormatter'
+export { default as RouterFormatter } from './RouterFormatter'
+export { default as OutputExpandFormatter } from './OutputExpandFormatter'
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 28ec59499..572729fa0 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -87,6 +87,7 @@ const cn = {
     'Sessions': '会话管理',
     'SessionOnline': '在线会话',
     'SessionOffline': '历史会话',
+    'SessionDetail': '会话详情',
     'Commands': '命令记录',
     'WebTerminal': 'Web终端',
     'FileManager': '文件管理',
@@ -380,7 +381,8 @@ const cn = {
     'active': '激活中',
     'alive': '在线',
     'StorageConfiguration': '存储配置',
-    'join': '加入'
+    'join': '加入',
+    'goto': '转到'
   },
   jobcenter: {
     'RunTimes': '执行次数',
diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js
index 1c8d7d64c..5359545ef 100644
--- a/src/i18n/langs/en.js
+++ b/src/i18n/langs/en.js
@@ -18,7 +18,11 @@ const en = {
     'assets': 'Assets',
     'applications': 'Applications',
     'perms': 'Perms',
-    'sessions': 'Sessions',
+    'Sessions': 'Sessions',
+    'SessionOnline': 'Session Online',
+    'SessionOffline': 'Session Offline',
+    'SessionDetail': 'Session Detail',
+    'Goto': 'Goto',
     'jobcenter': 'Job Center'
   },
   users: {
@@ -289,7 +293,8 @@ const en = {
     'terminate_session': 'Terminate session',
     'confirm': 'Confirm',
     'commands': 'Commands',
-    'join': 'join'
+    'join': 'join',
+    'goto': 'Goto'
   },
   setting: {
     'setting': 'System Setting',
diff --git a/src/router/index.js b/src/router/index.js
index f2d37a8be..b946eb853 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -274,6 +274,13 @@ export const constantRoutes = [
         component: () => import('@/views/sessions/CommandList'),
         meta: { title: 'Commands' }
       },
+      {
+        path: 'sessions/:id',
+        name: 'SessionDetail',
+        component: () => import('@/views/sessions/SessionDetail'),
+        meta: { title: 'SessionDetail' },
+        hidden: true
+      },
       {
         path: 'luna',
         name: 'WebTerminal',
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index 92bcf4400..48c6198b7 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -5,7 +5,7 @@
 <script>
 import { GenericListPage } from '@/layout/components'
 import { toSafeLocalDateStr } from '@/utils/common'
-import OutputExpandFormatter from '@/components/ListTable/formatters/OutputExpandFormatter'
+import { RouterFormatter, OutputExpandFormatter } from '@/components/ListTable/formatters'
 
 export default {
   components: {
@@ -42,7 +42,10 @@ export default {
             label: this.$t('sessions.systemUser')
           },
           session: {
-            label: this.$t('sessions.session')
+            label: this.$t('sessions.session'),
+            formatter: RouterFormatter,
+            route: 'SessionDetail',
+            linkName: this.$t('sessions.goto')
           },
           timestamp: {
             label: this.$t('sessions.date'),
diff --git a/src/views/sessions/SessionDetail.vue b/src/views/sessions/SessionDetail.vue
new file mode 100644
index 000000000..a159a2e6a
--- /dev/null
+++ b/src/views/sessions/SessionDetail.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>SessionDetail</div>
+</template>
+
+<script>
+export default {
+  name: 'SessionDetail'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index a95a88080..a422fd538 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -22,8 +22,10 @@ export default {
         ],
         columnsMeta: {
           index: {
-            type: 'index',
-            label: this.$t('sessions.id')
+            label: this.$t('sessions.id'),
+            formatter: function(row, column, cellValue, index) {
+              return <a class='detail el-link el-link--success is-underline' href= { '/terminal/sessions/' + row.id }>{ index + 1}</a>
+            }
           },
           command_amount: {
             label: this.$t('sessions.command')
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 9facf05a0..fc12c2ef4 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -22,8 +22,10 @@ export default {
         ],
         columnsMeta: {
           index: {
-            type: 'index',
-            label: this.$t('sessions.id')
+            label: this.$t('sessions.id'),
+            formatter: function(row, column, cellValue, index) {
+              return <a class='detail el-link el-link--success is-underline' href= { '/terminal/sessions/' + row.id }>{ index + 1}</a>
+            }
           },
           command_amount: {
             label: this.$t('sessions.command')