From bddc6c7712cb048f737444d4ef224f1cb3e5e000 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 28 Feb 2023 15:16:02 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2617=20fix=EF=BC=9AWeb=20terminal=20logs?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87State=E8=BF=87=E6=BB=A4=E6=97=B6=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=80=89=E4=B8=AD=E6=A0=87=E7=AD=BE=E4=BC=9A=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BA=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/searchInput.vue      | 8 ++++++++
 nezha-fronted/src/components/page/config/terminalLog.vue | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 14942905a..1ae5168b3 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -551,6 +551,10 @@ export default {
           val.val = selectItem.name
           val.valnum = selectItem.id
           val.valString = ''
+        } else if (val.type == 'terminalStatus' && selectItem.searchType == 'terminalStatus') {
+          val.val = selectItem.label
+          val.valnum = selectItem.id
+          val.valString = ''
         } else if (val.type == 'assetType' && selectItem.searchType == 'assetType') {
           val.val = selectItem.name
           val.valnum = selectItem.id
@@ -957,6 +961,8 @@ export default {
               objectInfo.type = val.valnum
             } else if (val.label === 'assetState') {
               objectInfo.stateIds = val.valnum
+            }else if (val.label === 'terminalStatus') {
+              objectInfo.state = val.valnum
             } else if (val.label === 'assetType') {
               objectInfo.typeIds = val.valnum
             } else if (val.label === 'credentialType') {
@@ -1010,6 +1016,8 @@ export default {
             objectInfo.projectIds = val.valnum
           } else if (val.label === 'assetState') {
             objectInfo.stateIds = val.valnum
+          } else if (val.label === 'terminalStatus') {
+            objectInfo.state = val.valnum
           } else if (val.label === 'assetType') {
             objectInfo.typeIds = val.valnum
           } else if (val.type === 'brand') {
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index 5f22dc2d2..23ed6f469 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -156,10 +156,10 @@ export default {
             readonly: true,
             disabled: false
           }, {
-            id: 17,
+            id: 'state',
             name: this.$t('overall.state'),
-            type: 'terminalStatus',
-            label: 'state',
+            type: 'select',
+            label: 'terminalStatus',
             readonly: true,
             disabled: false
           }