From 69a2cffaa6c78497726b12159e62826e010300b7 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Sat, 11 May 2024 15:02:38 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=B8=8A=E4=BC=A0=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ExecCommandServiceImpl.java  |  2 +-
 .../connect-session/types/table.columns.ts    |  4 +--
 .../sftp-log/components/sftp-log-table.vue    |  2 +-
 .../components/batch-upload-form.vue          |  2 +-
 .../components/batch-upload-step.vue          | 26 ++++++++++++++++---
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecCommandServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecCommandServiceImpl.java
index 013db110..61a47b9d 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecCommandServiceImpl.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecCommandServiceImpl.java
@@ -273,7 +273,7 @@ public class ExecCommandServiceImpl implements ExecCommandService {
         // 添加内置参数
         params.put("userId", request.getUserId());
         params.put("username", request.getUsername());
-        params.put("source", request.getSourceId());
+        params.put("source", request.getSource());
         params.put("sourceId", request.getSourceId());
         params.put("seq", request.getExecSeq());
         params.put("execId", execId);
diff --git a/orion-ops-ui/src/views/asset-audit/connect-session/types/table.columns.ts b/orion-ops-ui/src/views/asset-audit/connect-session/types/table.columns.ts
index ff4d09d8..d58e7c81 100644
--- a/orion-ops-ui/src/views/asset-audit/connect-session/types/table.columns.ts
+++ b/orion-ops-ui/src/views/asset-audit/connect-session/types/table.columns.ts
@@ -47,8 +47,8 @@ const columns = [
   }, {
     title: '操作',
     slotName: 'handle',
-    width: 130,
-    align: 'left',
+    width: 118,
+    align: 'center',
     fixed: 'right',
   },
 ] as TableColumnData[];
diff --git a/orion-ops-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue b/orion-ops-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
index 32b2d278..f2e48096 100644
--- a/orion-ops-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
+++ b/orion-ops-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
@@ -49,7 +49,7 @@
       <div class="table-left-bar-handle">
         <!-- 标题 -->
         <div class="table-title">
-          SFTP 操作日志
+          文件操作日志
         </div>
       </div>
       <!-- 右侧操作 -->
diff --git a/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-form.vue b/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-form.vue
index 7ba8a914..a5be3fd6 100644
--- a/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-form.vue
+++ b/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-form.vue
@@ -42,7 +42,7 @@
       <a-form-item field="remotePath"
                    style="margin-bottom: 4px;"
                    label="上传路径"
-                   help="${username} 用户名 ${home} 家目录">
+                   help="${username} 用户名 ${home} 用户家目录">
         <a-input v-model="formModel.remotePath"
                  placeholder="请输入上传路径"
                  allow-clear />
diff --git a/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-step.vue b/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-step.vue
index 0fe032f4..1be70e40 100644
--- a/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-step.vue
+++ b/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-step.vue
@@ -3,22 +3,36 @@
     <a-steps :current="status.step"
              :status="status.status as any"
              direction="vertical">
+      <!-- 创建任务 -->
       <a-step description="创建上传任务">创建任务</a-step>
+      <!-- 上传文件 -->
       <a-step>
         上传文件
+        <template #icon v-if="status.step === 2">
+          <icon-loading />
+        </template>
         <template #description>
           <span>将文件上传到临时分区</span><br>
-          <span class="span-red">在此期间请不要关闭页面</span>
+          <span v-if="status.step === 2" class="span-red desc-tips">
+            在此期间请不要关闭页面
+          </span>
         </template>
       </a-step>
+      <!-- 分发文件 -->
       <a-step>
         分发文件
+        <template #icon v-if="status.step === 3">
+          <icon-loading />
+        </template>
         <template #description>
           <span>将文件分发到目标服务器</span><br>
-          <span>可以关闭页面</span>
+          <span v-if="status.step === 3" class="span-blue desc-tips">
+            在此期间可以关闭页面
+          </span>
         </template>
       </a-step>
-      <a-step description="上传完成并释放资源">上传完成</a-step>
+      <!-- 上传完成 -->
+      <a-step description="释放资源">上传完成</a-step>
     </a-steps>
   </div>
 </template>
@@ -42,4 +56,10 @@
   .container {
     user-select: none;
   }
+
+  .desc-tips {
+    display: inline-block;
+    margin-top: 6px;
+    font-weight: 600;
+  }
 </style>