From f057ec560432c99f477696a9bbf068c8670f2bd2 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 19 Nov 2021 17:39:28 +0800 Subject: [PATCH] fix issue --- templates/repo/modelarts/trainjob/new.tmpl | 6 +- templates/repo/modelarts/trainjob/show.tmpl | 151 +++++++++----------- 2 files changed, 68 insertions(+), 89 deletions(-) diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 13cd73b59..c91d67649 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -103,7 +103,9 @@ -webkit-animation-delay: -0.8s; animation-delay: -0.8s; } - + .left2{ + margin-left: -2px; + } @-webkit-keyframes sk-stretchdelay { 0%, 40%, @@ -172,7 +174,7 @@
- {{range $k, $v :=.Branches}} {{end}} diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index b9dea7ab9..0249e4f29 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -202,9 +202,10 @@ td, th {
+ 配置信息 日志文件 - 模型下载 + 模型下载
@@ -383,7 +384,7 @@ td, th {
- -
- +
+ 

@@ -407,11 +408,14 @@ td, th {
                         
                     

                     

-                        "
             html += "
"
             html += "
"
-            $("#dir_list").append(html)
+            $(`#dir_list${version_name}`).append(html)
     }
-    $(".log").scroll(function () {
-        var scrollTop = $(this)[0].scrollTop;   // 滚动距离
-        var scrollHeight = $(this)[0].scrollHeight;  // 文档高度
-        var divHeight = $(this).height();   // 可视区高度
-        let version_name=$(this).find('input[name=version_name]').val()
+    // $(`.log{}`).scroll()
+    function logScroll(version_name) {
+        var scrollTop = $(`#log${version_name}`)[0].scrollTop;   // 滚动距离
+        var scrollHeight = $(`#log${version_name}`)[0].scrollHeight;  // 文档高度
+        var divHeight = $(`#log${version_name}`).height();   // 可视区高度
+        // let version_name=$(this).find('input[name=version_name]').val()
+        console.log("scrollTo,scrollHeight,divHeight",scrollTop,scrollHeight,divHeight)
         if(parseInt(scrollTop) + divHeight + 18 == scrollHeight){
-            var end_line = $('input[name=end_line]').val()
+            var 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}&order=desc`, (data) => {
                 if (data.Lines == 0){
-                    $('#header').text('您已翻阅至日志底部')
-                    $('.message').css('display', 'block')
+                    $(`.message${version_name} #header`).text('您已翻阅至日志底部')
+                    $(`.message${version_name}`).css('display', 'block')
                     setTimeout(function(){
-                        $('.message').css('display', 'none')     
+                        $(`.message${version_name}`).css('display', 'none')     
                     }, 1000)
                 }else{
-                    $('input[name=end_line]').val(data.EndLine)
-                    $('.log').append('
' + data.Content) 
+                    $(`#log${version_name} input[name=end_line]`).val(data.EndLine)
+                    $(`#log${version_name}`).append('
' + data.Content) 
                 }
             }).fail(function(err) {
                 console.log(err);
             });
         }
         if(scrollTop == 0){
-            var start_line = $('input[name=start_line]').val()
+            var 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}&order=asc`, (data) => {
                 if (data.Lines == 0){
-                    $('#header').text('您已翻阅至日志顶部')
-                    $('.message').css('display', 'block')
+                    $(`.message${version_name} #header`).text('您已翻阅至日志顶部')
+                    $(`.message${version_name}`).css('display', 'block')
                     setTimeout(function(){
-                        $('.message').css('display', 'none')     
+                        $(`.message${version_name}`).css('display', 'none')     
                     }, 1000)
                 }else{
-                    $('input[name=start_line]').val(data.StartLine)   //如果变动就改变所对应的值
-                    $(".log").prepend('
' + data.Content)
+                    $(`#log${version_name} input[name=start_line]`).val(data.StartLine)   //如果变动就改变所对应的值
+                    $(`#log${version_name}`).prepend('
' + data.Content)
                 }
             }).fail(function(err) {
                 console.log(err);
             });
         }
-    })
+    }
 
\ No newline at end of file