Merge pull request 'fix-1913 日志优化和显示代码分支' (#2016) from fix-1913 into V20220428

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2016
Reviewed-by: liuzx <liuzx@pcl.ac.cn>
Reviewed-by: lewis <747342561@qq.com>

routers/repo/cloudbrain.go

@@ -599,6 +599,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 	ctx.Data["dataset_path"] = cloudbrain.DataSetMountPath
 	ctx.Data["model_path"] = cloudbrain.ModelMountPath
 	ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task)
+	ctx.Data["branchName"] = task.BranchName
 	ctx.HTML(200, tpName)
 }
 

templates/repo/modelarts/trainjob/show.tmpl

@@ -838,13 +838,12 @@ td, th {
     }
 
     function logScroll(version_name) {
-
         let container = document.querySelector(`#log${version_name}`)
         let scrollTop = container.scrollTop
         let scrollHeight = container.scrollHeight
         let clientHeight = container.clientHeight
         let scrollLeft = container.scrollLeft
-        if(((parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight)) && parseInt(scrollTop)!==0){
+        if(((parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight)) && parseInt(scrollTop)!==0 && 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) => {
                 if (data.Lines == 0){
@@ -867,8 +866,7 @@ td, th {
                 console.log(err);
             });
         }
-
-        if([1,2,3,4,5].includes(scrollTop) && scrollLeft==0){
+        if([0,1,2,3,4,5,6,7,8,9,10].includes(scrollTop) && 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) => {