fix-bug

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -1230,8 +1230,8 @@ func allCloudbrainHeader(ctx *context.Context) map[string]string {
 		"E1": ctx.Tr("repo.modelarts.createtime"), "F1": ctx.Tr("repo.modelarts.train_job.wait_time"), "G1": ctx.Tr("repo.modelarts.train_job.dura_time"),
 		"H1": ctx.Tr("cloudbrain.card_duration"),
 		"I1": ctx.Tr("repo.modelarts.train_job.start_time"), "J1": ctx.Tr("repo.modelarts.train_job.end_time"),
-		"K1": ctx.Tr("repo.modelarts.computing_resources"), "L1": ctx.Tr("cloudbrain.resource_specification"),
-		"M1": ctx.Tr("repo.grampus.train_job.ai_center"), "N1": ctx.Tr("cloudbrain.card_type"),
+		"K1": ctx.Tr("repo.modelarts.computing_resources"), "L1": ctx.Tr("cloudbrain.card_type"),
+		"M1": ctx.Tr("repo.grampus.train_job.ai_center"), "N1": ctx.Tr("cloudbrain.resource_specification"),
 		"O1": ctx.Tr("repo.cloudbrain_creator"), "P1": ctx.Tr("repo.repo_name"), "Q1": ctx.Tr("repo.cloudbrain_task_name"),
 		"R1": ctx.Tr("repo.modelarts.deletetime")}
 
@@ -1241,8 +1241,8 @@ func allCloudbrainValues(row int, rs *models.CloudbrainInfo, ctx *context.Contex
 		getCellName("E", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("F", row): repo.GetCloudbrainWaitTime(rs.Cloudbrain),
 		getCellName("G", row): rs.TrainJobDuration, getCellName("H", row): repo.GetCloudbrainCardDuration(rs.Cloudbrain),
 		getCellName("I", row): getBrainStartTime(rs),
-		getCellName("J", row): getBrainEndTime(rs), getCellName("K", row): rs.ComputeResource, getCellName("L", row): getCloudbrainFlavorName(rs),
-		getCellName("M", row): repo.GetCloudbrainAiCenter(rs.Cloudbrain, ctx), getCellName("N", row): getCloudbrainCardType(rs),
+		getCellName("J", row): getBrainEndTime(rs), getCellName("K", row): rs.ComputeResource, getCellName("L", row): getCloudbrainCardType(rs),
+		getCellName("M", row): repo.GetCloudbrainAiCenter(rs.Cloudbrain, ctx), getCellName("N", row): getCloudbrainFlavorName(rs),
 		getCellName("O", row): rs.Name, getCellName("P", row): getBrainRepo(rs),
 		getCellName("Q", row): rs.JobName, getCellName("R", row): getBrainDeleteTime(rs),
 	}

routers/repo/cloudbrain.go

@@ -2409,7 +2409,8 @@ func GetCloudbrainFlavorName(task models.Cloudbrain) (string, error) {
 			}
 		}
 	} else if (task.Type == models.TypeCloudBrainTwo || task.Type == models.TypeC2Net) && task.FlavorName != "" {
-		return task.FlavorName, nil
+		ReplaceFlavorName := strings.ReplaceAll(task.FlavorName, "：", ":")
+		return ReplaceFlavorName, nil
 	} else if task.Type == models.TypeCloudBrainTwo && task.FlavorName == "" && task.FlavorCode != "" {
 		index := strings.LastIndex(task.FlavorCode, ".")
 		cardNum, err := strconv.Atoi(strings.TrimSpace(task.FlavorCode[index+1 : len(task.FlavorCode)]))
@@ -2427,13 +2428,17 @@ func GetCloudbrainFlavorName(task models.Cloudbrain) (string, error) {
 }
 
 func getCloudBrainOneResourceSpec(task models.Cloudbrain) (*models.ResourceSpec, *models.GpuInfo, error) {
+	GpuQueueDefault := "openidebug"
+	if task.GpuQueue != "" {
+		GpuQueueDefault = task.GpuQueue
+	}
 	if task.ResourceSpecId >= 0 {
 		if task.JobType == string(models.JobTypeTrain) {
-			return models.CloudbrainTrainResourceSpecsMap[task.ResourceSpecId], models.CloudbrainTrainGpuInfosMap[task.GpuQueue], nil
+			return models.CloudbrainTrainResourceSpecsMap[task.ResourceSpecId], models.CloudbrainTrainGpuInfosMap[GpuQueueDefault], nil
 		} else if task.JobType == string(models.JobTypeDebug) {
-			return models.CloudbrainDebugResourceSpecsMap[task.ResourceSpecId], models.CloudbrainDebugGpuInfosMap[task.GpuQueue], nil
+			return models.CloudbrainDebugResourceSpecsMap[task.ResourceSpecId], models.CloudbrainDebugGpuInfosMap[GpuQueueDefault], nil
 		} else {
-			return models.CloudbrainDebugResourceSpecsMap[task.ResourceSpecId], models.CloudbrainDebugGpuInfosMap[task.GpuQueue], nil
+			return models.CloudbrainDebugResourceSpecsMap[task.ResourceSpecId], models.CloudbrainDebugGpuInfosMap[GpuQueueDefault], nil
 		}
 	} else {
 		err := errors.New("ResourceSpecId is null")