From 81ef4ff092a261e1f3a7b04f3877df9923bd3f5f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 21 Jan 2022 14:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=89=8D=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/cloudbrain.go                    | 17 +++++++++++++-
 templates/repo/cloudbrain/benchmark/show.tmpl | 23 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

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 {
                                                         </div>
                                                     </td>
                                                 </tr>
-
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        类型 
+                                                    </td>
+        
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                            {{$.BenchmarkTypeName}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
                                                 
                                                 
                                             </tbody>
@@ -346,6 +356,17 @@ td, th {
                                                             </div>
                                                         </td>
                                                     </tr>
+                                                    <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        子类型 
+                                                    </td>
+        
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                            {{$.BenchmarkChildTypeName}}
+                                                        </div>
+                                                    </td>
+                                                    </tr>
                                                 </tbody>
                                             </table>
                                         </div>