@@ -300,7 +309,7 @@ td, th {
- 代码分支
+ {{$.i18n.Tr "repo.modelarts.code_version"}}
|
@@ -397,11 +406,15 @@ td, th {
-
+
@@ -464,9 +477,12 @@ td, th {
}
// var timeid = window.setInterval(refreshStatus(version_name), 30000);
// document.ready(refreshStatus(version_name))
+ var timeid = window.setInterval(loadJobStatus, 10000);
+ $(document).ready(loadJobStatus);
function loadJobStatus() {
$(".ui.accordion.border-according").each((index, job) => {
+
const jobID = job.dataset.jobid;
const repoPath = job.dataset.repopath;
const versionname = job.dataset.version
@@ -477,9 +493,15 @@ td, th {
}
$.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => {
- const jobID = data.JobID
- const status = data.JobStatus
- const duration = data.JobDuration
+ // const jobID = data.JobID
+ // const status = data.JobStatus
+ // const duration = data.JobDuration
+ $(`#${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)
// $('#duration-'+jobID).text(duration)
// if (status != job.textContent.trim()) {
// $('#' + jobID+'-icon').removeClass().addClass(status)
@@ -553,13 +575,127 @@ td, th {
console.log(err);
});
}
- // function loadModelFile(version_name){
- // $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_list?version_name=${version_name}&lines=20&order=asc`, (data) => {
- // console.log(data)
- // }).fail(function(err) {
- // console.log(err);
- // });
- // }
+ function loadModelFile(version_name,parents,filename){
+ console.log("")
+ parents = parents || ''
+ filename = filename || ''
+ $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_list?version_name=${version_name}&parentDir=${parents}`, (data) => {
+ console.log("=====parents======",data,version_name,parents)
+ if(!filename){
+ console.log("bread")
+ $("#dir_list").empty()
+ renderDir(data,version_name)
+ renderBrend(version_name,parents,filename,false)
+ }else{
+ $("#dir_list").empty()
+ renderDir(data,version_name)
+ renderBrend(version_name,parents,filename,true)
+ }
+
+
+ }).fail(function(err) {
+ console.log(err,version_name);
+ });
+ // if(!parents){
+ // $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_list?version_name=${version_name}`, (data) => {
+ // console.log("===========",data,version_name)
+ // $("#dir_list").empty()
+ // renderDir(data,version_name)
+
+ // }).fail(function(err) {
+ // console.log(err);
+ // });
+ // }else{
+ // console.log("-----else-----",version_name)
+
+ // }
+
+ }
+ let parentsArr=[]
+ function renderBrend(version_name,parents,filename,flag){
+ if(flag){
+ parentsArr.push(parents)
+ console.log("parents parentsARR",parents,parentsArr)
+
+ let htmlBrend = ""
+ if($('#file_breadcrumb .active').length>0){
+ let parents1 = parentsArr.shift()
+ let sectionName=$('#file_breadcrumb .active.section').html()
+ $('#file_breadcrumb .active.section').replaceWith(`${sectionName}`)
+ htmlBrend += ` ${filename} `
+
+
+ }else{
+
+ htmlBrend += `${version_name} `
+
+ }
+ console.log("parentsARR",parentsArr)
+
+ htmlBrend += " / "
+ $('#file_breadcrumb').append(htmlBrend)
+
+ }else{
+ if(!parents){
+ $('#file_breadcrumb').empty()
+ let htmlBread = ""
+ htmlBread += `${version_name} `
+ htmlBread += " / "
+ $('#file_breadcrumb').append(htmlBread)
+ }else{
+
+ $(`a.section:contains(${parents})`).nextAll().remove()
+ $(`a.section:contains(${parents})`).replaceWith(`${parents} `)
+ $(`a.section:contains(${parents})`).append(" / ")
+
+ }
+
+ }
+
+ }
+ function renderDir(data,version_name){
+ let html=""
+ html += ""
+ html += " "
+ html += " "
+ html += " "
+ html += " "
+ html += " "
+ html += " "
+ html += " "
+ html += " "
+ $("#dir_list").append(html)
+ }
$(".log").scroll(function () {
var scrollTop = $(this)[0].scrollTop; // 滚动距离
var scrollHeight = $(this)[0].scrollHeight; // 文档高度
diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl
index dbb0be893..2a335857e 100644
--- a/templates/repo/modelarts/trainjob/version_new.tmpl
+++ b/templates/repo/modelarts/trainjob/version_new.tmpl
@@ -165,6 +165,11 @@
+
+
+
+
+
@@ -336,6 +341,7 @@
let url_href = {{.RepoLink}}+'/modelarts/train-job'
let url_post = location.pathname
let version_name = location.search.split('?version_name=')[1]
+ $("#parents_version").val(version_name)
$(".ui.button").attr('href',url_href)
$(".ui.form").attr('action',url_post)
$("input[name=version_name]").attr('value',version_name)
|