diff --git a/orion-ops-ui/src/assets/style/global.less b/orion-ops-ui/src/assets/style/global.less index f92df832..ae3f4176 100644 --- a/orion-ops-ui/src/assets/style/global.less +++ b/orion-ops-ui/src/assets/style/global.less @@ -265,6 +265,10 @@ body { cursor: pointer; } +.span-green { + color: rgb(var(--green-6)); +} + .span-blue { color: rgb(var(--arcoblue-6)); } diff --git a/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-hosts.vue b/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-hosts.vue index bf918dc9..832e5974 100644 --- a/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-hosts.vue +++ b/orion-ops-ui/src/views/exec/batch-upload/components/batch-upload-hosts.vue @@ -36,27 +36,21 @@ - - - - {{ host.files.length - getFinishCount(host.files) }} - - + + + + {{ getStatusCount(host.files, [UploadTaskFileStatus.WAITING, UploadTaskFileStatus.UPLOADING]) }} + - - {{ getFinishCount(host.files) }} - - + + {{ getStatusCount(host.files, [UploadTaskFileStatus.FINISHED, UploadTaskFileStatus.CANCELED]) }} + + + + {{ getStatusCount(host.files, [UploadTaskFileStatus.FAILED]) }} + @@ -90,10 +84,8 @@ }; // 获取已完成数量 - const getFinishCount = (files: Array) => { - return files.filter(s => s.status === UploadTaskFileStatus.FINISHED - || s.status === UploadTaskFileStatus.CANCELED - || s.status === UploadTaskFileStatus.FAILED).length; + const getStatusCount = (files: Array, status: Array) => { + return files.filter(s => status.includes(s.status)).length; }; @@ -124,7 +116,7 @@ } &-host { - width: calc(100% - 64px); + width: calc(100% - 48px); display: flex; align-items: flex-start; flex-direction: column; @@ -134,13 +126,12 @@ &-status { user-select: none; - &-tag { - max-width: 64px; + &-text { width: 100%; - } - - &-icon { - color: #FFFFFF; + max-width: 48px; + display: inline-flex; + justify-content: flex-end; + font-weight: 600; } }