#5341 fix-4521

Merged
ychao_1983 merged 2 commits from fix-4521 into V20240402 1 month ago
  1. +1
    -1
      services/ai_task_service/task/task_base.go
  2. +2
    -0
      web_src/vuepages/pages/supercompute/configs.js
  3. +10
    -3
      web_src/vuepages/pages/supercompute/detail/index.vue

+ 1
- 1
services/ai_task_service/task/task_base.go View File

@@ -435,7 +435,7 @@ func (g DefaultAITaskTemplate) GetOperationProfile(cloudbrainId int64) (*entity.
}
var s *entity.OperationProfile
var err error
if g.JobType == models.JobTypeDebug || g.JobType == models.JobTypeOnlineInference {
if g.JobType == models.JobTypeDebug || g.JobType == models.JobTypeOnlineInference || g.JobType == models.JobTypeSuperCompute {
s, err = GetOperationProfile(cloudbrainId, c.GetNoteBookOperationProfile)
} else {
s, err = GetOperationProfile(cloudbrainId, c.GetTrainJobOperationProfile)


+ 2
- 0
web_src/vuepages/pages/supercompute/configs.js View File

@@ -77,6 +77,8 @@ export const DetailPageConfigs = {
'dataset',
'modelList',
]
}, {
name: 'operationProfile'
}],
}
};


+ 10
- 3
web_src/vuepages/pages/supercompute/detail/index.vue View File

@@ -7,7 +7,7 @@
<div v-if="!loading" class="ui container">
<div class="head-path">
<a class="section" :href="`/${repoOwnerName}/${repoName}/${pageCfg.listUrl}`">{{ $t('cloudbrainObj.taskList')
}}</a>
}}</a>
<span class="divider">/</span>
<span class="section active">{{ mainData[0] ? mainData[0].task.display_job_name : '' }}</span>
</div>
@@ -20,7 +20,8 @@
<div class="title-l">
<span class="task-create-time">{{ item.task.createTimeStr }}</span>
<span class="task-status">
<span>{{ $t('status') }}:</span><i :class="item.task.status"></i><span>{{ item.task.status }}</span>
<span>{{ $t('status') }}:</span><i :class="item.task.status"></i><span>{{ item.task.status
}}</span>
</span>
<span class="task-duration">
<span>{{ $t('cloudbrainObj.runDuration') }}:</span><span>{{ item.task.formatted_duration }}</span>
@@ -42,6 +43,11 @@
:configs="tabConfigs['configInfo']">
</ConfigInfo>
</el-tab-pane>
<el-tab-pane v-if="tabNameList.indexOf('operationProfile') >= 0"
:label="$t('cloudbrainObj.taskRuntimeInfo')" :name="`operationProfile-` + item.task.id">
<OperationProfile :ref="`operationProfile-` + item.task.id + '-Ref'" :data="item"
:configs="tabConfigs['operationProfile']"></OperationProfile>
</el-tab-pane>
</el-tabs>
</div>
</el-collapse-item>
@@ -57,6 +63,7 @@
import NotFound from '~/components/NotFound.vue';
import LoadingMask from '~/components/cloudbrain/LoadingMask.vue';
import ConfigInfo from '~/components/cloudbrain/details/ConfigInfo.vue';
import OperationProfile from '~/components/cloudbrain/details/OperationProfile.vue';
import { CloudBrainTools } from '~/pages/cloudbrain/tools';
import { CLUSTERS } from '~/const';
import { timeSinceUnix, getListValueWithKey } from '~/utils';
@@ -86,7 +93,7 @@ export default {
maskLoadingContent: '',
};
},
components: { NotFound, LoadingMask, ConfigInfo },
components: { NotFound, LoadingMask, ConfigInfo, OperationProfile },
methods: {
taskChange(taskIndex) {
const item = this.mainData[Number(taskIndex)];


Loading…
Cancel
Save