fix-kanban

models/cloudbrain_static.go

@@ -335,7 +335,7 @@ func DeleteCloudbrainDurationStatisticHour(date string, hour int, aiCenterCode s
 func GetCanUseCardInfo() ([]*ResourceQueue, error) {
 	sess := x.NewSession()
 	defer sess.Close()
-	sess.OrderBy("resource_queue.cluster DESC, resource_queue.ai_center_name ASC")
+	sess.OrderBy("resource_queue.cluster DESC, resource_queue.ai_center_code ASC")
 	ResourceQueues := make([]*ResourceQueue, 0, 10)
 	if err := sess.Table(&ResourceQueue{}).Find(&ResourceQueues); err != nil {
 		log.Info("find error.")

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -1434,7 +1434,7 @@ func GetCloudbrainResourceOverview(ctx *context.Context) {
 			resourceDetail.QueueCode = resourceQueue.QueueCode
 			resourceDetail.Cluster = resourceQueue.Cluster
 			resourceDetail.AiCenterCode = resourceQueue.AiCenterCode
-			resourceDetail.AiCenterName = aiCenterName + "/" + resourceQueue.AiCenterCode
+			resourceDetail.AiCenterName = resourceQueue.AiCenterCode + "/" + aiCenterName
 			resourceDetail.ComputeResource = resourceQueue.ComputeResource
 			resourceDetail.AccCardType = resourceQueue.AccCardType + "(" + resourceQueue.ComputeResource + ")"
 			resourceDetail.CardsTotalNum = resourceQueue.CardsTotalNum
@@ -1447,7 +1447,7 @@ func GetCloudbrainResourceOverview(ctx *context.Context) {
 			resourceDetail.QueueCode = resourceQueue.QueueCode
 			resourceDetail.Cluster = resourceQueue.Cluster
 			resourceDetail.AiCenterCode = resourceQueue.AiCenterCode
-			resourceDetail.AiCenterName = aiCenterName + "/" + resourceQueue.AiCenterCode
+			resourceDetail.AiCenterName = resourceQueue.AiCenterCode + "/" + aiCenterName
 			resourceDetail.ComputeResource = resourceQueue.ComputeResource
 			resourceDetail.AccCardType = resourceQueue.AccCardType + "(" + resourceQueue.ComputeResource + ")"
 			resourceDetail.CardsTotalNum = resourceQueue.CardsTotalNum