From 3d601d7317c7bdb955a416a9ac40c15ea4db064d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 18 Aug 2023 18:18:42 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3092=20fix=EF=BC=9A=E8=B0=83=E6=95=B4=20=20?=
 =?UTF-8?q?Web=20terminal=20log=20=E5=AD=97=E6=AE=B5=E5=80=BC=E4=B8=8E?=
 =?UTF-8?q?=E5=88=97=E5=90=8D=20=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/terminalLogTab.vue  | 44 ++++++++++---------
 .../table/settings/terminalLogTable.vue       | 17 ++++++-
 .../components/page/config/terminalLog.vue    | 44 ++++++++++---------
 3 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
index c801d9bdc..f23d592ec 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
@@ -73,34 +73,38 @@ export default {
         zheze_none: true,
         searchLabelList: [
           {
-            id: 11,
-            name: this.$t('config.terminallog.loginHost'),
+            id: 15,
+            name: this.$t('config.terminallog.SessionID'),
             type: 'input',
-            label: 'host',
+            label: 'uuid',
             disabled: false
-          }, {
-            id: 12,
-            name: this.$t('config.terminallog.loginUser'),
-            type: 'input',
-            label: 'loginUser',
-            disabled: false
-          }, {
-            id: 13,
-            name: this.$t('ping.sourceIp'),
-            type: 'input',
-            label: 'remoteAddr',
-            disabled: false
-          }, {
+          },
+          {
             id: 14,
             name: this.$t('config.terminallog.sourceUser'),
             type: 'input',
             label: 'username',
             disabled: false
-          }, {
-            id: 15,
-            name: this.$t('config.terminallog.uuid'),
+          },
+          {
+            id: 13,
+            name: this.$t('ping.sourceIp'),
             type: 'input',
-            label: 'uuid',
+            label: 'remoteAddr',
+            disabled: false
+          },
+          {
+            id: 12,
+            name: this.$t('config.terminallog.loginUser'),
+            type: 'input',
+            label: 'loginUser',
+            disabled: false
+          },
+          {
+            id: 11,
+            name: this.$t('config.terminallog.loginHost'),
+            type: 'input',
+            label: 'host',
             disabled: false
           }, {
             id: 16,
diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
index d90fa1dfe..46b8ebf55 100644
--- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
@@ -153,8 +153,9 @@ export default {
           prop: 'uuid',
           minWidth: 200,
           show: true
-        }, {
-          label: this.$t('config.operationlog.username'),
+        },
+        {
+          label: this.$t('config.terminallog.sourceUser'),
           prop: 'username',
           minWidth: 200,
           show: true
@@ -166,6 +167,18 @@ export default {
           show: true,
           sortable: 'custom'
         },
+        {
+          label: this.$t('config.terminallog.loginUser'),
+          prop: 'loginUser',
+          minWidth: 200,
+          show: true
+        },
+        {
+          label: this.$t('config.terminallog.loginHost'),
+          prop: 'host',
+          minWidth: 200,
+          show: true
+        },
         {
           label: this.$t('config.terminallog.remote'),
           prop: 'remote',
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index 6063afb8d..9e0b4e27a 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -119,34 +119,38 @@ export default {
       searchMsg: { // 给搜索框子组件传递的信息
         searchLabelList: [
           {
-            id: 11,
-            name: this.$t('config.terminallog.loginHost'),
+            id: 15,
+            name: this.$t('config.terminallog.SessionID'),
             type: 'input',
-            label: 'host',
+            label: 'uuid',
             disabled: false
-          }, {
-            id: 12,
-            name: this.$t('config.terminallog.loginUser'),
-            type: 'input',
-            label: 'loginUser',
-            disabled: false
-          }, {
-            id: 13,
-            name: this.$t('ping.sourceIp'),
-            type: 'input',
-            label: 'remoteAddr',
-            disabled: false
-          }, {
+          },
+          {
             id: 14,
             name: this.$t('config.terminallog.sourceUser'),
             type: 'input',
             label: 'username',
             disabled: false
-          }, {
-            id: 15,
-            name: this.$t('config.terminallog.uuid'),
+          },
+          {
+            id: 13,
+            name: this.$t('ping.sourceIp'),
             type: 'input',
-            label: 'uuid',
+            label: 'remoteAddr',
+            disabled: false
+          },
+          {
+            id: 12,
+            name: this.$t('config.terminallog.loginUser'),
+            type: 'input',
+            label: 'loginUser',
+            disabled: false
+          },
+          {
+            id: 11,
+            name: this.$t('config.terminallog.loginHost'),
+            type: 'input',
+            label: 'host',
             disabled: false
           }, {
             id: 16,