From b9f32e1ca766b5d532b3897127bac83ce66fecf8 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 19 Jan 2022 15:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/benchmark/index.tmpl | 18 +- templates/repo/cloudbrain/benchmark/show.tmpl | 233 +------------------------ 2 files changed, 5 insertions(+), 246 deletions(-) diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl index 51023106f..66982fb7f 100644 --- a/templates/repo/cloudbrain/benchmark/index.tmpl +++ b/templates/repo/cloudbrain/benchmark/index.tmpl @@ -391,23 +391,7 @@ } - function refreshStatus(version_name,jobID){ - - const url = '/api/v1/repos/{{$.RepoRelPath}}/modelarts/train-job/'+jobID+'?version_name='+version_name - $.get(url,(data)=>{ - - - $(`#${jobID}-icon`).attr("class",data.JobStatus) - // detail status and duration - - $(`#${jobID}-text`).text(data.JobStatus) - - - }).fail(function(err) { - console.log(err); - }); - - } + // 显示弹窗，弹出相应的信息 function showmask() { $('#imageModal').css('display', 'none') diff --git a/templates/repo/cloudbrain/benchmark/show.tmpl b/templates/repo/cloudbrain/benchmark/show.tmpl index 846a39fdb..0cfd50ce5 100755 --- a/templates/repo/cloudbrain/benchmark/show.tmpl +++ b/templates/repo/cloudbrain/benchmark/show.tmpl @@ -194,23 +194,7 @@ td, th { -
- {{$.CsrfTokenHtml}} - {{if .CanDel}} - {{$.i18n.Tr "repo.stop"}} - {{else}} - {{$.i18n.Tr "repo.stop"}} - {{end}} - - {{$.CsrfTokenHtml}} - {{if .CanDel}} - {{$.i18n.Tr "repo.delete"}} - {{else}} - {{$.i18n.Tr "repo.delete"}} - {{end}} -
- {{TimeSinceUnix1 .CreatedUnix}} {{$.i18n.Tr "repo.modelarts.status"}}： @@ -218,8 +202,7 @@ td, th { {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： {{.TrainJobDuration}} - - +
@@ -436,119 +419,8 @@ td, th { repoPath = urlArr.slice(-4)[0] jobID = urlArr.slice(-1)[0] }) - function stopBubbling(e) { - e = window.event || e; - if (e.stopPropagation) { - e.stopPropagation(); //阻止事件 冒泡传播 - } else { - e.cancelBubble = true; //ie兼容 - } - } - let timeid = window.setInterval(loadJobStatus, 30000); - $(document).ready(loadJobStatus); - - function renderSize(value){ - if(null==value||value==''){ - return "0 Bytes"; - } - var unitArr = new Array("Bytes","KB","MB","GB","TB","PB","EB","ZB","YB"); - var index=0; - var srcsize = parseFloat(value); - index=Math.floor(Math.log(srcsize)/Math.log(1024)); - var size =srcsize/Math.pow(1024,index); - size=size.toFixed(2);//保留的小数位数 - return size+unitArr[index]; - } - function loadJobStatus() { - $(".ui.accordion.border-according").each((index, job) => { - const jobID = job.dataset.jobid; - const repoPath = job.dataset.repopath; - const versionname = job.dataset.version - // ['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED'] - // if (job.textContent.trim() == 'IMAGE_FAILED' || job.textContent.trim() == 'SUBMIT_FAILED' || job.textContent.trim() == 'DELETE_FAILED' - // || job.textContent.trim() == 'KILLED' || job.textContent.trim() == 'COMPLETED' || job.textContent.trim() == 'FAILED' - // || job.textContent.trim() == 'CANCELED' || job.textContent.trim() == 'LOST') { - // return - // } - let status = $(`#${versionname}-status-span`).text() - - if(['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED'].includes(status)){ - return - } - let stopArray=["KILLED","FAILED","START_FAILED","KILLING","COMPLETED"] - $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => { - $(`#${versionname}-duration-span`).text(data.JobDuration) - $(`#${versionname}-status-span span`).text(data.JobStatus) - $(`#${versionname}-status-span i`).attr("class",data.JobStatus) - // detail status and duration - $('#'+versionname+'-duration').text(data.JobDuration) - $('#'+versionname+'-status').text(data.JobStatus) - if(stopArray.includes(data.JobStatus)){ - $('#'+versionname+'-stop').addClass('disabled') - } - }).fail(function(err) { - console.log(err); - }); - }); - }; - - function refreshStatus(version_name){ - $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}?version_name=${version_name}`,(data)=>{ - // header status and duration - $(`#${version_name}-duration-span`).text(data.JobDuration) - $(`#${version_name}-status-span span`).text(data.JobStatus) - $(`#${version_name}-status-span i`).attr("class",data.JobStatus) - // detail status and duration - $('#'+version_name+'-duration').text(data.JobDuration) - $('#'+version_name+'-status').text(data.JobStatus) - loadLog(version_name) - }).fail(function(err) { - console.log(err); - }); - stopBubbling(arguments.callee.caller.arguments[0]) - } - function deleteVersion(version_name){ - stopBubbling(arguments.callee.caller.arguments[0]) - let flag = 1; - $('.ui.basic.modal').modal({ - onDeny: function() { - flag = false - }, - onApprove: function() { - $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/del_version`,{version_name:version_name},(data)=>{ - if(data.VersionListCount===0){ - location.href=`/${userName}/${repoPath}/modelarts/train-job` - }else{ - $('#accordion'+version_name).remove() - } - - }).fail(function(err) { - console.log(err); - }); - flag = true - }, - onHidden: function() { - if (flag == false) { - $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut(); - } - } - }) - .modal('show') - - } - function stopVersion(version_name){ - stopBubbling(arguments.callee.caller.arguments[0]) - $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/stop_version`,{version_name:version_name},(data)=>{ - if(data.StatusOK===0){ - $('#'+version_name+'-stop').addClass('disabled') - refreshStatus(version_name) - } - }).fail(function(err) { - console.log(err); - }); - } function loadLog(version_name){ $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobID}/log?version_name=${version_name}&lines=50&order=asc`, (data) => { $('input[name=end_line]').val(data.EndLine) @@ -558,104 +430,7 @@ td, th { console.log(err); }); } - function loadModelFile(version_name,parents,filename,init){ - parents = parents || '' - filename = filename || '' - init = init || '' - $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_list?version_name=${version_name}&parentDir=${parents}`, (data) => { - $(`#dir_list${version_name}`).empty() - renderDir(data,version_name) - if(init==="init"){ - $(`input[name=model${version_name}]`).val("") - $(`input[name=modelback${version_name}]`).val(version_name) - $(`#file_breadcrumb${version_name}`).empty() - let htmlBread = "" - htmlBread += `
${version_name}
` - htmlBread += "
/
" - $(`#file_breadcrumb${version_name}`).append(htmlBread) - }else{ - renderBrend(version_name,parents,filename,init) - } - }).fail(function(err) { - console.log(err,version_name); - }); - - } - function renderBrend(version_name,parents,filename,init){ - if(init=="folder"){ - let htmlBrend = "" - let sectionName=$(`#file_breadcrumb${version_name} .active.section`).text() - let parents1 = $(`input[name=model${version_name}]`).val() - let filename1 = $(`input[name=modelback${version_name}]`).val() - if(parents1===""){ - $(`#file_breadcrumb${version_name} .active.section`).replaceWith(`${sectionName}`) - }else{ - $(`#file_breadcrumb${version_name} .active.section`).replaceWith(`${sectionName}`) - } - - htmlBrend += `
${filename}
` - htmlBrend += "
/
" - $(`#file_breadcrumb${version_name}`).append(htmlBrend) - $(`input[name=model${version_name}]`).val(parents) - $(`input[name=modelback${version_name}]`).val(filename) - }else{ - $(`input[name=model${version_name}]`).val(parents) - $(`input[name=modelback${version_name}]`).val(filename) - $(`#file_breadcrumb${version_name} a.section:contains(${filename})`).nextAll().remove() - $(`#file_breadcrumb${version_name} a.section:contains(${filename})`).replaceWith(`
${filename}
`) - $(`#file_breadcrumb${version_name} div.section:contains(${filename})`).append("
/
") - } - - } - function renderDir(data,version_name){ - let html="" - html += "
" - html += "
" - html += "
" - html += "
" - html += "" - html += '' - // html += "" - for(let i=0;i` - html += "" + data.Dirs[i].FileName + "" - }else{ - html += `` - html += "" + data.Dirs[i].FileName + "" - } - html += '' - html += "" - html += "" - html += "" - - html += "" - html += "" - - } - html += "" - html += "
" - if(data.Dirs[i].IsDir){ - html += "" - }else{ - html += ""+ `${dirs_size}` + "" - } - - html += "" - html += "" + data.Dirs[i].ModTime + "" - html += "
" - html += "
" - html += "
" - html += "
" - html += "
" - $(`#dir_list${version_name}`).append(html) - } + function logScroll(version_name) { @@ -666,7 +441,7 @@ td, th { let scrollLeft = container.scrollLeft if((parseInt(scrollTop) + clientHeight == scrollHeight || parseInt(scrollTop) + clientHeight +1 == scrollHeight || parseInt(scrollTop) + clientHeight - 1 == scrollHeight) && (scrollLeft===0)){ let end_line = $(`#log${version_name} input[name=end_line]`).val() - $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => { + $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => { if (data.Lines == 0){ $(`.message${version_name} #header`).text('您已翻阅至日志底部') $(`.message${version_name}`).css('display', 'block') @@ -689,7 +464,7 @@ td, th { } if(scrollTop == 0 && scrollLeft==0){ let start_line = $(`#log${version_name} input[name=start_line]`).val() - $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${start_line}&lines=50&order=asc`, (data) => { + $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobID}/log?version_name=${version_name}&base_line=${start_line}&lines=50&order=asc`, (data) => { if (data.Lines == 0){ $(`.message${version_name} #header`).text('您已翻阅至日志顶部') $(`.message${version_name}`).css('display', 'block')