提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

templates/repo/cloudbrain/benchmark/index.tmpl

@@ -253,29 +253,53 @@
                     }
     }
 
-    // 加载任务状态
+     // 加载任务状态
     var timeid = window.setInterval(loadJobStatus, 15000);
     $(document).ready(loadJobStatus);
     function loadJobStatus() {
         $(".job-status").each((index, job) => {
-            const jobID = job.dataset.jobid
-            const repoPath = job.dataset.repopath
-            const versionname = job.dataset.version
-            const status_text = $(`#${jobID}-text`).text()
-            if(['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED'].includes(status_text)){
-                return 
+            const jobID = job.dataset.jobid;
+            const repoPath = job.dataset.repopath;
+            const computeResource = job.dataset.resource
+            const initArray = ['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED']
+            if (initArray.includes(job.textContent.trim())) {
+                
+                return
             }
-            $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => {
+            const diffResource = computeResource == "NPU" ? 'modelarts/notebook' : 'cloudbrain'
+            $.get(`/api/v1/repos/${repoPath}/${diffResource}/${jobID}`, (data) => {
                 const jobID = data.JobID
                 const status = data.JobStatus
-                const duration = data.JobDuration
-                $('#duration-'+jobID).text(duration)
                 if (status != job.textContent.trim()) {
                     $('#' + jobID+'-icon').removeClass().addClass(status)
                     $('#' + jobID+ '-text').text(status)
-
                 }
-                
+                if(status==="RUNNING"){
+                    $('#model-debug-'+jobID).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem")
+                    $('#model-image-'+jobID).removeClass('disabled').addClass('blue')
+                }
+                if(status!=="RUNNING"){
+                    // $('#model-debug-'+jobID).removeClass('blue')
+                    // $('#model-debug-'+jobID).addClass('disabled')
+                    $('#model-image-'+jobID).removeClass('blue').addClass('disabled')
+                }
+                if(["CREATING","STOPPING","WAITING","STARTING"].includes(status)){
+                    $('#model-debug-'+jobID).removeClass('blue').addClass('disabled')
+                }
+                if(['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'].includes(status)){
+                    $('#model-debug-'+jobID).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0") 
+                }
+                if(["RUNNING","WAITING"].includes(status)){
+                   $('#stop-model-debug-'+jobID).removeClass('disabled').addClass('blue')
+                }
+                if(["CREATING","STOPPING","STARTING","STOPPED","FAILED","START_FAILED","SUCCEEDED"].includes(status)){
+                   $('#stop-model-debug-'+jobID).removeClass('blue').addClass('disabled')
+                }
+                if(status==="STOPPED" || status==="FAILED"|| status==="START_FAILED"){
+                    $('#model-delete-'+jobID).removeClass('disabled').addClass('blue')
+                }else{
+                    $('#model-delete-'+jobID).removeClass('blue').addClass('disabled')
+                }
             }).fail(function(err) {
                 console.log(err);
             });

templates/repo/cloudbrain/benchmark/new.tmpl

@@ -75,8 +75,9 @@
             <form class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
+                <!--
                 <input type="hidden" id="ai_engine_name" name="engine_names" value="">
-                <input type="hidden" id="ai_flaver_name" name="flaver_names" value="">
+                <input type="hidden" id="ai_flaver_name" name="flaver_names" value=""> -->
                 
                 <div class="required unite min_title inline field">
                     <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
@@ -174,27 +175,7 @@
             sever_num.val(parseInt(sever_num.val())+1)
         }
     })
-    // 参数增加、删除、修改、保存
-    function Add_parameter(i){
-        value = '<div class="two fields width85" id= "para'+ i +'">' +
-                    '<div class="field">' + 
-                        '<input type="text" name="shipping_first-name" required  placeholder={{.i18n.Tr "repo.modelarts.train_job.parameter_name"}}> ' + 
-                    '</div> ' + 
-                    '<div class="field"> ' +
-                        '<input type="text" name="shipping_last-name" required placeholder={{.i18n.Tr "repo.modelarts.train_job.parameter_value"}}>' +
-                    '</div>'+
-                    '<span>' +
-                        '<i class="trash icon">' +
-                        '</i>' +
-                    '</span>' +
-                '</div>'
-        $(".dynamic.field").append(value)
-    }   
-
-    $('#add_run_para').click(function(){
-        var len = $(".dynamic.field .two.fields").length
-        Add_parameter(len)
-    });
+  
 
     $(".dynamic.field").on("click",".trash.icon", function() {
         var index = $(this).parent().parent().index()
@@ -232,16 +213,7 @@
                         $("input[name='boot_file']").val(parameters[i]);
                         break;
                     case (4):
-                        var para = parameters[i].split(" ")
-                        for(var j = 0; j < para.length; j++){
-                            var para_name = para[j].split('=')[0]
-                            var para_value = para[j].split('=')[1]
-                            var len = $(".dynamic.field .two.fields").length
-                            Add_parameter(len)
-                            var pid = 'para' + len
-                            $(".dynamic.field"+ " #" + pid + "").find("input[name=shipping_first-name]").val(para_name)
-                            $(".dynamic.field"+ " #" + pid + "").find("input[name=shipping_last-name]").val(para_value)
-                        }
+                       
                         break;
                     // 数据集pool_id待完成
                     // case (5):
@@ -389,28 +361,10 @@
             document.getElementById("mask").style.display = "none"
         }
     }
-    function send_run_para(){
-        var run_parameters = []
-        var msg = {}
-        $(".dynamic.field .two.fields").each(function(){
-            var para_name = $(this).find('input[name=shipping_first-name]').val()
-            var para_value = $(this).find('input[name=shipping_last-name]').val()
-            run_parameters.push({"label": para_name, "value": para_value})
-        })
-        msg["parameter"] = run_parameters
-        msg = JSON.stringify(msg)
-        $('#store_run_para').val(msg)
-    }
-    function get_name(){
-        let name1=$("#engine_name .text").text()
-        let name2=$("#flaver_name .text").text()
-        $("input#ai_engine_name").val(name1)
-        $("input#ai_flaver_name").val(name2)
-
-    }
+   
+    
     $('.ui.create_train_job.green.button').click(function(e) {
-        get_name()
-        send_run_para()
+       
         validate() 
     })
 </script>