diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl index 09407a855..4834d7a97 100755 --- a/templates/repo/modelarts/trainjob/index.tmpl +++ b/templates/repo/modelarts/trainjob/index.tmpl @@ -214,7 +214,7 @@ const jobID = data.JobID const status = data.JobStatus $('#' + jobID).text(status) - // console.log(data) + // console.log(data) }).fail(function(err) { console.log(err); }); diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 497f26290..fa4e739e0 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -113,22 +113,24 @@
-
+
{{.log_file_name}} - {{.log.StartLine}} - {{.log.EndLine}} - - + +
{{.log.Content}}
-
+ +
@@ -143,23 +145,56 @@ $('.menu .item').tab() $('.ui.style.accordion').accordion(); + var userName + var repoPath + var jobID + $(document).ready(function(){ + var url = window.location.href; + var urlArr = url.split('/') + userName = urlArr.slice(-5)[0] + repoPath = urlArr.slice(-4)[0] + jobID = urlArr.slice(-1)[0] + }) + $(".log").scroll(function () { - var scrollTop = $(this)[0].scrollTop; // 滚动条Y轴的滚动距离 + var scrollTop = $(this)[0].scrollTop; // 滚动距离 var scrollHeight = $(this)[0].scrollHeight; // 文档高度 var divHeight = $(this).height(); // 可视区高度 + var file_name = $('input[name=file_name]').val() - var start_line = $('.fitted.start_line').text() - var end_line = $('.fitted.end_line').text() - - if(scrollTop + divHeight + 50 >= scrollHeight){ - $('input[name=base_line]').val(end_line) - $('input[name=order]').val("asc") - $('.ui.form').submit() + if(parseInt(scrollTop) + divHeight + 29 == scrollHeight){ + var end_line = $('input[name=end_line]').val() + $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?file_name=${file_name}&base_line=${end_line}&order=asc`, (data) => { + if (data.lines == 0){ + $('.header').text('您已翻阅至日志底部') + $('.message').css('display', 'block') + setTimeout(function(){ + $('.message').css('display', 'none') + }, 1000) + }else{ + $('input[name=end_line]').val(data.EndLine) + $('.log').append('
' + data.Content  + '
') + } + }).fail(function(err) { + console.log(err); + }); } if(scrollTop == 0){ - $('input[name=base_line]').val(start_line) - $('input[name=order]').val("desc") - $('.ui.form').submit() + var start_line = $('input[name=start_line]').val() + $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?file_name=${file_name}&base_line=${start_line}&order=desc`, (data) => { + if (data.lines == 0){ + $('.header').text('您已翻阅至日志底部') + $('.message').css('display', 'block') + setTimeout(function(){ + $('.message').css('display', 'none') + }, 1000) + }else{ + $('input[name=start_line]').val(data.StartLine) //如果变动就改变所对应的值 + $(".log").prepend('
' + data.Content + '/pre')
+                }
+            }).fail(function(err) {
+                console.log(err);
+            });
         }
     })
 
\ No newline at end of file