From cdd51a9c167aff57ceaa12a6a6d01627bbede277 Mon Sep 17 00:00:00 2001
From: wangruidong <940853815@qq.com>
Date: Fri, 22 Dec 2023 16:25:17 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=BB=9F=E8=AE=A1=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ops/File/index.vue | 43 ++++++++++++++++++++++++----------
src/views/ops/Job/QuickJob.vue | 5 ++--
2 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/views/ops/File/index.vue b/src/views/ops/File/index.vue
index 4854cd75b..51a1fe651 100644
--- a/src/views/ops/File/index.vue
+++ b/src/views/ops/File/index.vue
@@ -82,16 +82,18 @@
{{ $tc('ops.output') }}:
-
+
{{ $tc('common.Status') }}:
{{ $tc('ops.' + executionInfo.status) }}
+ v-if="executionInfo.status==='timeout'"
+ class="status_warning"
+ >{{ $tc('ops.timeout') }}
+
+ {{ $tc('ops.success') + ': ' + summary.success }}
+ {{ $tc('ops.Skip') + ': ' + summary.skip }}
+ {{ $tc('ops.failed') + ': ' + summary.failed }}
+
{{ $tc('ops.timeDelta') }}:
@@ -210,7 +212,12 @@ export default {
ShowProgress: false,
upload_interval: null,
uploadFileList: [],
- SizeLimitMb: store.getters.publicSettings['FILE_UPLOAD_SIZE_LIMIT_MB']
+ SizeLimitMb: store.getters.publicSettings['FILE_UPLOAD_SIZE_LIMIT_MB'],
+ summary: {
+ 'success': 0,
+ 'failed': 0,
+ 'skip': 0
+ }
}
},
computed: {
@@ -273,9 +280,21 @@ export default {
}
}
},
+ taskStatusStat(summary) {
+ const { ok, failures, dark, excludes, skipped } = summary
+
+ const failedKeys = Object.keys(failures)
+ const darkKeys = Object.keys(dark)
+ const excludesKeys = Object.keys(excludes)
+
+ this.summary['success'] = ok.length
+ this.summary['failed'] = failedKeys.length + darkKeys.length
+ this.summary['skip'] = excludesKeys.length + skipped.length
+ },
getTaskStatus() {
getTaskDetail(this.currentTaskId).then(data => {
this.executionInfo.status = data['status']
+ this.taskStatusStat(data['summary'])
if (this.executionInfo.status === 'success') {
this.$message.success(this.$tc('ops.runSucceed'))
clearInterval(this.upload_interval)
@@ -334,11 +353,11 @@ export default {
const filenameList = fileList.map((file) => file.name)
const filenameCount = _.countBy(filenameList)
for (const file of fileList) {
- file.is_same = filenameCount[file.name] > 1
+ file.isSame = filenameCount[file.name] > 1
}
},
sameFileStyle(file) {
- if (file.is_same) {
+ if (file.isSame) {
return { backgroundColor: 'var(--color-danger)' }
}
return ''
@@ -362,7 +381,7 @@ export default {
execute() {
const { hosts, nodes } = this.getSelectedNodesAndHosts()
for (const file of this.uploadFileList) {
- if (file.is_same) {
+ if (file.isSame) {
this.$message.error(this.$tc('ops.DuplicateFileExists'))
return
}
@@ -476,7 +495,7 @@ export default {
}
.status_success {
- color: var(--color-success);
+ color: var(--color-primary);
}
.status_warning {
diff --git a/src/views/ops/Job/QuickJob.vue b/src/views/ops/Job/QuickJob.vue
index eee38bbbc..e2efe994e 100644
--- a/src/views/ops/Job/QuickJob.vue
+++ b/src/views/ops/Job/QuickJob.vue
@@ -80,8 +80,7 @@ export default {
timeCost: 0,
cancel: 0
},
- xtermConfig: {
- },
+ xtermConfig: {},
showHelpDialog: false,
showOpenAdhocDialog: false,
showOpenAdhocSaveDialog: false,
@@ -484,7 +483,7 @@ export default {
}
.status_success {
- color: var(--color-success);
+ color: var(--color-primary);
}
.status_warning {