Merge remote-tracking branch 'origin/res-manage-v2' into res-manage-v2

templates/custom/task_wait_count.tmpl

@@ -0,0 +1,25 @@
+<div style="display:inline-block;">
+  <div style="display:flex;align-items:center;color:#f2711c;">
+    <i class="ri-error-warning-line" style="margin-right: 0.5rem; font-size: 16px"></i>
+    <span>{{.i18n.Tr "repo.wait_count_start"}} <span class="__task_wait_count__">{{.WaitCount}}</span> {{.i18n.Tr "repo.wait_count_end"}}</span>
+  </div>
+</div>
+<script>
+  ;(function() {
+    var queuesDetail = {{.QueuesDetail}};
+    if (queuesDetail) {
+      function changeSpecs() {
+        var specsSelEl = $('select#__specs__');
+        var seldOption = specsSelEl.find('option:selected');
+        var queueCode = seldOption.attr('queueCode');
+        $('span.__task_wait_count__').text(queuesDetail[queueCode] || 0);
+      };
+      $('body').on('change', 'select#__specs__', function(e) {
+        changeSpecs();
+      });
+      setTimeout(function() {
+        changeSpecs();
+      }, 50);
+    }
+  })();
+</script>

templates/repo/cloudbrain/benchmark/new.tmpl

@@ -51,9 +51,12 @@
                         <a class="active item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                     </div>
-                    {{template "custom/wait_count_train" Dict "ctx" $ "type" .benchmark_gpu_types}}
                 </div>
                 <div>
+                    <div class="min_title inline field" style="margin-top:-10px;">
+                        <label class="label-fix-width" style="font-weight: normal;"></label>
+                        {{template "custom/task_wait_count" .}}
+                    </div>
                     <div class="required min_title inline field">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
                         <input style="width: 80%;" name="display_job_name" id="trainjob_job_name"
@@ -153,10 +156,13 @@
                         <a class="item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                     </div>
-                    {{template "custom/wait_count_train" Dict "ctx" $ "type" .benchmark_gpu_types}}
                 </div>
 
                 <div>
+                    <div class="min_title inline field" style="margin-top:-10px;">
+                        <label class="label-fix-width" style="font-weight: normal;"></label>
+                        {{template "custom/task_wait_count" .}}
+                    </div>
                     <div class="required min_title inline field">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
                         <input style="width: 80%;" name="display_job_name" id="trainjob_job_name"

templates/repo/cloudbrain/inference/new.tmpl

@@ -82,7 +82,10 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" Dict "ctx" $ "type" .inference_gpu_types}}
+                </div>
+                <div class="min_title inline field" style="margin-top:-10px;">
+                    <label class="label-fix-width" style="font-weight: normal;"></label>
+                    {{template "custom/task_wait_count" .}}
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>

templates/repo/cloudbrain/new.tmpl

@@ -25,7 +25,7 @@
         <div class="column">
             <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>
             {{template "base/alert" .}}
-            <div class="ui negative message" id="messageInfo">
+            <div class="ui negative message" id="messageInfo" style="display:none;">
                 <p></p>
             </div>
             <form id="form_id" class="ui form" action="{{.Link}}" method="post">
@@ -55,8 +55,11 @@
                                         d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
                                 </svg>
                                 Ascend NPU</a>
-                        </div>
-                        {{template "custom/wait_count" .}}
+                        </div>                        
+                    </div>                    
+                    <div class="inline field">
+                        <label></label>
+                        {{template "custom/task_wait_count" .}}
                     </div>
                     <div class="inline required field">
                         <label>{{.i18n.Tr "cloudbrain.task_name"}}</label>

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -116,7 +116,10 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" Dict "ctx" $ "type" .train_gpu_types}}
+                </div>
+                <div class="min_title inline field" style="margin-top:-10px;">
+                    <label class="label-fix-width" style="font-weight: normal;"></label>
+                    {{template "custom/task_wait_count" .}}
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
@@ -252,7 +255,7 @@
 
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
-                    <select id="__specs__" class="ui search dropdown width48" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}"
+                    <select id="__specs__" class="ui dropdown width48" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}"
                         name="spec_id">
                     </select>
                 </div>

templates/repo/grampus/trainjob/gpu/new.tmpl

@@ -30,7 +30,9 @@
 .width81{
     width: 81% !important;
 }
-
+.width48{
+    width: 48.5% !important;
+}
 .add{font-size: 18px;
     padding: 0.5rem;
     border: 1px solid rgba(187, 187, 187, 100);
@@ -105,7 +107,10 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" Dict "ctx" $}}
+                </div>
+                <div class="min_title inline field" style="margin-top:-10px;">
+                    <label class="label-fix-width" style="font-weight: normal;"></label>
+                    {{template "custom/task_wait_count" .}}
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
@@ -174,8 +179,7 @@
                     
                     </div>
                 </div>
-
-               <div class="required min_title inline field" id="flavor_name">
+                <!--<div class="required min_title inline field" id="flavor_name">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
                     <select class="ui dropdown width81" id="trainjob-flavor" style='width:385px' name="flavor">
                         {{if .flavor}}
@@ -195,6 +199,10 @@
                             {{end}}
                         {{end}}
                     </select>
+                </div>-->
+               <div class="required min_title inline field" id="flavor_name">
+                    <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
+                    <select class="ui dropdown width48" id="__specs__" style='width:385px' name="spec_id"></select>
                 </div>
                 
                 <div class="inline min_title field">
@@ -212,6 +220,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
 <script>
     //let url_href = window.location.pathname.split('create')[0]
@@ -364,4 +373,16 @@
         send_run_para()
         validate();
     })
+
+    ;(function() {
+        var SPECS = {{ .Specs }};
+        var showPoint = true;
+        renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+    })();
 </script>

templates/repo/grampus/trainjob/npu/new.tmpl

@@ -25,7 +25,9 @@
 .width81{
     width: 81% !important;
 }
-
+.width48 {
+    width: 48.5% !important;
+}
 .add{font-size: 18px;
     padding: 0.5rem;
     border: 1px solid rgba(187, 187, 187, 100);
@@ -99,9 +101,11 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" Dict "ctx" $}}
                 </div>
-                
+                <div class="min_title inline field" style="margin-top:-10px;">
+                    <label class="label-fix-width" style="font-weight: normal;"></label>
+                    {{template "custom/task_wait_count" .}}
+                </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
                     <input style="width: 60%;" name="display_job_name" id="display_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}" tabindex="3" onkeyup="this.value=this.value.replace(/[, ]/g,'')" autofocus required maxlength="36">
@@ -187,7 +191,7 @@
                     </div>
                 </div>
 
-                <div class="required min_title inline field" id="flavor_name">
+                <!--<div class="required min_title inline field" id="flavor_name">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
                     <select class="ui dropdown width81" id="trainjob-flavor" style='width:385px' name="flavor">
                         {{if .flavor}}
@@ -207,6 +211,10 @@
                             {{end}}
                         {{end}}
                     </select>
+                </div>-->
+                <div class="required min_title inline field" id="flavor_name">
+                    <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
+                    <select class="ui dropdown width48" id="__specs__" style='width:385px' name="spec_id"></select>
                 </div>
                 <div class="inline required min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label>
@@ -238,6 +246,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
 <script>
     
@@ -384,4 +393,16 @@
         send_run_para()
         validate();
     })
+
+    ;(function() {
+        var SPECS = {{ .Specs }};
+        var showPoint = true;
+        renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+    })();
 </script>

templates/repo/grampus/trainjob/show.tmpl

@@ -357,7 +357,7 @@
                                                         {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content spec">
                                                         <div class="text-span text-span-w">
                                                             {{.FlavorName}}
                                                         </div>
@@ -629,8 +629,20 @@
 {{template "base/footer" .}}
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.core.js"></script>
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.excheck.js"></script>
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
+    ;(function() {
+        var SPEC = {{ .Spec }};
+        var showPoint = true;
+        var specStr = window.renderSpecStr(SPEC, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+        $('td.ti-text-form-content.spec').text(specStr);
+    })();
    var setting = {
 			check: {
 				enable: true,

templates/repo/modelarts/inferencejob/new.tmpl

@@ -82,7 +82,10 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" Dict "ctx" $}}
+                </div>
+                <div class="min_title inline field" style="margin-top:-10px;">
+                    <label class="label-fix-width" style="font-weight: normal;"></label>
+                    {{template "custom/task_wait_count" .}}
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>

templates/repo/modelarts/notebook/new.tmpl

@@ -38,7 +38,10 @@
                                 </svg>
                                 Ascend NPU</a>
                         </div>
-                        {{template "custom/wait_count" .}}
+                    </div>
+                    <div class="inline field">
+                        <label></label>
+                        {{template "custom/task_wait_count" .}}
                     </div>
                     <div class="inline required field">
                         <label>{{.i18n.Tr "cloudbrain.task_name"}}</label>

templates/repo/modelarts/trainjob/new.tmpl

@@ -110,7 +110,10 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" Dict "ctx" $}}
+                </div>
+                <div class="min_title inline field" style="margin-top:-10px;">
+                    <label class="label-fix-width" style="font-weight: normal;"></label>
+                    {{template "custom/task_wait_count" .}}
                 </div>
                 <div class="required inline min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>

web_src/js/standalone/specsuse.js

@@ -10,7 +10,7 @@ window.getListValueWithKey = (list, key, k = 'k', v = 'v', defaultV = '') => {
 
 window.renderSpecStr = (spec, showPoint, langObj) => {
   showPoint = false;
-  var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum === 0 ? '0' : spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`;
+  var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`;
   var gpuMemStr = spec.GPUMemGiB != 0 ? `${langObj.gpu_memory}: ${spec.GPUMemGiB}GB, ` : '';
   var sharedMemStr = spec.ShareMemGiB != 0 ? `, ${langObj.shared_memory}: ${spec.ShareMemGiB}GB` : '';
   var pointStr = showPoint ? `, ${spec.UnitPrice == 0 ? langObj.free : spec.UnitPrice + langObj.point_hr}` : '';
@@ -24,6 +24,6 @@ window.renderSpecsSelect = (specsSel, data, showPoint, langObj) => {
   for (var i = 0, iLen = data.length; i < iLen; i++) {
     var spec = data[i];
     var specStr = window.renderSpecStr(spec, showPoint, langObj);
-    specsSel.append(`<option name="spec_id" value="${spec.ID}">${specStr}</option>`);
+    specsSel.append(`<option name="spec_id" value="${spec.ID}" queueCode="${spec.QueueCode}">${specStr}</option>`);
   }
 }

web_src/vuepages/pages/resources/components/SceneDialog.vue

@@ -38,7 +38,8 @@
               <span>{{ $t('resourcesManagement.exclusiveOrg') }}</span>
             </div>
             <div class="content">
-              <el-input v-model="dataInfo.ExclusiveOrg" :placeholder="$t('resourcesManagement.exclusiveOrgTips')" maxlength="255">
+              <el-input v-model="dataInfo.ExclusiveOrg" :placeholder="$t('resourcesManagement.exclusiveOrgTips')"
+                maxlength="255">
               </el-input>
             </div>
           </div>
@@ -146,14 +147,15 @@ export default {
               v: `${item.QueueCode}(${getListValueWithKey(this.clusterList, item.Cluster)} - ${item.AiCenterName})`,
             });
           }
-          if (this.dataInfo.Cluster === 'C2Net') {
-            list.unshift({
-              k: '-1',
-              v: this.$t('resourcesManagement.allResQueue'),
-            });
-          }
+          list.unshift({
+            k: '-1',
+            v: this.$t('resourcesManagement.allResQueue'),
+          });
           this.queueList.splice(0, Infinity, ...list);
           if (next) {
+            if (this.type === 'add') {
+              this.dataInfo.QueueId = '-1';
+            }
             this.getResSpecificationList();
           }
         }
@@ -195,7 +197,7 @@ export default {
       this.dataInfo.SpecIds = [];
       this.queueList.splice(0, Infinity);
       this.specsList.splice(0, Infinity);
-      this.getQueueList();
+      this.getQueueList(true);
     },
     changeQueue() {
       this.dataInfo.SpecIds = [];