update

templates/repo/modelarts/trainjob/index.tmpl

@@ -494,6 +494,7 @@
             const repoPath = job.dataset.repopath;
             const versionname = job.dataset.version
             $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => {
+                    console.log(data)
                     const duration = data.JobDuration
                     const jobID = data.JobID
                     $('#duration-'+jobID).text(duration)

templates/repo/modelarts/trainjob/show.tmpl

@@ -6,7 +6,7 @@
     color: #252b3a;
     background-color: #f2f5fc;
     line-height: 1.5;
-    cursor: default;
+    cursor: pointer;
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
@@ -139,13 +139,6 @@ td, th {
 .text-width80{
     width: 100px;
     line-height: 30px;
-    
-}
-.disabled {
-        cursor: not-allowed;
-        pointer-events: none;
-        color: #BBBBBB !important;
-
 }
 </style>
 <div class="repository">
@@ -155,17 +148,17 @@ td, th {
             <a href="javascript:window.history.back();"><i class="arrow left icon"></i>返回</a>
         </h4>
         {{range $k ,$v := .version_list_task}}
-        <div class="ui accordion" id="accordion{{.VersionName}}">
+        <div class="ui accordion">
             <div class="title padding0">
                 <div class="according-panel-heading">
                     <div class="accordion-panel-title">
-                        <i class="dropdown icon" style="cursor: pointer;"></i>
+                        <i class="dropdown icon"></i>
                         <span class="accordion-panel-title-content">
                             <span>
                                 <div style="float: right;">
-                                    <a class="ti-action-menu-item {{if ne .Status "COMPLETED"}}disabled {{end}}">创建模型</a>
+                                    <a class="ti-action-menu-item">创建模型</a>
                                     <a class="ti-action-menu-item" href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/create_version?version_name={{.VersionName}}">修改</a>
-                                    <a class="ti-action-menu-item {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{end}}" id="{{.VersionName}}-stop" onclick="stopVersion({{.VersionName}})">停止</a>
+                                    <a class="ti-action-menu-item" onclick="stopVersion({{.VersionName}})">停止</a>
                                     <a class="ti-action-menu-item" onclick="deleteVersion({{.VersionName}})" style="color: #FF4D4F;">删除</a>
                                 </div>
                                 <div class="ac-display-inblock title_text acc-margin-bottom">
@@ -178,7 +171,7 @@ td, th {
                                     </span>
                                     <span class="ac-text-normal title_text">运行时间：</span>
                                     <span class="cti-mgRight-sm uc-accordionTitle-black" id="{{.VersionName}}-duration-span">{{.TrainJobDuration}}</span>
-                                    <span style="cursor: pointer;" data-tooltip="刷新" data-inverted="" onclick="refreshStatus({{.VersionName}})"><i class="redo icon redo-color"></i></span>
+                                    <span data-tooltip="刷新" data-inverted="" onclick="refreshStatus({{.VersionName}})"><i class="redo icon redo-color"></i></span>
 
                                 </div>
                             </span>
@@ -404,26 +397,6 @@ td, th {
         </div>
         {{end}}
     </div>
-<!-- 确认模态框 -->
-    <div id="deletemodel">
-        <div class="ui basic modal">
-            <div class="ui icon header">
-                <i class="trash icon"></i> 删除任务
-            </div>
-    
-            <div class="content">
-                <p>你确认删除该任务么？此任务一旦删除不可恢复。</p>
-            </div>
-            <div class="actions">
-                <div class="ui red basic inverted cancel button">
-                    <i class="remove icon"></i> 取消操作
-                </div>
-                <div class="ui green basic inverted ok button">
-                    <i class="checkmark icon"></i> 确定操作
-                </div>
-            </div>
-        </div>
-    </div>
 </div>
 {{template "base/footer" .}}
 
@@ -433,9 +406,9 @@ td, th {
     $('.menu .item').tab()
     // $('.ui.style.accordion').accordion();
 
-    $(document).ready(function(){
-    $('.ui.accordion').accordion({selector:{trigger:'.icon'}});
-    });
+    // $(document).ready(function(){
+    // $('.ui.accordion').accordion({selector:{trigger:'.icon'}});
+    // });
     $(document).ready(function(){
         $('.secondary.menu .item').tab();
     });
@@ -477,41 +450,16 @@ td, th {
         stopBubbling(arguments.callee.caller.arguments[0])
     }
     function deleteVersion(version_name){
-        let flag = 1;
-        $('.ui.basic.modal')
-            .modal({
-                onDeny: function() {
-                    flag = false
-                },
-                onApprove: function() {
-                    $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/del_version`,{version_name:version_name},(data)=>{
-                        $('#accordion'+version_name).remove()
-                    }).fail(function(err) {
-                        console.log(err);
-                    });
-                    flag = true
-                },
-                onHidden: function() {
-                    if (flag == false) {
-                        $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
-                    }
-                }
-            })
-        .modal('show')
-        
+        $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/del_version`,{version_name:version_name}).fail(function(err) {
+            console.log(err);
+        });
         stopBubbling(arguments.callee.caller.arguments[0])
     }
     function stopVersion(version_name){
-        stopBubbling(arguments.callee.caller.arguments[0])
-        $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/stop_version`,{version_name:version_name},(data)=>{
-            if(data.StatusOK===0){
-                $('#'+version_name+'-stop').addClass('disabled')
-                refreshStatus(version_name)
-            }
-        }).fail(function(err) {
+        $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/stop_version`,{version_name:version_name}).fail(function(err) {
             console.log(err);
         });
-        
+        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) => {

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -333,7 +333,6 @@
 {{template "base/footer" .}}
 
 <script>
-    console.log({{.JobID}})
     let url_href = {{.RepoLink}}+'/modelarts/train-job'
     let url_post = location.pathname
     let version_name = location.search.split('?version_name=')[1]