diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 6621081fd..b84bc3626 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -400,6 +400,21 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) {
} else {
duration = int64(task.UpdatedUnix) - int64(task.CreatedUnix)
}
+ if benchmarkTypes.BenchmarkType != nil {
+ for _, benchmarkType := range benchmarkTypes.BenchmarkType {
+ if task.BenchmarkTypeID == benchmarkType.Id {
+ ctx.Data["BenchmarkTypeName"] = benchmarkType.First
+ for _, benchmarkChildType := range benchmarkType.Second {
+ if task.BenchmarkChildTypeID == benchmarkChildType.Id {
+ ctx.Data["BenchmarkChildTypeName"] = benchmarkChildType.Value
+ break
+ }
+ }
+ break
+ }
+ }
+ }
+
ctx.Data["duration"] = util.AddZero(duration/3600000) + ":" + util.AddZero(duration%3600000/60000) + ":" + util.AddZero(duration%60000/1000)
ctx.Data["task"] = task
ctx.Data["jobID"] = jobID
@@ -445,7 +460,7 @@ func CloudBrainStop(ctx *context.Context) {
task := ctx.Cloudbrain
for {
- if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) || task.Status == string(models.JobSucceeded){
+ if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) || task.Status == string(models.JobSucceeded) {
log.Error("the job(%s) has been stopped", task.JobName, ctx.Data["msgID"])
resultCode = "-1"
errorMsg = "system error"
diff --git a/templates/repo/cloudbrain/benchmark/show.tmpl b/templates/repo/cloudbrain/benchmark/show.tmpl
index 329f31476..5fe3c02c3 100755
--- a/templates/repo/cloudbrain/benchmark/show.tmpl
+++ b/templates/repo/cloudbrain/benchmark/show.tmpl
@@ -277,7 +277,17 @@ td, th {
-
+
+ |
+ 类型
+ |
+
+
+
+ {{$.BenchmarkTypeName}}
+
+ |
+
@@ -346,6 +356,17 @@ td, th {
+
+ |
+ 子类型
+ |
+
+
+
+ {{$.BenchmarkChildTypeName}}
+
+ |
+