diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/UploadTaskServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/UploadTaskServiceImpl.java index ea524cca..6082c211 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/UploadTaskServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/UploadTaskServiceImpl.java @@ -467,7 +467,7 @@ public class UploadTaskServiceImpl implements UploadTaskService { .code(s.getCode()) .name(s.getName()) .address(s.getAddress()) - .files(hostFiles.get(s.getId())) + .files(hostFiles.getOrDefault(s.getId(), Lists.empty())) .build()) .collect(Collectors.toList()); task.setHosts(hosts); diff --git a/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue b/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue index cfc76d85..733a1ec0 100644 --- a/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue +++ b/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue @@ -86,6 +86,33 @@ const filesRef = ref(); const hostModal = ref(); + // 打开日志 + const openLog = async (id: number) => { + setLoading(true); + taskId.value = id; + taskStatus.value = UploadTaskStepStatus.WAITING; + try { + // 查询任务 + const { data } = await getUploadTask(id); + task.value = data; + selectedHost.value = data.hosts[0].id; + // 设置任务状态 + if (data.status === UploadTaskStatus.FINISHED + || data.status === UploadTaskStatus.CANCELED) { + taskStatus.value = UploadTaskStepStatus.FINISHED; + } else if (data.status === UploadTaskStatus.FAILED) { + taskStatus.value = UploadTaskStepStatus.FAILED; + } else { + taskStatus.value = UploadTaskStepStatus.UPLOADING; + } + } catch (e) { + } finally { + setLoading(false); + } + }; + + defineExpose({ openLog }); + // 设置选中主机 const setSelectedHost = (hosts: Array) => { formModel.value.hostIdList = hosts; @@ -196,9 +223,8 @@ } const taskStatusData = data[0]; // 设置任务状态 - if (taskStatusData.status === UploadTaskStatus.FINISHED) { - taskStatus.value = UploadTaskStepStatus.FINISHED; - } else if (taskStatusData.status === UploadTaskStatus.CANCELED) { + if (taskStatusData.status === UploadTaskStatus.FINISHED + || taskStatusData.status === UploadTaskStatus.CANCELED) { taskStatus.value = UploadTaskStepStatus.FINISHED; } else if (taskStatusData.status === UploadTaskStatus.FAILED) { taskStatus.value = UploadTaskStepStatus.FAILED; diff --git a/orion-ops-ui/src/views/exec/batch-upload/index.vue b/orion-ops-ui/src/views/exec/batch-upload/index.vue index 3301ce72..ec372558 100644 --- a/orion-ops-ui/src/views/exec/batch-upload/index.vue +++ b/orion-ops-ui/src/views/exec/batch-upload/index.vue @@ -1,7 +1,7 @@ @@ -12,17 +12,29 @@