fix issue

options/locale/locale_en-US.ini

@@ -2342,6 +2342,12 @@ datasets.owner=Owner
 datasets.name=name
 datasets.private=Private
 
+cloudbrain.all_task_types=All Task Types
+cloudbrain.all_computing_resources=All Computing Resources
+cloudbrain.all_status=All Status
+cloudbrain.download_report=Download Report
+cloudbrain.cloudbrain_name=Cloudbrain Name
+
 hooks.desc = Webhooks automatically make HTTP POST requests to a server when certain openi events trigger. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the <a target="_blank" rel="noopener" href="https://docs.openi.io/en-us/webhooks/">webhooks guide</a>.
 hooks.add_webhook = Add Default Webhook
 hooks.update_webhook = Update Default Webhook

options/locale/locale_zh-CN.ini

@@ -2352,6 +2352,12 @@ datasets.owner=所有者
 datasets.name=名称
 datasets.private=私有
 
+cloudbrain.all_task_types=全部任务类型
+cloudbrain.all_computing_resources=全部计算资源
+cloudbrain.all_status=全部状态
+cloudbrain.download_report=下载此报告
+cloudbrain.cloudbrain_name=云脑侧名称
+
 hooks.desc=当某些 openi 事件触发时, Web 钩子会自动向服务器发出 HTTP POST 请求。此处定义的 Web 钩子是默认值, 将复制到所有新建项目中。参阅 <a target="_blank" rel="noopener" href="https://docs.openi.io/en-us/webhooks/">Web钩子指南</a> 获取更多内容。
 hooks.add_webhook=新增默认Web钩子
 hooks.update_webhook=更新默认Web钩子
@@ -2418,7 +2424,7 @@ auths.sspi_auto_activate_users_helper=允许 SSPI 认证自动激活新用户
 auths.sspi_strip_domain_names=从用户名中删除域名部分
 auths.sspi_strip_domain_names_helper=如果选中此项，域名将从登录名中删除(例如，"DOMAIN\user"和"user@example.org"，两者都将变成只是“用户”)。
 auths.sspi_separator_replacement=要使用的分隔符代替\, / 和 @
-auths.sspi_separator_replacement_helper=用于替换下级登录名称分隔符的字符 (例如) "DOMAIN\user") 中的 \ 和用户主名字(如"user@example.org中的 @ )。
+auths.sspi_separator_replacement_helper=用于替换下级登录名称分隔符的字符 (例如) "DOMAIN\user") 中的 \ 和用户主名字(如"user@example.org"中的 @ )。
 auths.sspi_default_language=默认语言
 auths.sspi_default_language_helper=SSPI 认证方法为用户自动创建的默认语言。如果您想要自动检测到语言，请留空。
 auths.tips=帮助提示

templates/admin/cloudbrain/list.tmpl

@@ -1,23 +1,3 @@
-<style>
-.el-pagination.is-background .el-pager li:not(.disabled).active {
-  background-color: #5bb973 !important; 
-  color: #FFF !important;
-}
-/* .el-pagination.is-background .el-pager li.active {
-  color: #fff;
-  cursor: default;
-} */
-.el-pagination.is-background .el-pager li:hover {
-  color: #5bb973 !important;
-}
-/* .el-pagination.is-background .el-pager li:not(.disabled):hover {
-  color: #5bb973;
-}
-.el-pagination.is-background .el-pager li:not(.disabled).active:hover {
-  background-color: #5bb973;
-  color: #FFF;
-} */
-</style>
 {{template "base/head" .}}
  <!-- 弹窗 -->
  <div id="mask">
@@ -35,64 +15,15 @@
     {{template "admin/navbar" .}}
     <div class="ui container" style="width: 80%;">
         {{template "base/alert" .}}
-        
-        <div class="ui  grid" >
+        <div class="ui grid" >
             <div class="row" style="border: 1px solid #d4d4d5;margin-top: 15px;padding-top: 0;">
-                <div class="ui attached segment">
-                    <form class="ui form ignore-dirty"  style="max-width: 90%">
-                        <div class="ui fluid action input">
-                            <input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
-                            <button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
-                        </div>
-                    </form>
-                </div>
-                <div class="ui six wide column" style="margin: 1rem 0;" id="adminCloud">
-                        <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">  
-                            <div class="default text" style="color: rgba(0,0,0,.87);">全部任务类型</div>
-                            <i class="dropdown icon"></i>
-                            <div class="menu">
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="全部任务类型">全部任务类型</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=DEBUG&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="DEBUG">DEBUG</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=TRAIN&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="TRAIN">TRAIN</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=INFERENCE&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="INFERENCE">INFERENCE</a>
-                            </div>
-                        </div>
-                        <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">  
-                            <div class="default text" style="color: rgba(0,0,0,.87);">全部计算资源</div>
-                            <i class="dropdown icon"></i>
-                            <div class="menu">
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType=&jobStatus={{$.JobStatus}}" data-value="全部计算资源">全部计算资源</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType=CPU/GPU&jobStatus={{$.JobStatus}}"  data-value="CPU/GPU">CPU/GPU</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType=NPU&jobStatus={{$.JobStatus}}"  data-value="NPU">NPU</a>
-                            </div>
-                        </div>
-                        <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">  
-                            <div class="default text" style="color: rgba(0,0,0,.87);">全部状态</div>
-                            <i class="dropdown icon"></i>
-                            <div class="menu">
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=" data-value="all">全部状态</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STARTING" data-value="CPU/GPU">STARTING</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=RESTARTING"  data-value="NPU">RESTARTING </a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=START_FAILED" data-value="all">START_FAILED</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STOPPING" data-value="CPU/GPU">STOPPING</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STOPPED}"  data-value="NPU">STOPPED</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=WAITING" data-value="all">WAITING</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=COMPLETED" data-value="CPU/GPU">COMPLETED</a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=FAILED"  data-value="NPU">FAILED </a>
-                                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=OTHER"  data-value="NPU">OTHER</a>
-                                
-                            </div>
-                        </div>
-                </div>
+                {{template "admin/cloudbrain/search" .}}
                 <div class="ui ten wide column right aligned" style="margin: 1rem 0;">
-                        <!-- <a href="/admin/cloudbrains/download"><i class="ri-download-line" style="display: inline-block;"></i>下载此报告</a> -->
-                        <a class="ui compact blue basic icon button" style="box-shadow: none !important; padding: 0.8em;" href="/admin/cloudbrains/download"><i class="ri-download-line middle aligned icon"></i>下载此报告</a>
+                    <a class="ui compact blue basic icon button" style="box-shadow: none !important; padding: 0.8em;" href="/admin/cloudbrains/download"><i class="ri-download-line middle aligned icon"></i>{{.i18n.Tr "admin.cloudbrain.download_report"}}</a>
                 </div>
-
                 <div class="ui sixteen wide column">
                     <!-- 任务展示 -->
                     <div class="dataset list">
-
                      <!-- 表头 -->
                         <div class="ui grid stackable" style="background: #f0f0f0;;">
                             <div class="row">
@@ -100,7 +31,7 @@
                                     <span style="margin:0 6px">{{$.i18n.Tr "repo.cloudbrain_task"}}</span>
                                 </div>
                                 <div class="one wide column text center padding0">
-                                    <span style="margin:0 6px">任务类型</span>
+                                    <span style="margin:0 6px">{{$.i18n.Tr "repo.cloudbrain_task_type"}}</span>
                                 </div>
                                 <div class="two wide column text center padding0" style="width: 10% !important;">
                                     <span>{{$.i18n.Tr "repo.modelarts.status"}}</span>
@@ -118,21 +49,19 @@
                                     <span>{{$.i18n.Tr "repo.cloudbrain_creator"}}</span> 
                                 </div>
                                 <div class="two wide column text center padding0">
-                                    <span>项目</span> 
+                                    <span>{{$.i18n.Tr "repository"}}</span> 
                                 </div>
                                 <div class="two wide column text center padding0">
-                                    <span>云脑侧名称</span> 
+                                    <span>{{.i18n.Tr "admin.cloudbrain.cloudbrain_name"}}</span> 
                                 </div>
                                 <div class="two wide column text center padding0" style="width: 17.5%!important;">
                                     <span>{{$.i18n.Tr "repo.cloudbrain_operate"}}</span>
                                 </div>
                             </div>  
                         </div>                     
-
                         {{range .Tasks}}
                         <div class="ui grid stackable item">
-                            <div class="row">
-                            
+                            <div class="row">    
                                 <!-- 任务名 -->
                                 <div class="two wide column padding0">
                                     {{if eq .JobType "DEBUG"}}
@@ -154,7 +83,6 @@
                                     {{end}}
                                 </div>
                                 <!-- 任务类型 -->
-                                
                                 <div class="one wide column text center padding0">   
                                     <span style="font-size: 12px;">{{.JobType}} </span>                                  
                                 </div>
@@ -190,21 +118,19 @@
                                 </div>
                                 <!-- 云脑侧名称 -->
                                 <div class="two wide column text center padding0" style="overflow: hidden;text-overflow:ellipsis;">
-                                    
                                     <span class="fitted">{{.JobName}}</span>
                                 </div>
-
                                 <div class="two wide column text center padding0" style="width: 17.5%!important;">
                                     {{if eq .JobType "DEBUG"}}
                                     <div class="ui compact buttons">
                                         <form id="debugAgainForm-{{.JobID}}">
                                             {{$.CsrfTokenHtml}}
                                             {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}}
-                                            <a style="margin: 0 1rem;" id="ai-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"}}{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}/cloudbrain{{else}}{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}/modelarts/notebook{{end}}/{{.JobID}}/")'>
+                                            <a style="margin: 0 1rem;" id="ai-debug-{{.JobID}}" class='ui basic ai_debug {{if eq .Status "CREATING" "STOPPING"  "WAITING" "STARTING"}}disabled {{else}}blue {{end}}button' data-jobid="{{.JobID}}" data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{.JobID}}/'>
                                                 {{$.i18n.Tr "repo.debug"}}
                                             </a>
                                             {{else}}
-                                            <a id="ai-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"}}{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}/cloudbrain{{else}}{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}/modelarts/notebook{{end}}/{{.JobID}}/")'>
+                                            <a id="ai-debug-{{.JobID}}" class='ui basic ai_debug {{if eq .Status "CREATING" "STOPPING"  "WAITING" "STARTING"}} disabled {{else}}blue {{end}}button' data-jobid="{{.JobID}}" data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{.JobID}}/'>
                                                 {{$.i18n.Tr "repo.debug_again"}}
                                             </a>
                                             {{end}}
@@ -216,34 +142,20 @@
                                         {{if eq .JobType "DEBUG" "BENCHMARK"}}
                                         <form id="stopForm-{{.JobID}}"  style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
-                                            <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class='ui basic {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "SUCCEEDED" "STOPPED" "STOPPING"}}disabled {{else}} blue {{end}}button' onclick='stopDebug("{{.JobID}}","{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else if eq .JobType "BENCHMARK" }}/cloudbrain/benchmark{{else if eq .ComputeResource "NPU" }}/modelarts/notebook{{end}}/{{.JobID}}/stop")'>
+                                            <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class='ui basic ai_stop {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "SUCCEEDED" "STOPPED" "STOPPING"}}disabled {{else}} blue {{end}}button' data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else if eq .JobType "BENCHMARK" }}/cloudbrain/benchmark{{else if eq .ComputeResource "NPU" }}/modelarts/notebook{{end}}/{{.JobID}}/stop' data-jobid="{{.JobID}}">
                                                 {{$.i18n.Tr "repo.stop"}}
                                             </a>
                                         </form>
                                         {{else}}
-                                        <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class="ui basic {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{else}} blue {{end}}button" onclick='stopVersion({{.VersionName}},{{.JobID}},{{.Repo.OwnerName}},{{.Repo.Alias}})'>
+                                        <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class="ui basic ai_stop_version {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{else}} blue {{end}}button" data-repopath="{{.Repo.OwnerName}}/{{.Repo.Alias}}/modelarts/{{if eq .JobType "INFERENCE"}}inference-job{{else}}train-job{{end}}" data-jobid="{{.JobID}}" data-version="{{.VersionName}}" >
                                             {{$.i18n.Tr "repo.stop"}}
                                         </a>
                                         {{end}}
                                     </div>
-                                    <!-- 下载 -->
-                                    <!-- {{if eq .JobType "INFERENCE"}}
-                                    <div class="ui compact buttons">
-                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="model-download-{{.JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}/modelarts/inference-job/{{.JobID}}/downloadall?version_name={{.VersionName}}"  class="ui basic blue button" style="border-radius: .28571429rem;">
-                                            {{$.i18n.Tr "repo.model_download"}}
-                                        </a>
-                                    </div>
-                                    {{else if eq .JobType "DEBUG"}}
-                                    <div class="ui compact buttons">
-                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="model-download-{{.JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}/modelarts/inference-job/{{.JobID}}/downloadall?version_name={{.VersionName}}"  class="ui basic blue button" style="border-radius: .28571429rem;">
-                                            {{$.i18n.Tr "repo.download"}}
-                                        </a>
-                                    </div>
-                                    {{end}} -->
                                     <!-- 删除任务 -->
-                                    <form class="ui compact buttons" id="delForm-{{.JobID}}" action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if eq .ComputeResource "NPU"}}/modelarts/notebook{{else if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else if eq .JobType "TRAIN"}}modelarts/train-job{{end}}/{{.JobID}}/del?isadminpage=true' method="post">
+                                    <form class="ui compact buttons" id="delForm-{{.JobID}}" action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}/modelarts/train-job{{end}}/{{.JobID}}/del?isadminpage=true' method="post">
                                         {{$.CsrfTokenHtml}}
-                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{.JobID}}" class="ui basic blue button" onclick="assertDelete(this,{{.VersionName}},{{.JobID}},{{.Repo.OwnerName}},{{.Repo.Alias}})" style="border-radius: .28571429rem;">
+                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{.JobID}}" data-repopath="{{.Repo.OwnerName}}/{{.Repo.Alias}}/modelarts/inference-job/{{.JobID}}/del_version?isadminpage=true"  data-version="{{.VersionName}}" class="ui basic ai_delete blue button" style="border-radius: .28571429rem;">
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                     </form>
@@ -270,7 +182,6 @@
             </div>
         </div>
     </div>
-    
     <!-- 确认模态框 -->
     <div id="deletemodel">
         <div class="ui basic modal">
@@ -292,198 +203,17 @@
         </div>
     </div>
 </div>
-
 {{template "base/footer" .}}
-
 <script>
-// 删除时用户确认
-console.log({{.Tasks}})
-function deleteVersion(version_name,jobID,repoOwner,repoName){
-    const url = '/api/v1/repos/'+repoOwner+'/'+repoName+'/modelarts/inference-job/'+jobID+'/del_version'
-    $.post(url,{version_name:version_name},(data)=>{
-        if(data.StatusOK===0){
-            location.reload()
-        }
-    }).fail(function(err) {
-        console.log(err);	            
-    });
-}
-function assertDelete(obj,version_name,jobID,repoOwner,repoName) {
-    if (obj.style.color == "rgb(204, 204, 204)") {
-        return
-    } else {
-        const delId = obj.parentNode.id
-        flag = 1;
-        $('.ui.basic.modal')
-            .modal({
-                onDeny: function() {
-                    flag = false
-                },
-                onApprove: function() {
-                    if(!version_name){
-                        document.getElementById(delId).submit()
-                    }
-                    else{
-                        deleteVersion(version_name,jobID,repoOwner,repoName)
-                    }
-                    flag = true
-                },
-                onHidden: function() {
-                    if (flag == false) {
-                        $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
-                    }
-                }
-            })
-            .modal('show')
-    }
-}
 function getParams(){
     const params = new URLSearchParams(window.location.search)
-    let jobType = !params.get('jobType')? '全部任务类型' : params.get('jobType')
-    let listType = !params.get('listType')? '全部计算资源' : params.get('listType')
-    let jobStatus = !params.get('jobStatus')? '全部状态' : params.get('jobStatus')
+    let jobType = !params.get('jobType')? '{{.i18n.Tr "admin.cloudbrain.all_task_types"}}' : params.get('jobType')
+    let listType = !params.get('listType')? '{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}' : params.get('listType')
+    let jobStatus = !params.get('jobStatus')? '{{.i18n.Tr "admin.cloudbrain.all_status"}}' : params.get('jobStatus')
     const dropdownValueArray = [jobType,listType,jobStatus]
     $('#adminCloud .default.text ').each(function(index,e){
         $(e).text(dropdownValueArray[index])
     })
 }
 getParams()
-function debugAgain(JobID,debugUrl){
-    if($('#' + JobID+ '-text').text()==="RUNNING"){
-        window.open(debugUrl+'debug')
-    }else{
-        $.ajax({
-            type:"POST",
-            url:debugUrl+'restart',
-            data:$('#debugAgainForm-'+JobID).serialize(),
-            success:function(res){
-                if(res.result_code==="0"){
-                    if(res.job_id!==JobID){
-                        location.reload()
-                    }else{
-                        $('#' + JobID+'-icon').removeClass().addClass(res.status)
-                        $('#' + JobID+ '-text').text(res.status)
-                        $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
-                        $('#ai-delete-'+JobID).removeClass('blue').addClass('disabled')
-                        $('#ai-debug-'+JobID).text("调试").css("margin","0 1rem")
-                    }
-                }else{
-                    $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
-                }
-            },
-            error :function(res){
-                console.log(res)
-
-            }
-        })
-    }
-    
-}
-function stopDebug(JobID,stopUrl){
-$.ajax({
-    type:"POST",
-    url:stopUrl,
-    data:$('#stopForm-'+JobID).serialize(),
-    success:function(res){
-        if(res.result_code==="0"){
-            $('#' + JobID+'-icon').removeClass().addClass(res.status)
-            $('#' + JobID+ '-text').text(res.status)
-            if(res.status==="STOPPED"){
-                $('#ai-debug-'+JobID).removeClass('disabled').addClass('blue').text("再次调试").css("margin","0")
-                $('#ai-image-'+JobID).removeClass('blue').addClass('disabled')
-                $('#ai-model-debug-'+JobID).removeClass('blue').addClass('disabled')
-                $('#ai-delete-'+JobID).removeClass('disabled').addClass('blue')
-                $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
-            }
-            else{
-                $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
-                $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
-            }
-            
-        }else{
-            $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
-        }
-    },
-    error :function(res){
-        console.log(res)
-
-    }
-})
-
-}
-
-function stopVersion(version_name,jobID,repoOwner,repoName){
-    const url = `/api/v1/repos/${repoOwner}/${repoName}/modelarts/inference-job/${jobID}/stop_version`
-    $.post(url,{version_name:version_name},(data)=>{
-        if(data.StatusOK===0){
-            $('#ai-stop-'+jobID).removeClass('blue')
-            $('#ai-stop-'+jobID).addClass('disabled')
-            refreshStatus(version_name,jobID,repoOwner,repoName)
-        }
-    }).fail(function(err) {
-        console.log(err);	            
-    });
-}
-function refreshStatus(version_name,jobID,repoOwner,repoName){
-
-const url = `/api/v1/repos/${repoOwner}/${repoName}/modelarts/inference-job/${jobID}/?version_name${version_name}`
-$.get(url,(data)=>{
-    $(`#${jobID}-icon`).attr("class",data.JobStatus)
-    // detail status and duration
-    $(`#${jobID}-text`).text(data.JobStatus)
-}).fail(function(err) {
-    console.log(err);
-});
-}
-var timeid = window.setInterval(loadJobStatus, 15000);
-$(document).ready(loadJobStatus);
-function loadJobStatus() {
-    $(".job-status").each((index, job) => {
-        const jobID = job.dataset.jobid;
-        const repoPath = job.dataset.repopath;
-        const computeResource = job.dataset.resource
-        const versionname = job.dataset.version
-        const finalState = ['STOPPED','CREATE_FAILED','UNAVAILABLE','DELETED','RESIZE_FAILED','SUCCEEDED','IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED']
-        if (finalState.includes(job.textContent.trim())) {
-            return
-        }
-        // const diffResource = computeResource == "NPU" ? 'modelarts/notebook' : 'cloudbrain'
-        $.get(`/api/v1/repos/${repoPath}/${jobID}?version_name=${versionname}`, (data) => {
-            const jobID = data.JobID
-            const status = data.JobStatus
-            if (status != job.textContent.trim()) {
-                $('#' + jobID+'-icon').removeClass().addClass(status)
-                $('#' + jobID+ '-text').text(status)
-            }
-            if(status==="RUNNING"){
-                $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem")
-                $('#model-image-'+jobID).removeClass('disabled').addClass('blue')
-            }
-            if(status!=="RUNNING"){
-                // $('#model-debug-'+jobID).removeClass('blue')
-                // $('#model-debug-'+jobID).addClass('disabled')
-                $('#model-image-'+jobID).removeClass('blue').addClass('disabled')
-            }
-            if(["CREATING","STOPPING","WAITING","STARTING"].includes(status)){
-                $('#ai-debug-'+jobID).removeClass('blue').addClass('disabled')
-            }
-            if(['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'].includes(status)){
-                $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0") 
-            }
-            if(["RUNNING","WAITING"].includes(status)){
-                $('#ai-stop-'+jobID).removeClass('disabled').addClass('blue')
-            }
-            if(["CREATING","STOPPING","STARTING","STOPPED","FAILED","START_FAILED","SUCCEEDED"].includes(status)){
-                $('#ai-stop-'+jobID).removeClass('blue').addClass('disabled')
-            }
-            if(status==="STOPPED" || status==="FAILED"|| status==="START_FAILED" || status==="KILLED" || status==="COMPLETED"){
-                $('#ai-delete-'+jobID).removeClass('disabled').addClass('blue')
-            }else{
-                $('#ai-delete-'+jobID).removeClass('blue').addClass('disabled')
-            }
-        }).fail(function(err) {
-            console.log(err);
-        });
-    });
-};
 </script>

templates/admin/cloudbrain/search.tmpl

@@ -0,0 +1,46 @@
+<div class="ui attached segment">
+    <form class="ui form ignore-dirty"  style="max-width: 90%">
+        <div class="ui fluid action input">
+            <input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
+            <button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
+        </div>
+    </form>
+</div>
+<div class="ui six wide column" style="margin: 1rem 0;" id="adminCloud">
+        <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">  
+            <div class="default text" style="color: rgba(0,0,0,.87);">{{.i18n.Tr "admin.cloudbrain.all_task_types"}}</div>
+            <i class="dropdown icon"></i>
+            <div class="menu">
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value='{{.i18n.Tr "admin.cloudbrain.all_task_types"}}'>{{.i18n.Tr "admin.cloudbrain.all_task_types"}}</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=DEBUG&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="DEBUG">DEBUG</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=TRAIN&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="TRAIN">TRAIN</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=INFERENCE&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="INFERENCE">INFERENCE</a>
+            </div>
+        </div>
+        <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">  
+            <div class="default text" style="color: rgba(0,0,0,.87);">{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}</div>
+            <i class="dropdown icon"></i>
+            <div class="menu">
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType=&jobStatus={{$.JobStatus}}" data-value='{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}'>{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType=CPU/GPU&jobStatus={{$.JobStatus}}"  data-value="CPU/GPU">CPU/GPU</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType=NPU&jobStatus={{$.JobStatus}}"  data-value="NPU">NPU</a>
+            </div>
+        </div>
+        <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">  
+            <div class="default text" style="color: rgba(0,0,0,.87);">{{.i18n.Tr "admin.cloudbrain.all_status"}}</div>
+            <i class="dropdown icon"></i>
+            <div class="menu">
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=" data-value='{{.i18n.Tr "admin.cloudbrain.all_status"}}'>{{.i18n.Tr "admin.cloudbrain.all_status"}}</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STARTING" data-value="CPU/GPU">STARTING</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=RESTARTING"  data-value="NPU">RESTARTING </a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=START_FAILED" data-value="all">START_FAILED</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STOPPING" data-value="CPU/GPU">STOPPING</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STOPPED}"  data-value="NPU">STOPPED</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=WAITING" data-value="all">WAITING</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=COMPLETED" data-value="CPU/GPU">COMPLETED</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=FAILED"  data-value="NPU">FAILED </a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=OTHER"  data-value="NPU">OTHER</a>
+                
+            </div>
+        </div>
+</div>

templates/repo/cloudbrain/benchmark/index.tmpl

@@ -106,7 +106,7 @@
                                 </div>
                                 <!-- 任务状态 -->
                                 <div class="two wide column padding0" style="padding-left: 2.2rem !important;">
-                                    <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
+                                    <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}" data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
                                             <span><i id="{{.JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i><span  id="{{.JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
                                 </div>
@@ -137,10 +137,9 @@
                                    <form id="stopForm-{{.JobID}}"  style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
-                                               
-                                                <a id="stop-model-debug-{{.JobID}}" class='ui basic {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED"}}disabled {{else}}blue {{end}}button' onclick='stopDebug("{{.JobID}}","{{$.RepoLink}}/cloudbrain/benchmark/{{.JobID}}/stop")'>
-                                                    {{$.i18n.Tr "repo.stop"}}
-                                                </a>
+                                            <a id="ai-stop-{{.JobID}}" class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED"}}disabled {{else}}blue {{end}}button' data-repopath="{{$.RepoLink}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{.JobID}}/stop" data-jobid="{{.JobID}}">
+                                                {{$.i18n.Tr "repo.stop"}}
+                                            </a>
                                                 
                                             {{else}}
                                             <a  class="ui basic disabled button">
@@ -148,26 +147,21 @@
                                             </a>
                                             {{end}}
                                         </form>
-
-                                   
                                         <a class="ui basic button {{if $.IsSigned}} blue{{else}} disabled{{end}}" href="{{$.RepoLink}}/cloudbrain/{{.JobID}}/rate" target="_blank">
                                                         评分
                                         </a>
-                                    
-
                                       <!-- 删除任务 -->
                                       <form  id="delForm-{{.JobID}}" action="{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain/benchmark{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/del" method="post">
                                             <input type="hidden" name="debugListType" value="all">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
-                                            <a id="model-delete-{{.JobID}}" class='ui basic {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "SUCCEEDED"}}blue {{else}}disabled {{end}}button' onclick="assertDelete(this)" style="border-radius: .28571429rem;">
+                                            <a id="ai-delete-{{.JobID}}" class='ui basic ai_delete {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "SUCCEEDED"}}blue {{else}}disabled {{end}}button'  style="border-radius: .28571429rem;">
                                                 {{$.i18n.Tr "repo.delete"}}
                                             </a>
                                             {{else}}
-                                            <a  class="ui basic button disabled" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
+                                            <a  class="ui basic button disabled" style="border-radius: .28571429rem;">
                                                     {{$.i18n.Tr "repo.delete"}}
                                             </a>
-                                            
                                             {{end}}
                                        </form>    
                                     </div>
@@ -221,166 +215,3 @@
 
 </div>
 {{template "base/footer" .}}
-
-<script>
-    // 调试和评分新开窗口
-    function stop(obj) {
-        if (obj.style.color != "rgb(204, 204, 204)") {
-            obj.target = '_blank'
-        } else {
-            return
-        }
-    }
-
-    // 删除时用户确认
-    function assertDelete(obj) {
-        if (obj.style.color == "rgb(204, 204, 204)") {
-            return
-        } else {
-            var delId = obj.parentNode.id
-            flag = 1;
-            $('.ui.basic.modal')
-                .modal({
-                    onDeny: function() {
-                        flag = false
-                    },
-                    onApprove: function() {
-                        document.getElementById(delId).submit()
-                        flag = true
-                    },
-                    onHidden: function() {
-                        if (flag == false) {
-                            $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
-                        }
-                    }
-                })
-                .modal('show')
-        }
-    }
-    function runtime(time){
-                    if(time){
-                        let hours = time/3600000<10 ? "0"+parseInt(time/3600000):parseInt(time/3600000)
-                        let miuns = time%3600000/60000<10 ? "0"+parseInt(time%3600000/60000):parseInt(time%3600000/60000)
-                        let seconds = time%60000/1000<10 ? "0"+parseInt(time%60000/1000):parseInt(time%60000/1000)
-                        return hours + ":" + miuns + ":" + seconds
-                    }else{
-                        return "00:00:00"
-                    }
-    }
-
-     // 加载任务状态
-    var timeid = window.setInterval(loadJobStatus, 15000);
-    $(document).ready(loadJobStatus);
-    function loadJobStatus() {
-        $(".job-status").each((index, job) => {
-            const jobID = job.dataset.jobid;
-            const repoPath = job.dataset.repopath;
-            const computeResource = job.dataset.resource
-            const initArray = ['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED']
-            if (initArray.includes(job.textContent.trim())) {
-                
-                return
-            }
-            const diffResource = computeResource == "NPU" ? 'modelarts/notebook' : 'cloudbrain'
-            $.get(`/api/v1/repos/${repoPath}/${diffResource}/${jobID}`, (data) => {
-                const jobID = data.JobID
-                const status = data.JobStatus
-                if (status != job.textContent.trim()) {
-                    $('#' + jobID+'-icon').removeClass().addClass(status)
-                    $('#' + jobID+ '-text').text(status)
-                }
-                if(status==="RUNNING"){
-                    $('#model-debug-'+jobID).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem")
-                    $('#model-image-'+jobID).removeClass('disabled').addClass('blue')
-                }
-                if(status!=="RUNNING"){
-                    // $('#model-debug-'+jobID).removeClass('blue')
-                    // $('#model-debug-'+jobID).addClass('disabled')
-                    $('#model-image-'+jobID).removeClass('blue').addClass('disabled')
-                }
-                if(["CREATING","STOPPING","WAITING","STARTING"].includes(status)){
-                    $('#model-debug-'+jobID).removeClass('blue').addClass('disabled')
-                }
-                if(['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'].includes(status)){
-                    $('#model-debug-'+jobID).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0") 
-                }
-                if(["RUNNING","WAITING"].includes(status)){
-                   $('#stop-model-debug-'+jobID).removeClass('disabled').addClass('blue')
-                }
-                if(["CREATING","STOPPING","STARTING","STOPPED","FAILED","START_FAILED","SUCCEEDED"].includes(status)){
-                   $('#stop-model-debug-'+jobID).removeClass('blue').addClass('disabled')
-                }
-                if(status==="STOPPED" || status==="FAILED"|| status==="START_FAILED"){
-                    $('#model-delete-'+jobID).removeClass('disabled').addClass('blue')
-                }else{
-                    $('#model-delete-'+jobID).removeClass('blue').addClass('disabled')
-                }
-            }).fail(function(err) {
-                console.log(err);
-            });
-        });
-    };
-    
-    // 获取弹窗
-    var modal = document.getElementById('imageModal');
-
-    // 打开弹窗的按钮对象
-    var btns = document.getElementsByClassName("imageBtn");
-
-    // 获取 <span> 元素，用于关闭弹窗
-    var spans = document.getElementsByClassName('close');
-
-    // 点击按钮打开弹窗
-    for (i = 0; i < btns.length; i++) {
-        btns[i].onclick = function() {
-            modal.style.display = "block";
-        }
-    }
-
-    // 点击 <span> (x), 关闭弹窗
-    for (i = 0; i < spans.length; i++) {
-        spans[i].onclick = function() {
-            modal.style.display = "none";
-        }
-    }
-
-    // 在用户点击其他地方时，关闭弹窗
-    window.onclick = function(event) {
-        if (event.target == modal) {
-            modal.style.display = "none";
-        }
-    }
-   
-    function stopDebug(JobID,stopUrl){
-        $.ajax({
-            type:"POST",
-            url:stopUrl,
-            data:$('#stopForm-'+JobID).serialize(),
-            success:function(res){
-                if(res.result_code==="0"){
-                    $('#' + JobID+'-icon').removeClass().addClass(res.status)
-                    $('#' + JobID+ '-text').text(res.status)
-                    if(res.status==="STOPPED"){
-                        $('#model-debug-'+JobID).removeClass('disabled').addClass('blue').text("再次调试").css("margin","0")
-                        $('#model-image-'+JobID).removeClass('blue').addClass('disabled')
-                        $('#stop-model-debug-'+JobID).removeClass('blue').addClass('disabled')
-                        $('#model-delete-'+JobID).removeClass('disabled').addClass('blue')
-                    }
-                    else{
-                        $('#model-debug-'+JobID).removeClass('blue').addClass('disabled')
-                        $('#stop-model-debug-'+JobID).removeClass('blue').addClass('disabled')
-                    }
-                    
-                }else{
-                    $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
-                }
-            },
-            error :function(res){
-                console.log(res)
-
-            }
-        })
-
-    }
-
-</script>

templates/repo/debugjob/index.tmpl

@@ -293,7 +293,7 @@
                                 </div>
                                 <div class="two wide column text center">
                                      <!--任务状态 -->
-                                     <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}" data-resource="{{.ComputeResource}}">
+                                     <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}" data-jobid="{{.JobID}}" data-resource="{{.ComputeResource}}">
                                         <span><i id="{{.JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i><span id="{{.JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
                                 </div>
@@ -324,11 +324,11 @@
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDebug}}
                                                 {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}}
-                                                <a style="margin: 0 1rem;" id="ai-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}}/")'>
+                                                <a style="margin: 0 1rem;" id="ai-debug-{{.JobID}}" class='ui basic ai_debug {{if eq .Status "CREATING" "STOPPING"  "WAITING" "STARTING"}}disabled {{else}}blue {{end}}button' data-jobid="{{.JobID}}" data-repopath='{{$.RepoLink}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{.JobID}}/'>
                                                     {{$.i18n.Tr "repo.debug"}}
                                                 </a>
                                                 {{else}}
-                                                <a id="ai-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}}/")'>
+                                                <a id="ai-debug-{{.JobID}}" class='ui basic ai_debug {{if eq .Status "CREATING" "STOPPING"  "WAITING" "STARTING"}} disabled {{else}}blue {{end}}button' data-jobid="{{.JobID}}" data-repopath='{{$.RepoLink}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{.JobID}}/'>
                                                     {{$.i18n.Tr "repo.debug_again"}}
                                                 </a>
                                                 {{end}}
@@ -349,15 +349,9 @@
                                         <form id="stopForm-{{.JobID}}"  style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
-                                                {{if eq .ComputeResource "CPU/GPU" }}
-                                                <a id="ai-stop-{{.JobID}}" class='ui basic {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED"}}disabled {{else}}blue {{end}}button' onclick='stopDebug("{{.JobID}}","{{$.RepoLink}}/cloudbrain/{{.JobID}}/stop")'>
-                                                    {{$.i18n.Tr "repo.stop"}}
-                                                </a>
-                                                {{else}}
-                                                <a id="ai-stop-{{.JobID}}" class='ui basic {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED"}}disabled {{else}}blue {{end}}button' onclick='stopDebug("{{.JobID}}","{{$.RepoLink}}/modelarts/notebook/{{.JobID}}/stop")'>
-                                                    {{$.i18n.Tr "repo.stop"}}
-                                                </a>
-                                                {{end}}
+                                            <a id="ai-stop-{{.JobID}}" class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED"}}disabled {{else}}blue {{end}}button' data-repopath="{{$.RepoLink}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{.JobID}}/stop" data-jobid="{{.JobID}}">
+                                                {{$.i18n.Tr "repo.stop"}}
+                                            </a>
                                             {{else}}
                                             <a  class="ui basic disabled button">
                                                     {{$.i18n.Tr "repo.stop"}}
@@ -369,19 +363,16 @@
                                             <input type="hidden" name="debugListType" value="all">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
-                                            <a id="ai-delete-{{.JobID}}" class='ui basic {{if eq .Status "STOPPED" "FAILED" "START_FAILED"}}blue {{else}}disabled {{end}}button' onclick="assertDelete(this)" style="border-radius: .28571429rem;">
+                                            <a id="ai-delete-{{.JobID}}" class='ui basic ai_delete {{if eq .Status "STOPPED" "FAILED" "START_FAILED"}}blue {{else}}disabled {{end}}button'  style="border-radius: .28571429rem;">
                                                 {{$.i18n.Tr "repo.delete"}}
                                             </a>
                                             {{else}}
-                                            <a  class="ui basic button disabled" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
-                                                    {{$.i18n.Tr "repo.delete"}}
+                                            <a  class="ui basic button disabled" style="border-radius: .28571429rem;">
+                                                {{$.i18n.Tr "repo.delete"}}
                                             </a>
-                                            
                                             {{end}}
                                         </form>                                        
-                                    </div>
-                                    <!-- 删除任务 -->
-                                    
+                                    </div>                                    
                                     <div class="ui compact buttons" style="{{if eq .ComputeResource "CPU/GPU"}} visibility: visible {{else}} visibility: hidden{{end}}">
                                         <div class="ui dropdown" id="model_more" style="padding: .58928571em 1.125em .58928571em;">
                                             <div class="text">更多</div>
@@ -411,7 +402,6 @@
                                                     </a>
                                                 </div>
                                                 {{end}}
-                                                
                                             </div>
                                         </div>
                                     </div>
@@ -487,7 +477,6 @@
 
 </div>
 {{template "base/footer" .}}
-
 <script>
     // 调试和评分新开窗口
     const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
@@ -505,153 +494,6 @@
         }
         return(false);
     }
-    function stop(obj) {
-        if (obj.style.color != "rgb(204, 204, 204)") {
-            obj.target = '_blank'
-        } else {
-            return
-        }
-    }
-    // 删除时用户确认
-    function assertDelete(obj) {
-        if (obj.style.color == "rgb(204, 204, 204)") {
-            return
-        } else {
-            var delId = obj.parentNode.id
-            flag = 1;
-            $('.ui.basic.modal')
-                .modal({
-                    onDeny: function() {
-                        flag = false
-                    },
-                    onApprove: function() {
-                        document.getElementById(delId).submit()
-                        flag = true
-                        $('.alert').html('操作成功!').removeClass('alert-danger').addClass('alert-success').show().delay(1500).fadeOut();
-                    },
-                    onHidden: function() {
-                        if (flag == false) {
-                            $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
-                        }
-                    }
-                })
-                .modal('show')
-        }
-    }
-    function debugAgain(JobID,debugUrl){
-        if($('#' + JobID+ '-text').text()==="RUNNING"){
-            window.open(debugUrl+'debug')
-        }else{
-            $.ajax({
-                type:"POST",
-                url:debugUrl+'restart',
-                data:$('#debugAgainForm-'+JobID).serialize(),
-                success:function(res){
-                    if(res.result_code==="0"){
-                        if(res.job_id!==JobID){
-                            location.reload()
-                        }else{
-                            $('#' + JobID+'-icon').removeClass().addClass(res.status)
-                            $('#' + JobID+ '-text').text(res.status)
-                            $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
-                            $('#ai-delete-'+JobID).removeClass('blue').addClass('disabled')
-                            $('#ai-debug-'+JobID).text("调试").css("margin","0 1rem")
-                        }
-                    }else{
-                        $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
-                    }
-                },
-                error :function(res){
-                    console.log(res)
-
-                }
-            })
-        }
-        
-    }
-    function stopDebug(JobID,stopUrl){
-        $.ajax({
-            type:"POST",
-            url:stopUrl,
-            data:$('#stopForm-'+JobID).serialize(),
-            success:function(res){
-                if(res.result_code==="0"){
-                    $('#' + JobID+'-icon').removeClass().addClass(res.status)
-                    $('#' + JobID+ '-text').text(res.status)
-                    if(res.status==="STOPPED"){
-                        $('#ai-debug-'+JobID).removeClass('disabled').addClass('blue').text("再次调试").css("margin","0")
-                        $('#model-image-'+JobID).removeClass('blue').addClass('disabled')
-                        $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
-                        $('#ai-delete-'+JobID).removeClass('disabled').addClass('blue')
-                    }
-                    else{
-                        $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
-                        $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
-                    }
-                    
-                }else{
-                    $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
-                }
-            },
-            error :function(res){
-                console.log(res)
-
-            }
-        })
-
-    }
-    // 加载任务状态
-    var timeid = window.setInterval(loadJobStatus, 15000);
-    $(document).ready(loadJobStatus);
-    function loadJobStatus() {
-        $(".job-status").each((index, job) => {
-            const jobID = job.dataset.jobid;
-            const repoPath = job.dataset.repopath;
-            const computeResource = job.dataset.resource
-            const initArray = ['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED','UNAVAILABLE','DELETED','RESIZE_FAILED']
-            if (initArray.includes(job.textContent.trim())) {
-                
-                return
-            }
-            const diffResource = computeResource == "NPU" ? 'modelarts/notebook' : 'cloudbrain'
-            $.get(`/api/v1/repos/${repoPath}/${diffResource}/${jobID}`, (data) => {
-                const jobID = data.JobID
-                const status = data.JobStatus
-                if (status != job.textContent.trim()) {
-                    $('#' + jobID+'-icon').removeClass().addClass(status)
-                    $('#' + jobID+ '-text').text(status)
-                }
-                if(status==="RUNNING"){
-                    $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem")
-                    $('#model-image-'+jobID).removeClass('disabled').addClass('blue')
-                }
-                if(status!=="RUNNING"){
-                    // $('#model-debug-'+jobID).removeClass('blue')
-                    // $('#model-debug-'+jobID).addClass('disabled')
-                    $('#model-image-'+jobID).removeClass('blue').addClass('disabled')
-                }
-                if(["CREATING","STOPPING","WAITING","STARTING"].includes(status)){
-                    $('#ai-debug-'+jobID).removeClass('blue').addClass('disabled')
-                }
-                if(['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'].includes(status)){
-                    $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0") 
-                }
-                if(["RUNNING","WAITING"].includes(status)){
-                   $('#ai-stop-'+jobID).removeClass('disabled').addClass('blue')
-                }
-                if(["CREATING","STOPPING","STARTING","STOPPED","FAILED","START_FAILED","SUCCEEDED"].includes(status)){
-                   $('#ai-stop-'+jobID).removeClass('blue').addClass('disabled')
-                }
-                if(status==="STOPPED" || status==="FAILED"|| status==="START_FAILED"){
-                    $('#ai-delete-'+jobID).removeClass('disabled').addClass('blue')
-                }else{
-                    $('#ai-delete-'+jobID).removeClass('blue').addClass('disabled')
-                }
-            }).fail(function(err) {
-                console.log(err);
-            });
-        });
-    };
     $(document).ready(function(){
         dropdownValue = dropdownValue==="CPU%2FGPU"? 'CPU/GPU' : dropdownValue
         $('.default.text').text(dropdownValue)
@@ -671,9 +513,6 @@
             .transition('fade')
         })
     })
-    
-    
-
     // 获取弹窗
     var modal = document.getElementById('imageModal');
 
@@ -703,7 +542,6 @@
             modal.style.display = "none";
         }
     }
-
     // 显示弹窗，弹出相应的信息
     function showmask() {
         var image_tag = !$('#image_tag').val()

templates/repo/modelarts/inferencejob/index.tmpl

@@ -113,11 +113,11 @@
                                 <!-- 模型版本 -->
                                 <!-- href="{{$.RepoLink}}/modelmanage/show_model_info?name={{.ModelName}}" -->
                                 <div class="three wide column text center padding0">   
-                                    <a id="{{.JobName}}" href="javascript:void(0);" data-variation="inverted" data-position="top center" data-content="{{$.i18n.Tr "repo.modelarts.infer_job.tooltip"}}" onclick="getModelInfo({{.ModelName}},{{.ModelVersion}},{{.JobName}})">{{.ModelName}}&nbsp;</a>&nbsp;<span style="font-size: 12px;">{{.ModelVersion}} </span>                                 
+                                    <a id="{{.JobName}}" class="goto_modelmanage" href="javascript:void(0);" data-variation="inverted" data-position="top center" data-content="{{$.i18n.Tr "repo.modelarts.infer_job.tooltip"}}" data-jobname={{.JobName}} data-modelname={{.ModelName}} data-version={{.ModelVersion}} data-repopath="{{$.RepoLink}}">{{.ModelName}}&nbsp;</a>&nbsp;<span style="font-size: 12px;">{{.ModelVersion}}</span>                                 
                                 </div>
                                 <!-- 任务状态 -->
                                 <div class="two wide column text center padding0" >
-                                    <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
+                                    <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}/modelarts/inference-job" data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
                                             <span><i id="{{.JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i><span  id="{{.JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
                                 </div>
@@ -147,11 +147,11 @@
                                     <div class="ui compact buttons">
                                         {{$.CsrfTokenHtml}}
                                         {{if .CanDel}}
-                                        <a style="padding: 0.5rem 1rem;" id="{{.JobID}}-stop" class="ui basic {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{else}} blue {{end}}button" onclick="stopVersion({{.VersionName}},{{.JobID}})">
+                                        <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class="ui basic ai_stop_version {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{else}} blue {{end}}button" data-repopath="{{$.RepoRelPath}}/modelarts/inference-job" data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
                                             {{$.i18n.Tr "repo.stop"}}
                                         </a>
                                         {{else}}
-                                        <a style="padding: 0.5rem 1rem;" id="{{.JobID}}-stop" class="ui basic disabled button">
+                                        <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class="ui basic disabled button">
                                                 {{$.i18n.Tr "repo.stop"}}
                                         </a>
                                         {{end}}
@@ -174,7 +174,7 @@
                                     <div class="ui compact buttons">
                                         {{$.CsrfTokenHtml}}
                                         {{if .CanDel}}
-                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="model-delete-{{.JobID}}" class="ui basic blue button" onclick="assertDelete(this,{{.VersionName}},{{.JobID}})" style="border-radius: .28571429rem;">
+                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="model-delete-{{.JobID}}" class="ui basic ai_delete blue button" data-repopath="{{$.RepoRelPath}}/modelarts/inference-job/{{.JobID}}/del_version" data-version="{{.VersionName}}" style="border-radius: .28571429rem;">
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                         {{else}}
@@ -221,118 +221,6 @@
         </div>
     </div>
 </div>
-
 </div>
 {{template "base/footer" .}}
-<script>
-// 加载任务状态
-var timeid = window.setInterval(loadJobStatus, 15000);
-$(document).ready(loadJobStatus);
-function loadJobStatus() {
-    $(".job-status").each((index, job) => {
-        const jobID = job.dataset.jobid
-        const repoPath = job.dataset.repopath
-        const versionname = job.dataset.version
-        const status_text = $(`#${jobID}-text`).text()
-        const finalState = ['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED']
-        if(finalState.includes(status_text)){
-            return 
-        }
-        $.get(`/api/v1/repos/${repoPath}/modelarts/inference-job/${jobID}?version_name=${versionname}`, (data) => {
-            const jobID = data.JobID
-            const status = data.JobStatus
-            const duration = data.JobDuration
-            $('#duration-'+jobID).text(duration)
-            if (status != job.textContent.trim()) {
-                $('#' + jobID+'-icon').removeClass().addClass(status)
-                $('#' + jobID+ '-text').text(status)
-                finalState.includes(status) && $('#' + jobID + '-stop').removeClass('blue').addClass('disabled')
-            }
-            
-        }).fail(function(err) {
-            console.log(err);
-        });
-    });
-};
-function getModelInfo(ID,version,JobName){
-    $.get("{{$.RepoLink}}/modelmanage/show_model_info_api?name="+ID,(data)=>{
-        if(data.length===0){
-            $(`#${JobName}`).popup('toggle')
-        }else{
-            let versionData = data.filter((item)=>{
-                return item.Version === version
-            })
-            if(versionData.length==0){
-                $(`#${JobName}`).popup('toggle')
-            }
-            else{
-                location.href = "{{$.RepoLink}}/modelmanage/show_model_info?name="+ID
-            }
-        }
-    })
-
-}
-function deleteVersion(version_name,jobID){
-    const url = '/api/v1/repos/{{$.RepoRelPath}}/modelarts/inference-job/'+jobID+'/del_version'
-    $.post(url,{version_name:version_name},(data)=>{
-        if(data.StatusOK===0){
-            location.reload()
-        }
-    }).fail(function(err) {
-        console.log(err);	            
-    });
-}
-function stopVersion(version_name,jobID){
-    const url = '/api/v1/repos/{{$.RepoRelPath}}/modelarts/inference-job/'+jobID+'/stop_version'
-    $.post(url,{version_name:version_name},(data)=>{
-        if(data.StatusOK===0){
-            $('#'+version_name+'-stop').removeClass('blue')
-            $('#'+version_name+'-stop').addClass('disabled')
-            refreshStatus(version_name,jobID)
-        }
-    }).fail(function(err) {
-        console.log(err);	            
-    });
-}
-function refreshStatus(version_name,jobID){
-
-    const url = '/api/v1/repos/{{$.RepoRelPath}}/modelarts/inference-job/'+jobID+'?version_name='+version_name
-    $.get(url,(data)=>{
-        
-        
-        $(`#${jobID}-icon`).attr("class",data.JobStatus)
-        // detail status and duration
-        
-        $(`#${jobID}-text`).text(data.JobStatus)
 
-
-    }).fail(function(err) {
-        console.log(err);
-    });
-}
-function assertDelete(obj,version_name,jobID) {
-    if (obj.style.color == "rgb(204, 204, 204)") {
-        return
-    } else {
-        // var delId = obj.parentNode.id
-        flag = 1;
-        $('.ui.basic.modal')
-            .modal({
-                onDeny: function() {
-                    flag = false
-                },
-                onApprove: function() {
-                    // document.getElementById(delId).submit()
-                    deleteVersion(version_name,jobID)
-                    flag = true
-                },
-                onHidden: function() {
-                    if (flag == false) {
-                        $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
-                    }
-                }
-            })
-            .modal('show')
-    }
-}
-</script>

templates/repo/modelarts/trainjob/index.tmpl

@@ -113,7 +113,7 @@
                                 </div>
                                 <!-- 任务状态 -->
                                 <div class="two wide column padding0" style="padding-left: 2.2rem !important;">
-                                    <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}" data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
+                                    <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}/modelarts/train-job" data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
                                             <span><i id="{{.JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i><span  id="{{.JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
                                 </div>
@@ -143,11 +143,11 @@
                                     <div class="ui compact buttons">
                                         {{$.CsrfTokenHtml}}
                                         {{if .CanDel}}
-                                        <a style="padding: 0.5rem 1rem;" id="{{.JobID}}-stop" class="ui basic {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{else}} blue {{end}}button" onclick="stopVersion({{.VersionName}},{{.JobID}})">
+                                        <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class="ui basic ai_stop_version {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{else}} blue {{end}}button" data-repopath="{{$.RepoRelPath}}/modelarts/train-job" data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
                                             {{$.i18n.Tr "repo.stop"}}
                                         </a>
                                         {{else}}
-                                        <a style="padding: 0.5rem 1rem;" id="{{.JobID}}-stop" class="ui basic disabled button">
+                                        <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class="ui basic disabled button">
                                                 {{$.i18n.Tr "repo.stop"}}
                                         </a>
                                         {{end}}
@@ -157,7 +157,7 @@
                                     <form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
                                         {{$.CsrfTokenHtml}}
                                         {{if .CanDel}}
-                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="model-delete-{{.JobID}}" class="ui basic blue button" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
+                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="model-delete-{{.JobID}}" class="ui basic ai_delete blue button" style="border-radius: .28571429rem;">
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                         {{else}}
@@ -204,161 +204,5 @@
         </div>
     </div>
 </div>
-
 </div>
-{{template "base/footer" .}}
-
-<script>
-    // 调试和评分新开窗口
-    function stop(obj) {
-        if (obj.style.color != "rgb(204, 204, 204)") {
-            obj.target = '_blank'
-        } else {
-            return
-        }
-    }
-
-    // 删除时用户确认
-    function assertDelete(obj) {
-        if (obj.style.color == "rgb(204, 204, 204)") {
-            return
-        } else {
-            var delId = obj.parentNode.id
-            flag = 1;
-            $('.ui.basic.modal')
-                .modal({
-                    onDeny: function() {
-                        flag = false
-                    },
-                    onApprove: function() {
-                        document.getElementById(delId).submit()
-                        flag = true
-                    },
-                    onHidden: function() {
-                        if (flag == false) {
-                            $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
-                        }
-                    }
-                })
-                .modal('show')
-        }
-    }
-    function runtime(time){
-                    if(time){
-                        let hours = time/3600000<10 ? "0"+parseInt(time/3600000):parseInt(time/3600000)
-                        let miuns = time%3600000/60000<10 ? "0"+parseInt(time%3600000/60000):parseInt(time%3600000/60000)
-                        let seconds = time%60000/1000<10 ? "0"+parseInt(time%60000/1000):parseInt(time%60000/1000)
-                        return hours + ":" + miuns + ":" + seconds
-                    }else{
-                        return "00:00:00"
-                    }
-    }
-
-    // 加载任务状态
-    var timeid = window.setInterval(loadJobStatus, 15000);
-    $(document).ready(loadJobStatus);
-    function loadJobStatus() {
-        $(".job-status").each((index, job) => {
-            const jobID = job.dataset.jobid
-            const repoPath = job.dataset.repopath
-            const versionname = job.dataset.version
-            const status_text = $(`#${jobID}-text`).text()
-            const finalState = ['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED']
-            if(finalState.includes(status_text)){
-                return 
-            }
-            $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => {
-                const jobID = data.JobID
-                const status = data.JobStatus
-                const duration = data.JobDuration
-                $('#duration-'+jobID).text(duration)
-                if (status != job.textContent.trim()) {
-                    $('#' + jobID+'-icon').removeClass().addClass(status)
-                    $('#' + jobID+ '-text').text(status)
-                    finalState.includes(status) && $('#' + jobID + '-stop').removeClass('blue').addClass('disabled')
-
-                }
-                
-            }).fail(function(err) {
-                console.log(err);
-            });
-        });
-    };
-    
-    // 获取弹窗
-    var modal = document.getElementById('imageModal');
-
-    // 打开弹窗的按钮对象
-    var btns = document.getElementsByClassName("imageBtn");
-
-    // 获取 <span> 元素，用于关闭弹窗
-    var spans = document.getElementsByClassName('close');
-
-    // 点击按钮打开弹窗
-    for (i = 0; i < btns.length; i++) {
-        btns[i].onclick = function() {
-            modal.style.display = "block";
-        }
-    }
-
-    // 点击 <span> (x), 关闭弹窗
-    for (i = 0; i < spans.length; i++) {
-        spans[i].onclick = function() {
-            modal.style.display = "none";
-        }
-    }
-
-    // 在用户点击其他地方时，关闭弹窗
-    window.onclick = function(event) {
-        if (event.target == modal) {
-            modal.style.display = "none";
-        }
-    }
-    function stopVersion(version_name,jobID){
-        const url = '/api/v1/repos/{{$.RepoRelPath}}/modelarts/train-job/'+jobID+'/stop_version'
-        $.post(url,{version_name:version_name},(data)=>{
-            if(data.StatusOK===0){
-                $('#'+version_name+'-stop').removeClass('blue')
-                $('#'+version_name+'-stop').addClass('disabled')
-                refreshStatus(version_name,jobID)
-            }
-        }).fail(function(err) {
-            console.log(err);	            
-        });
-    }
-    function refreshStatus(version_name,jobID){
-
-        const url = '/api/v1/repos/{{$.RepoRelPath}}/modelarts/train-job/'+jobID+'?version_name='+version_name
-        $.get(url,(data)=>{
-            
-            
-            $(`#${jobID}-icon`).attr("class",data.JobStatus)
-            // detail status and duration
-            
-            $(`#${jobID}-text`).text(data.JobStatus)
-
-
-        }).fail(function(err) {
-            console.log(err);
-        });
-        
-    }
-    // 显示弹窗，弹出相应的信息
-    function showmask() {
-        $('#imageModal').css('display', 'none')
-        $('#mask').css('display', 'block')
-
-        $("iframe[name=iframeContent]").on("load", function() {　　
-            var responseText = $("iframe")[0].contentDocument.body.getElementsByTagName("pre")[0].innerHTML;　
-            var json1 = JSON.parse(responseText)
-            $('#mask').css('display', 'none')
-            parent.location.href
-
-            if (json1.result_code === "0") {
-                $('.alert').html('操作成功!').removeClass('alert-danger').addClass('alert-success').show().delay(1500).fadeOut();
-            } else {
-                $('.alert').html(json1.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(5000).fadeOut();
-            }
-        })
-    }
-</script>
+{{template "base/footer" .}}

templates/repo/modelarts/trainjob/show.tmpl

@@ -518,6 +518,7 @@ td, th {
             
         </div>
 </div>
+</div>
 {{template "base/footer" .}}
 
 <script>

web_src/js/features/cloudrbanin.js

@@ -0,0 +1,236 @@
+export default async function initCloudrain() {
+    let timeid = window.setInterval(loadJobStatus, 15000);
+    $(document).ready(loadJobStatus);
+    function loadJobStatus() {
+        $(".job-status").each((index, job) => {
+            const jobID = job.dataset.jobid;
+            const repoPath = job.dataset.repopath;
+            // const computeResource = job.dataset.resource
+            const versionname = job.dataset.version
+            const status_text = $(`#${jobID}-text`).text()
+            console.log(versionname)
+            const finalState = ['STOPPED','CREATE_FAILED','UNAVAILABLE','DELETED','RESIZE_FAILED','SUCCEEDED','IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED']
+            if (finalState.includes(status_text)) {
+                return
+            }
+            // const diffResource = computeResource == "NPU" ? 'modelarts/notebook' : 'cloudbrain'
+            $.get(`/api/v1/repos/${repoPath}/${jobID}?version_name=${versionname}`, (data) => {
+                const jobID = data.JobID
+                const status = data.JobStatus
+                const duration = data.JobDuration
+                $('#duration-'+jobID).text(duration)
+                if (status != status_text) {
+                    $('#' + jobID+'-icon').removeClass().addClass(status)
+                    $('#' + jobID+ '-text').text(status)
+                    finalState.includes(status) && $('#' + jobID + '-stop').removeClass('blue').addClass('disabled')
+                }
+                if(status==="RUNNING"){
+                    $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem")
+                    $('#model-image-'+jobID).removeClass('disabled').addClass('blue')
+                }
+                if(status!=="RUNNING"){
+                    // $('#model-debug-'+jobID).removeClass('blue')
+                    // $('#model-debug-'+jobID).addClass('disabled')
+                    $('#model-image-'+jobID).removeClass('blue').addClass('disabled')
+                }
+                if(["CREATING","STOPPING","WAITING","STARTING"].includes(status)){
+                    $('#ai-debug-'+jobID).removeClass('blue').addClass('disabled')
+                }
+                if(['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'].includes(status)){
+                    $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0") 
+                }
+                if(["RUNNING","WAITING"].includes(status)){
+                    $('#ai-stop-'+jobID).removeClass('disabled').addClass('blue')
+                }
+                if(["CREATING","STOPPING","STARTING","STOPPED","FAILED","START_FAILED","SUCCEEDED"].includes(status)){
+                    $('#ai-stop-'+jobID).removeClass('blue').addClass('disabled')
+                }
+                
+                if(["STOPPED","FAILED","START_FAILED","KILLED","COMPLETED","SUCCEEDED"].includes(status)){
+                    $('#ai-delete-'+jobID).removeClass('disabled').addClass('blue')
+                }else{
+                    $('#ai-delete-'+jobID).removeClass('blue').addClass('disabled')
+                }
+            }).fail(function(err) {
+                console.log(err);
+            });
+        });
+    };
+    function assertDelete(obj,versionName,repoPath) {
+        if (obj.style.color == "rgb(204, 204, 204)") {
+            return
+        } else {
+            const delId = obj.parentNode.id
+            let flag = 1;
+            $('.ui.basic.modal')
+                .modal({
+                    onDeny: function() {
+                        flag = false
+                    },
+                    onApprove: function() {
+                        if(!versionName){
+                            document.getElementById(delId).submit()
+                        }
+                        else{
+                            deleteVersion(versionName,repoPath)
+                        }
+                        flag = true
+                    },
+                    onHidden: function() {
+                        if (flag == false) {
+                            $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
+                        }
+                    }
+                })
+                .modal('show')
+        }
+    }
+    function deleteVersion(versionName,repoPath){
+        const url = `/api/v1/repos/${repoPath}`
+        $.post(url,{version_name:versionName},(data)=>{
+            if(data.StatusOK===0){
+                location.reload()
+            }
+        }).fail(function(err) {
+            console.log(err);	            
+        });
+    }
+    $('.ui.basic.ai_delete').click(function() {
+        const repoPath = this.dataset.repopath
+        const versionName = this.dataset.version
+        if(repoPath && versionName){
+            assertDelete(this,versionName,repoPath)
+        }
+        else{
+            assertDelete(this)
+        }
+    })
+    function stopDebug(JobID,stopUrl){
+        $.ajax({
+            type:"POST",
+            url:stopUrl,
+            data:$('#stopForm-'+JobID).serialize(),
+            success:function(res){
+                if(res.result_code==="0"){
+                    $('#' + JobID+'-icon').removeClass().addClass(res.status)
+                    $('#' + JobID+ '-text').text(res.status)
+                    if(res.status==="STOPPED"){
+                        $('#ai-debug-'+JobID).removeClass('disabled').addClass('blue').text("再次调试").css("margin","0")
+                        $('#ai-image-'+JobID).removeClass('blue').addClass('disabled')
+                        $('#ai-model-debug-'+JobID).removeClass('blue').addClass('disabled')
+                        $('#ai-delete-'+JobID).removeClass('disabled').addClass('blue')
+                        $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
+                    }
+                    else{
+                        $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
+                        $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
+                    }
+                    
+                }else{
+                    $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
+                }
+            },
+            error :function(res){
+                console.log(res)
+        
+            }
+        })
+    }
+    $('.ui.basic.ai_stop').click(function() {
+        const jobID = this.dataset.jobid
+        const repoPath = this.dataset.repopath
+        stopDebug(jobID,repoPath)
+    })
+
+    function stopVersion(version_name,jobID,repoPath){
+        const url = `/api/v1/repos/${repoPath}/${jobID}/stop_version`
+        $.post(url,{version_name:version_name},(data)=>{
+            if(data.StatusOK===0){
+                $('#ai-stop-'+jobID).removeClass('blue')
+                $('#ai-stop-'+jobID).addClass('disabled')
+                refreshStatus(version_name,jobID,repoPath)
+            }
+        }).fail(function(err) {
+            console.log(err);	            
+        });
+    }
+    function refreshStatus(version_name,jobID,repoPath){
+    
+        const url = `/api/v1/repos/${repoPath}/${jobID}/?version_name${version_name}`
+        $.get(url,(data)=>{
+            $(`#${jobID}-icon`).attr("class",data.JobStatus)
+            // detail status and duration
+            $(`#${jobID}-text`).text(data.JobStatus)
+        }).fail(function(err) {
+            console.log(err);
+        });
+    }
+    $('.ui.basic.ai_stop_version').click(function() {
+        const jobID = this.dataset.jobid
+        const repoPath = this.dataset.repopath
+        const versionName = this.dataset.version
+        stopVersion(versionName,jobID,repoPath)
+    })
+    function getModelInfo(repoPath,modelName,versionName,jobName){
+        console.log("getModelInfo")
+        $.get(`${repoPath}/modelmanage/show_model_info_api?name=${modelName}`,(data)=>{
+            if(data.length===0){
+                $(`#${jobName}`).popup('toggle')
+            }else{
+                let versionData = data.filter((item)=>{
+                    return item.Version === versionName
+                })
+                if(versionData.length==0){
+                    $(`#${jobName}`).popup('toggle')
+                }
+                else{
+                    location.href = `${repoPath}/modelmanage/show_model_info?name=${modelName}`
+                }
+            }
+        })
+    }
+    $('.goto_modelmanage').click(function() {
+        const repoPath = this.dataset.repopath
+        const modelName = this.dataset.modelname
+        const versionName = this.dataset.version
+        const jobName = this.dataset.jobname
+        getModelInfo(repoPath,modelName,versionName,jobName)
+    })
+    function debugAgain(JobID,debugUrl){
+        if($('#' + JobID+ '-text').text()==="RUNNING"){
+            window.open(debugUrl+'debug')
+        }else{
+            $.ajax({
+                type:"POST",
+                url:debugUrl+'restart',
+                data:$('#debugAgainForm-'+JobID).serialize(),
+                success:function(res){
+                    if(res.result_code==="0"){
+                        if(res.job_id!==JobID){
+                            location.reload()
+                        }else{
+                            $('#' + JobID+'-icon').removeClass().addClass(res.status)
+                            $('#' + JobID+ '-text').text(res.status)
+                            $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
+                            $('#ai-delete-'+JobID).removeClass('blue').addClass('disabled')
+                            $('#ai-debug-'+JobID).text("调试").css("margin","0 1rem")
+                        }
+                    }else{
+                        $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
+                    }
+                },
+                error :function(res){
+                    console.log(res)
+    
+                }
+            })
+        }
+    }
+    $('.ui.basic.ai_debug').click(function() {
+        const jobID = this.dataset.jobid
+        const repoPath = this.dataset.repopath
+        debugAgain(jobID,repoPath)
+    })
+}
+
+    

web_src/js/index.js

@@ -40,6 +40,7 @@ import EditTopics from './components/EditTopics.vue';
 import DataAnalysis from './components/DataAnalysis.vue'
 import Contributors from './components/Contributors.vue'
 import Model from './components/Model.vue';
+import initCloudrain from './features/cloudrbanin.js'
 
 
 Vue.use(ElementUI);
@@ -2937,6 +2938,7 @@ $(document).ready(async () => {
   initNotificationCount();
   initTribute();
   initDropDown();
+  initCloudrain();
 
   // Repo clone url.
   if ($('#repo-clone-url').length > 0) {

web_src/less/openi.less

@@ -720,4 +720,13 @@ display: block;
     .markdown:not(code).file-view{
         padding: 2em 0!important;
     }
-}
+}
+//elemet-ui
+
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+	background-color: #5bb973 !important; 
+	color: #FFF !important;
+  }
+  .el-pagination.is-background .el-pager li:hover {
+	color: #5bb973 !important;
+  }