Merge pull request #4734 from lockiechen/issue_1156

feat: 耗时字段改为executeTime issue #1156
TencentBlueKing · Jul 20, 2021 · 79a547b · 79a547b
2 parents 87043fe + 5905642
commit 79a547b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/BuildHistoryTable/index.vue b/src/frontend/devops-pipeline/src/components/BuildHistoryTable/index.vue
@@ -254,7 +254,7 @@
                         startTime: item.startTime ? convertMiniTime(item.startTime) : '--',
                         endTime: item.endTime ? convertMiniTime(item.endTime) : '--',
                         queueTime: item.queueTime ? convertMiniTime(item.queueTime) : '--',
-                        totalTime: item.totalTime ? convertMStoStringByRule(item.totalTime) : '--',
+                        executeTime: item.executeTime ? convertMStoStringByRule(item.executeTime) : '--',
                         material: !active && Array.isArray(item.material) && item.material.length > 1 ? item.material.slice(0, 1) : item.material,
                         sumSize: convertFileSize(sumSize, 'B'),
                         artifactories: needShowAll ? artifactories.slice(0, 11) : artifactories,

diff --git a/src/frontend/devops-pipeline/src/mixins/pipelineConstMixin.js b/src/frontend/devops-pipeline/src/mixins/pipelineConstMixin.js
@@ -44,9 +44,9 @@ const pipelineConstMixin = {
                     label: this.$t('history.tableMap.endTime'),
                     width: 120
                 },
-                totalTime: {
+                executeTime: {
                     index: 7,
-                    prop: 'totalTime',
+                    prop: 'executeTime',
                     label: this.$t('history.tableMap.totalTime')
                 },
                 artifactList: {

diff --git a/src/frontend/devops-pipeline/src/views/subpages/exec_detail.vue b/src/frontend/devops-pipeline/src/views/subpages/exec_detail.vue
@@ -29,7 +29,7 @@
                     </div>
                     <div class="info-item">
                         <span class="item-label">{{ $t('details.executionTime') }}：</span>
-                        <span>{{ execDetail.endTime ? convertMStoStringByRule(execDetail.endTime - execDetail.startTime) : '--' }}</span>
+                        <span>{{ execDetail.executeTime ? convertMStoStringByRule(execDetail.executeTime) : '--' }}</span>
                     </div>
                 </div>
                 <bk-tab-panel