From 35d77af01249973b672f6fc627bb8583401722d4 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 26 Aug 2022 17:16:30 +0800
Subject: [PATCH] Resources Management

---
 web_src/vuepages/pages/resources/components/SceneDialog.vue |  3 ++-
 web_src/vuepages/pages/resources/scene/index.vue            | 10 ++++++----
 web_src/vuepages/pages/resources/specification/index.vue    |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/web_src/vuepages/pages/resources/components/SceneDialog.vue b/web_src/vuepages/pages/resources/components/SceneDialog.vue
index 3f20756fb..c47fa794c 100644
--- a/web_src/vuepages/pages/resources/components/SceneDialog.vue
+++ b/web_src/vuepages/pages/resources/components/SceneDialog.vue
@@ -177,7 +177,8 @@ export default {
           const data = list.map((item) => {
             const Queue = item.Queue;
             const Spec = item.Spec;
-            const NGPU = `${Queue.ComputeResource}:${Spec.AccCardsNum === 0 ? '0' : Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Queue.AccCardType)}`;
+            // const NGPU = `${Queue.ComputeResource}:${Spec.AccCardsNum === 0 ? '0' : Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Queue.AccCardType)}`;
+            const NGPU = `${Queue.ComputeResource}:${Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Queue.AccCardType)}`;
             return {
               k: Spec.ID,
               v: `${NGPU}, CPU:${Spec.CpuCores}, ${this.$t('resourcesManagement.gpuMem')}:${Spec.GPUMemGiB}GB, ${this.$t('resourcesManagement.mem')}:${Spec.MemGiB}GB, ${this.$t('resourcesManagement.shareMem')}:${Spec.ShareMemGiB}GB, ${this.$t('resourcesManagement.unitPrice')}:${Spec.UnitPrice}${this.$t('resourcesManagement.point_hr')}`,
diff --git a/web_src/vuepages/pages/resources/scene/index.vue b/web_src/vuepages/pages/resources/scene/index.vue
index a42124bab..30c53b742 100644
--- a/web_src/vuepages/pages/resources/scene/index.vue
+++ b/web_src/vuepages/pages/resources/scene/index.vue
@@ -186,11 +186,13 @@ export default {
           const data = list.map((item) => {
             const Specs = item.Specs;
             const specsList = [];
-            const queues = [], queueIds = [];
+            const queues = [];
+            const queueIds = [];
             let cluster = '';
             for (let i = 0, iLen = Specs.length; i < iLen; i++) {
               const Spec = Specs[i];
-              const NGPU = `${Spec.ComputeResource}:${Spec.AccCardsNum === 0 ? '0' : Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Spec.AccCardType)}`;
+              // const NGPU = `${Spec.ComputeResource}:${Spec.AccCardsNum === 0 ? '0' : Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Spec.AccCardType)}`;
+              const NGPU = `${Spec.ComputeResource}:${Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Spec.AccCardType)}`;
               specsList.push({
                 k: Spec.ID,
                 v: `${NGPU}, CPU:${Spec.CpuCores}, ${this.$t('resourcesManagement.gpuMem')}:${Spec.GPUMemGiB}GB, ${this.$t('resourcesManagement.mem')}:${Spec.MemGiB}GB, ${this.$t('resourcesManagement.shareMem')}:${Spec.ShareMemGiB}GB, ${this.$t('resourcesManagement.unitPrice')}:${Spec.UnitPrice}${this.$t('resourcesManagement.point_hr')}`,
@@ -201,8 +203,8 @@ export default {
                   QueueId: Spec.QueueId,
                   QueueCode: Spec.QueueCode,
                   AiCenterCode: Spec.AiCenterCode,
-                  AiCenterName: getListValueWithKey(this.aiCenterList, Spec.AiCenterCode),
-                  QueueStr: `${Spec.QueueCode}(${getListValueWithKey(this.clusterList, Spec.Cluster)} - ${getListValueWithKey(this.aiCenterList, Spec.AiCenterCode)})`,
+                  AiCenterName: Spec.AiCenterName,
+                  QueueStr: `${Spec.QueueCode}(${getListValueWithKey(this.clusterList, Spec.Cluster)} - ${Spec.AiCenterName})`,
                 });
                 queueIds.push(Spec.QueueId);
               }
diff --git a/web_src/vuepages/pages/resources/specification/index.vue b/web_src/vuepages/pages/resources/specification/index.vue
index 1c2b22d30..2335e67b8 100644
--- a/web_src/vuepages/pages/resources/specification/index.vue
+++ b/web_src/vuepages/pages/resources/specification/index.vue
@@ -190,7 +190,8 @@ export default {
           const data = list.map((item) => {
             const Queue = item.Queue;
             const Spec = item.Spec;
-            const NGPU = `${Queue.ComputeResource}:${Spec.AccCardsNum === 0 ? '0' : Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Queue.AccCardType)}`;
+            // const NGPU = `${Queue.ComputeResource}:${Spec.AccCardsNum === 0 ? '0' : Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Queue.AccCardType)}`;
+            const NGPU = `${Queue.ComputeResource}:${Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Queue.AccCardType)}`;
             return {
               ...Spec,
               SourceSpecId: Spec.SourceSpecId || '--',