From 95c299eea41abdede73a7aa0d639de81dda5120c Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Fri, 12 Jul 2024 00:02:45 +0800
Subject: [PATCH] =?UTF-8?q?:lipstick:=20=E4=BF=AE=E6=94=B9=E4=B8=BB?=
 =?UTF-8?q?=E6=9C=BA=E7=BC=96=E8=BE=91=E6=A0=B7=E5=BC=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/connect-log-detail-drawer.vue  | 23 ++++++-
 .../components/ssh-config-form.vue            | 67 +++++++++++--------
 2 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue
index 44f1f090..57c69d92 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue
@@ -31,11 +31,15 @@
       </a-descriptions-item>
       <!-- 连接类型 -->
       <a-descriptions-item label="连接类型">
-        {{ getDictValue(connectTypeKey, record.type) }}
+        <a-tag :color="getDictValue(connectTypeKey, record.type, 'color')">
+          {{ getDictValue(connectTypeKey, record.type) }}
+        </a-tag>
       </a-descriptions-item>
       <!-- 连接状态 -->
       <a-descriptions-item label="连接状态">
-        {{ getDictValue(connectStatusKey, record.status) }}
+        <span :style="{ color: getDictValue(connectStatusKey, record.status, 'color') }">
+          {{ getDictValue(connectStatusKey, record.status) }}
+        </span>
       </a-descriptions-item>
       <!-- 留痕地址 -->
       <a-descriptions-item label="留痕地址">
@@ -53,7 +57,9 @@
       </a-descriptions-item>
       <!-- 错误信息 -->
       <a-descriptions-item v-if="record.extra?.errorMessage" label="错误信息">
-        {{ record.extra?.errorMessage }}
+        <span class="span-red">
+          {{ record.extra?.errorMessage }}
+        </span>
       </a-descriptions-item>
       <!-- 开始时间 -->
       <a-descriptions-item label="开始时间">
@@ -141,4 +147,15 @@
     display: inline-block;
     color: rgb(var(--arcoblue-6));
   }
+
+
+  :deep(.arco-collapse-item-content) {
+    background: unset;
+    padding: 0;
+  }
+
+  :deep(.arco-collapse-item-header) {
+    border: none;
+  }
+
 </style>
diff --git a/orion-visor-ui/src/views/asset/host-config/components/ssh-config-form.vue b/orion-visor-ui/src/views/asset/host-config/components/ssh-config-form.vue
index 55411ce6..ee953980 100644
--- a/orion-visor-ui/src/views/asset/host-config/components/ssh-config-form.vue
+++ b/orion-visor-ui/src/views/asset/host-config/components/ssh-config-form.vue
@@ -84,36 +84,45 @@
                      :hide-asterisk="true">
           <host-identity-selector v-model="formModel.identityId" />
         </a-form-item>
-        <!-- 连接超时时间 -->
-        <a-form-item field="connectTimeout"
-                     label="连接超时时间"
-                     :hide-asterisk="true">
-          <a-input-number v-model="formModel.connectTimeout"
-                          placeholder="请输入连接超时时间"
-                          hide-button>
-            <template #suffix>
-              ms
+        <!-- 其他配置 -->
+        <a-collapse :bordered="false">
+          <a-collapse-item key="1">
+            <template #header>
+              <span class="usn">其他配置</span>
             </template>
-          </a-input-number>
-        </a-form-item>
-        <!-- SSH输出编码 -->
-        <a-form-item field="charset"
-                     label="SSH输出编码"
-                     :hide-asterisk="true">
-          <a-input v-model="formModel.charset" placeholder="请输入 SSH 输出编码" />
-        </a-form-item>
-        <!-- 文件名称编码 -->
-        <a-form-item field="fileNameCharset"
-                     label="文件名称编码"
-                     :hide-asterisk="true">
-          <a-input v-model="formModel.fileNameCharset" placeholder="请输入 SFTP 文件名称编码" />
-        </a-form-item>
-        <!-- 文件内容编码 -->
-        <a-form-item field="fileContentCharset"
-                     label="文件内容编码"
-                     :hide-asterisk="true">
-          <a-input v-model="formModel.fileContentCharset" placeholder="请输入 SFTP 文件内容编码" />
-        </a-form-item>
+            <!-- 连接超时时间 -->
+            <a-form-item class="mt4"
+                         field="connectTimeout"
+                         label="连接超时时间"
+                         :hide-asterisk="true">
+              <a-input-number v-model="formModel.connectTimeout"
+                              placeholder="请输入连接超时时间"
+                              hide-button>
+                <template #suffix>
+                  ms
+                </template>
+              </a-input-number>
+            </a-form-item>
+            <!-- SSH 输出编码 -->
+            <a-form-item field="charset"
+                         label="SSH输出编码"
+                         :hide-asterisk="true">
+              <a-input v-model="formModel.charset" placeholder="请输入 SSH 输出编码" />
+            </a-form-item>
+            <!-- 文件名称编码 -->
+            <a-form-item field="fileNameCharset"
+                         label="文件名称编码"
+                         :hide-asterisk="true">
+              <a-input v-model="formModel.fileNameCharset" placeholder="请输入 SFTP 文件名称编码" />
+            </a-form-item>
+            <!-- 文件内容编码 -->
+            <a-form-item field="fileContentCharset"
+                         label="文件内容编码"
+                         :hide-asterisk="true">
+              <a-input v-model="formModel.fileContentCharset" placeholder="请输入 SFTP 文件内容编码" />
+            </a-form-item>
+          </a-collapse-item>
+        </a-collapse>
       </a-form>
       <!-- 操作按钮 -->
       <div class="config-button-group">