fix-bugs

web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue

@@ -210,7 +210,7 @@
 <script>
 
 import { getModelInfoByName, modifyModel, getModelFiles, deleteModelFile } from '~/apis/modules/modelmanage';
-import { getUrlSearchParams, getListValueWithKey, transFileSize } from '~/utils';
+import { getUrlSearchParams, getListValueWithKey, transFileSize, renderSpecStr } from '~/utils';
 import { MODEL_ENGINES } from '~/const';
 import { formatDate } from 'element-ui/lib/utils/date-util';
 
@@ -326,6 +326,13 @@ export default {
         const versionHtml = versionName ? `<span class="append-txt" title="${versionName}">${versionName}</span>` : '';
         const codeCommitID = data.codeCommitID;
         const codeCommitIDHtml = codeCommitID ? `<span class="append-txt" title="${codeCommitID}">${codeCommitID.slice(0, 10)}</span>` : '';
+        let specObj;
+        try {
+          specObj = trainTaskInfo.FlavorName ? JSON.parse(trainTaskInfo.FlavorName) : '';
+        } catch (e) {
+          specObj = trainTaskInfo.FlavorName;
+        }
+        const sepcStr = typeof specObj == 'object' ? renderSpecStr(specObj) : specObj;
         Object.assign(this.state, {
           displayJobName: `<a href="${taskUrl}" title="${trainTaskInfo.DisplayJobName}">${trainTaskInfo.DisplayJobName}</a>${versionHtml}`,
           branchName: `<span>${trainTaskInfo.BranchName}</span>${codeCommitIDHtml}`,
@@ -333,7 +340,7 @@ export default {
           datasetName: trainTaskInfo.DatasetName,
           parameters: parametersStr || '--',
           workServerNumber: trainTaskInfo.WorkServerNumber || '--',
-          specStr: trainTaskInfo.FlavorName || '--',
+          specStr: sepcStr || '--',
         });
       }
       this.curVersion = version;

web_src/vuepages/utils/index.js

@@ -1,3 +1,7 @@
+
+import { i18n } from '~/langs';
+import { ACC_CARD_TYPE } from '~/const';
+
 export const getListValueWithKey = (list, key, k = 'k', v = 'v') => {
   for (let i = 0, iLen = list.length; i < iLen; i++) {
     const listI = list[i];
@@ -25,3 +29,13 @@ export const transFileSize = (srcSize) => {
   const size = (srcSize / Math.pow(1024, index)).toFixed(2);
   return size + ' ' +  unitArr[index];
 };
+
+export const renderSpecStr = (spec, showPoint) => {
+  if (!spec) return '';
+  var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`;
+  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 pointStr = showPoint ? `, ${spec.UnitPrice == 0 ? i18n.t('resourcesManagement.free') : spec.UnitPrice + i18n.t('resourcesManagement.point_hr')}` : '';
+  var specStr = `${ngpu}, CPU: ${spec.CpuCores}, ${gpuMemStr}${i18n.t('resourcesManagement.mem')}: ${spec.MemGiB}GB${sharedMemStr}${pointStr}`;
+  return specStr;
+};