diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 7b37f40e8..1473c537c 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -83,6 +83,7 @@ .ti-text-form-label { padding-bottom: 20px; + padding-right: 20px; color: #8a8e99; font-size: 12px; white-space: nowrap; @@ -105,6 +106,36 @@ td, th { text-overflow: ellipsis; white-space: nowrap; } +.redo-color{ + color: #3291F8; +} +.ti-action-menu-item:not(:last-child){ + margin-right: 10px; + padding-right: 11px; + text-decoration: none!important; + color: #526ecc; + cursor: pointer; + display: inline-block; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + -khtml-user-select: none; + user-select: none; + position: relative; +} +.ti-action-menu-item:not(:last-child):after { + content: ""; + display: inline-block; + position: absolute; + height: 12px; + right: 0; + top: 50%; + -webkit-transform: translateY(-6px); + -ms-transform: translateY(-6px); + -o-transform: translateY(-6px); + transform: translateY(-6px); + border-right: 1px solid #dfe1e6; +}
@@ -113,7 +144,7 @@ td, th {

返回

- {{range .version_list_task}} + {{range $k ,$v := .version_list_task}}
@@ -122,21 +153,22 @@ td, th {
- - 修改 - - + 创建模型 + 修改 + 停止 + 删除
+ 2021/11/08 19:35:19 当前版本：{{.VersionName}} 父版本：{{.FatherVersionName}} - 状态 - 运行成功 + 状态： + {{.Status}} 运行时间： - 01:09:50 - + {{.TrainJobDuration}} +
@@ -147,11 +179,11 @@ td, th {
- 配置信息 - 日志文件 - 模型下载 + 配置信息 + 日志文件 + 模型下载
-
+
@@ -170,26 +202,37 @@ td, th { - - 状态 - - - -
- {{.Status}} -
- + + 状态 + + + +
+ {{.Status}} +
+ - - 运行版本 - - - -
- aaa -
- + + 运行版本 + + + +
+ {{.VersionName}} +
+ + + + + 开始时间 + + + +
+ 空白 +
+ @@ -198,79 +241,112 @@ td, th {
- aaa + {{.TrainJobDuration}} +
+ + + + + 规格 + + + +
+ {{.FlavorName}}
+ + 计算节点 + + + +
+ {{.WorkServerNumber}} +
+ + + + +
+
+ + + - + - - + + - + - - + + - - -
- 资源池 + AI引擎
- aaa + {{.EngineName}}
- 规格 + 代码分支
- aaa + {{.BranchName}}
- 计算节点 + 启动文件
- 1 + {{.BootFile}}
-
-
- - + - + - - - + + + - + + + + + + @@ -282,28 +358,32 @@ td, th { -
+
- + +
- 

+                                
+                                
+                                
+                                

                             

                                         
                         

                         
                     

-                    

+                    

                         

                             asdasd
                         

@@ -340,7 +420,6 @@ td, th {
         repoPath = urlArr.slice(-4)[0]
         jobID = urlArr.slice(-1)[0]
     })
-
     function stopBubbling(e) {
         e = window.event || e;
         if (e.stopPropagation) {
@@ -350,22 +429,29 @@ td, th {
         }
     }
     function refreshStatus(version_name){
-        console.log("----click get request------",version_name)
-        $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${version_name}`)
+        $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}?version_name=${version_name}`)
         stopBubbling(arguments.callee.caller.arguments[0])
     }
+    function loadLog(version_name){
+        $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&lines=20&order=asc`, (data) => {
+            $('input[name=end_line]').val(data.EndLine)
+            $('input[name=start_line]').val(data.StartLine)
+            $(`#log_file${version_name}`).text(data.Content)
+        }).fail(function(err) {
+            console.log(err);
+        });
+    }
     
     $(".log").scroll(function () {
         var scrollTop = $(this)[0].scrollTop;   // 滚动距离
         var scrollHeight = $(this)[0].scrollHeight;  // 文档高度
         var divHeight = $(this).height();   // 可视区高度
-        var file_name = $('input[name=file_name]').val()
-
-        if(parseInt(scrollTop) + divHeight + 29 == scrollHeight){
+        let version_name=$(this).find('input[name=version_name]').val()
+        if(parseInt(scrollTop) + divHeight + 18 == 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=desc`, (data) => {
-                if (data.lines == 0){
-                    $('.header').text('您已翻阅至日志底部')
+            $.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')
                     setTimeout(function(){
                         $('.message').css('display', 'none')     
@@ -380,9 +466,9 @@ td, th {
         }
         if(scrollTop == 0){
             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=asc`, (data) => {
-                if (data.lines == 0){
-                    $('.header').text('您已翻阅至日志顶部')
+            $.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')
                     setTimeout(function(){
                         $('.message').css('display', 'none')     


                                                     

                                                         
-                                                            作业名称
+                                                            训练数据集
                                                         
                                                             

-                                                                    trainjob-d672 | job15b681bc 
+                                                                {{.DatasetName}}
                                                             

                                                         		
                                                     

                                                     

-                                                                作业名称
-                                                            
-                                                                

-                                                                        trainjob-d672 | job15b681bc 
-                                                                

-                                                            		
+                                                            运行参数
+                                                        
+                                                            

+                                                                {{.Parameters}}
+                                                            

+                                                        		
                                                     

                                                     

                                                         
-                                                                    作业名称
+                                                            训练输出位置
                                                         
+                                                            

+                                                                {{.TrainUrl}}
+                                                            

+                                                        

+                                                            描述
+                                                        
                                                             

-                                                                            trainjob-d672 | job15b681bc 
+