Merge remote-tracking branch 'origin/point-v2' into point-v2

templates/reward/point/rule.tmpl

@@ -133,7 +133,7 @@
                             if (taskRule.TaskCode == key) {
                                 ruleTr.find('.point').text(taskRule.AwardAmount);
                                 ruleTr.find('.typ').text(taskRule.RefreshRate == 'DAILY' ? '每日' : taskRule.RefreshRate == 'NOT_CYCLE' ? '累计' : taskRule.RefreshRate);
-                                ruleTr.find('.limit').text(taskRule.LimitNum);
+                                ruleTr.find('.limit').text(taskRule.AwardAmount * taskRule.LimitNum);
                                 findOr = true;
                                 break;
                             }

web_src/vuepages/langs/config/en-US.js

@@ -129,6 +129,7 @@ const en = {
     shareMem: 'Share Memory',
     unitPrice: 'Unit Price',
     point_hr: 'Point/hr',
+    node: 'node',
     free: 'Free',
     onShelfConfirm: 'Are you sure to on shelf the resources specification?',
     offShelfConfirm: 'Are you sure to off shelf the resources specification?',

web_src/vuepages/langs/config/zh-CN.js

@@ -129,6 +129,7 @@ const zh = {
     shareMem: '共享内存',
     unitPrice: '单价',
     point_hr: '积分/时',
+    node: '节点',
     free: '免费',
     onShelfConfirm: '请确认上架该规格？',
     offShelfConfirm: '请确认下架该规格？',

web_src/vuepages/pages/reward/point/utils.js

@@ -61,8 +61,8 @@ const renderSpecStr = (spec, showPoint) => {
   var gpuMemStr = spec.GPUMemGiB != 0 ? `${i18n.t('resourcesManagement.gpuMem')}: ${spec.GPUMemGiB}GB, ` : '';
   var sharedMemStr = spec.ShareMemGiB != 0 ? `, ${i18n.t('resourcesManagement.shareMem')}: ${spec.ShareMemGiB}GB` : '';
   var workServerNum = spec.workServerNumber;
-  var workServerNumStr = showPoint && workServerNum != 1 && spec.UnitPrice != 0 ? workServerNum + '*' : '';
-  var pointStr = showPoint ? `, ${spec.UnitPrice == 0 ? i18n.t('resourcesManagement.free') : workServerNumStr + spec.UnitPrice + i18n.t('resourcesManagement.point_hr')}` : '';
+  var workServerNumStr = showPoint && workServerNum != 1 && spec.UnitPrice != 0 ?   '*' + workServerNum + i18n.t('resourcesManagement.node') : '';
+  var pointStr = showPoint ? `, ${spec.UnitPrice == 0 ? i18n.t('resourcesManagement.free') : spec.UnitPrice + i18n.t('resourcesManagement.point_hr') + workServerNumStr}` : '';
   var specStr = `${ngpu}, CPU: ${spec.CpuCores}, ${gpuMemStr}${i18n.t('resourcesManagement.mem')}: ${spec.MemGiB}GB${sharedMemStr}${pointStr}`;
   return specStr;
 };
@@ -156,7 +156,7 @@ export const getRewardPointRecordInfo = (record) => {
       // }
       const resourceSpec = record?.Cloudbrain?.ResourceSpec;
       if (resourceSpec) {
-        resourceSpec.workServerNumber = record?.Cloudbrain?.workServerNumber || 1;
+        resourceSpec.workServerNumber = record?.Cloudbrain?.WorkServerNumber || 1;
         out.remark = `【${getJobType(record?.Cloudbrain?.JobType)}】【${renderSpecStr(resourceSpec, true)}】`;
       }
     }