Merge branch 'fix-1067' of git.openi.org.cn:OpenI/aiforge into fix-1067

templates/repo/debugjob/index.tmpl

@@ -202,15 +202,20 @@
         <div class="rect5"></div>
     </div>
 </div>
-<!-- 提示框 -->
-<div class="alert"></div>
+
 
 <div class="repository release dataset-list view">
     {{template "repo/header" .}}
-    {{template "base/alert" .}}
+    <!-- {{template "base/alert" .}} -->
+    <!-- 提示框 -->
+    
     <!-- 列表容器 -->
     <div class="ui container">
-        <div class="ui two column stackable grid ">
+        <div class="ui negative message" style="display: none;">
+            <i class="close icon"></i>
+            <p></p>
+        </div>
+        <div class="ui two column stackable grid">
                 <div class="column">
                     <div class="ui blue small menu compact selectcloudbrain">
                         <a class="active item" href="{{.RepoLink}}/debugjob?debugListType=all">{{$.i18n.Tr "repo.modelarts.notebook"}}</a>
@@ -316,15 +321,15 @@
                                         </a>
                                         {{end}} -->
                                         <!-- 调试 -->
-                                        <form id="debugAgainForm-{{.JobID}}" action="{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/restart" method="POST">
+                                        <form id="debugAgainForm-{{.JobID}}">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDebug}}
                                                 {{if eq .Status "RUNNING"}}
-                                                <a style="margin: 0 1rem;" id="model-debug-{{.JobID}}" class='ui basic blue button' onclick='debugAgain("{{.JobID}}","{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/debug")'>
+                                                <a style="margin: 0 1rem;" id="model-debug-{{.JobID}}" class='ui basic blue button' onclick='debugAgain("{{.JobID}}","{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/")'>
                                                     {{$.i18n.Tr "repo.debug"}}
                                                 </a>
                                                 {{else}}
-                                                <a id="model-debug-{{.JobID}}" class='ui basic {{if eq .Status "CREATING" "STOPPING"  "WAITING" "STARTING"}} disabled {{else}}blue {{end}}button' onclick='debugAgain("{{.JobID}}","{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/debug")'>
+                                                <a id="model-debug-{{.JobID}}" class='ui basic {{if eq .Status "CREATING" "STOPPING"  "WAITING" "STARTING"}} disabled {{else}}blue {{end}}button' onclick='debugAgain("{{.JobID}}","{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/")'>
                                                     {{$.i18n.Tr "repo.debug_again"}}
                                                 </a>
                                                 {{end}}
@@ -337,7 +342,7 @@
                                         </form>
                                         
                                         <!-- 停止 -->
-                                        <form id="stopForm-{{.JobID}}" action="{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/stop" style="margin-left:-1px;">
+                                        <form id="stopForm-{{.JobID}}"  style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
                                                 {{if eq .ComputeResource "CPU/GPU" }}
@@ -512,11 +517,28 @@
         }
     }
     function debugAgain(JobID,debugUrl){
-        console.log()
         if($('#' + JobID+ '-text').text()==="RUNNING"){
-            window.open(debugUrl)
+            window.open(debugUrl+'debug')
         }else{
-            document.getElementById(`debugAgainForm-${JobID}`).submit();
+            $.ajax({
+                type:"POST",
+                url:debugUrl+'restart',
+                data:$('#debugAgainForm-'+JobID).serialize(),
+                success:function(res){
+                    if(res.result_code==0){
+                        $('#' + JobID+'-icon').removeClass().addClass(res.status)
+                        $('#' + JobID+ '-text').text(res.status)
+                    }else{
+                        $(".ui.negative.message").css("display","block")
+                        $(".ui.negative.message p").text(res.error_msg)
+                        setTimeout("$('.message .close').click()",3000)
+                    }
+                },
+                error :function(res){
+                    console.log(res)
+
+                }
+            })
         }
         
     }
@@ -526,7 +548,12 @@
             url:stopUrl,
             data:$('#stopForm-'+JobID).serialize(),
             success:function(res){
-                console.log(res)
+                if(res.result_code==0){
+                    $('#' + jobID+'-icon').removeClass().addClass(res.status)
+                    $('#' + jobID+ '-text').text(res.status)
+                }else{
+                    $("ui.negative.message").text(res.error_msg)
+                }
             },
             error :function(res){
                 console.log(res)
@@ -612,6 +639,13 @@
                 location.href = `${url}/debugjob?debugListType=${value}`
             }
         })
+        $('.message .close')
+        .on('click', function() {
+            console.log(this)
+            $(this)
+            .closest('.message')
+            .transition('fade')
+        })
     })