From b6e238fd401d8440bc1005f153ba2b64f462976a Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 14 Dec 2021 10:54:04 +0800
Subject: [PATCH] fix issue

---
 templates/repo/modelarts/trainjob/index.tmpl | 12 +++----
 templates/repo/modelarts/trainjob/show.tmpl  | 53 ++++++++--------------------
 templates/repo/modelmanage/showinfo.tmpl     |  3 +-
 3 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl
index 2282464d7..0f8f23490 100755
--- a/templates/repo/modelarts/trainjob/index.tmpl
+++ b/templates/repo/modelarts/trainjob/index.tmpl
@@ -137,10 +137,10 @@
                                 </div>
 
                                 <div class="three wide column text center padding0">
-                                    <!-- 删除任务 -->
+                                    <!-- 停止任务 -->
                                     <div class="ui compact buttons">
                                         {{$.CsrfTokenHtml}}
-                                        {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
+                                        {{if .CanDel}}
                                         <a style="padding: 0.5rem 1rem;" id="{{.VersionName}}-stop" class="ui basic {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{else}} blue {{end}}button" onclick="stopVersion({{.VersionName}},{{.JobID}})">
                                             {{$.i18n.Tr "repo.stop"}}
                                         </a>
@@ -151,15 +151,16 @@
                                         {{end}}
 
                                     </div>
+                                    <!-- 删除任务 -->
                                     <form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
                                         {{$.CsrfTokenHtml}}
-                                        {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
+                                        {{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;">
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                         {{else}}
-                                        <a  style="padding: 0.5rem 1rem;margin-left:0.2rem" class="ui basic button disabled" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
-                                                {{$.i18n.Tr "repo.delete"}}
+                                        <a  style="padding: 0.5rem 1rem;margin-left:0.2rem" class="ui basic button disabled"  style="border-radius: .28571429rem;">
+                                            {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                         {{end}}
                                     </form>
@@ -206,7 +207,6 @@
 {{template "base/footer" .}}
 
 <script>
-
     console.log({{.Tasks}})
     // 调试和评分新开窗口
     function stop(obj) {
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 83bbfe971..67150e682 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -165,7 +165,6 @@ td, th {
 {{template "repo/header" .}}
     <div class="ui container">
         <h4 class="ui header" id="vertical-segment">
-            <!-- <a href="javascript:window.history.back();"><i class="arrow left icon"></i>返回</a> -->
             <div class="ui breadcrumb">
                 <a class="section" href="{{.RepoLink}}/cloudbrain">
                     {{.i18n.Tr "repo.cloudbrain"}}
@@ -187,22 +186,21 @@ td, th {
                         <span class="accordion-panel-title-content">
                             <span>
                                 <div style="float: right;">
-                                    <!-- <a class="ti-action-menu-item {{if ne .Status "COMPLETED"}}disabled {{end}}">创建模型</a> -->
                                     {{$.CsrfTokenHtml}}
-                                    {{if $.canNewJob}}
+                                    {{if .CanModify}}
                                     <a class="ti-action-menu-item" href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/create_version?version_name={{.VersionName}}">{{$.i18n.Tr "repo.modelarts.modify"}}</a>
                                     {{else}}
                                     <a class="ti-action-menu-item disabled" href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/create_version?version_name={{.VersionName}}">{{$.i18n.Tr "repo.modelarts.modify"}}</a>
                                     {{end}}
                                     {{$.CsrfTokenHtml}}
-                                    {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
+                                    {{if .CanDel}}
                                     <a class="ti-action-menu-item {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{end}}" id="{{.VersionName}}-stop" onclick="stopVersion({{.VersionName}})">{{$.i18n.Tr "repo.stop"}}</a>
                                     {{else}}
                                     <a class="ti-action-menu-item disabled" id="{{.VersionName}}-stop" onclick="stopVersion({{.VersionName}})">{{$.i18n.Tr "repo.stop"}}</a>
                                     {{end}}
                                     
                                     {{$.CsrfTokenHtml}}
-                                    {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
+                                    {{if .CanDel}}
                                     <a class="ti-action-menu-item"  onclick="deleteVersion({{.VersionName}})" style="color: #FF4D4F;">{{$.i18n.Tr "repo.delete"}}</a>
                                     {{else}}
                                     <a class="ti-action-menu-item disabled"  onclick="deleteVersion({{.VersionName}})" style="color: #FF4D4F;">{{$.i18n.Tr "repo.delete"}}</a>
@@ -243,12 +241,11 @@ td, th {
                                             <tbody class="ti-text-form">
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            {{$.i18n.Tr "repo.cloudbrain_task"}}
+                                                        {{$.i18n.Tr "repo.cloudbrain_task"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
-                                                                {{.JobName}}
+                                                            {{.JobName}}
                                                         </div>
                                                     </td>
                                                 </tr>
@@ -259,7 +256,7 @@ td, th {
 
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w" id="{{.VersionName}}-status">
-                                                                {{.Status}}
+                                                            {{.Status}}
                                                         </div>
                                                     </td>
                                                 </tr>
@@ -270,7 +267,7 @@ td, th {
         
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
-                                                                {{.VersionName}}
+                                                            {{.VersionName}}
                                                         </div>
                                                     </td>
                                                 </tr>
@@ -287,7 +284,7 @@ td, th {
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} 
+                                                        {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} 
                                                     </td>
         
                                                     <td class="ti-text-form-content">
@@ -309,9 +306,8 @@ td, th {
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} 
+                                                        {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} 
                                                     </td>
-        
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
                                                             {{.WorkServerNumber}}
@@ -326,9 +322,8 @@ td, th {
                                                 <tbody class="ti-text-form">
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                                {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} 
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} 
                                                         </td>
-    
                                                         <td class="ti-text-form-content">
                                                             <div class="text-span text-span-w">
                                                             {{.EngineName}}
@@ -348,12 +343,12 @@ td, th {
                                                     </tr>
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                                {{$.i18n.Tr "repo.modelarts.train_job.start_file"}}
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.start_file"}}
                                                         </td>
             
                                                         <td class="ti-text-form-content">
                                                             <div class="text-span text-span-w">
-                                                                    {{.BootFile}}
+                                                                {{.BootFile}}
                                                             </div>
                                                         </td>
                                                     </tr>
@@ -379,17 +374,7 @@ td, th {
                                                             </div>
                                                         </td>
                                                     </tr>
-                                                    <!-- <tr class="ti-no-ng-animate">
-                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            训练输出位置
-                                                        </td>
-                
-                                                        <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w">
-                                                                {{.TrainUrl}}
-                                                            </div>
-                                                        </td>
-                                                    </tr> -->
+                                                    </tr>
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                             {{$.i18n.Tr "repo.modelarts.train_job.description"}}  
@@ -414,15 +399,7 @@ td, th {
                             <div class="ui message message{{.VersionName}}" style="display: none;">
                                 <div id="header"></div>
                             </div>
-                            <!-- <div class="ui top attached segment" style="background: #f0f0f0;">
-                                <div class="center aligned">
-                                    <label>{{$.i18n.Tr "repo.modelarts.log"}}:</label>
-                                        
-                                        
-                                </div>
-                            </div> -->
                             <div class="ui attached  log" onscroll="logScroll({{.VersionName}})" id="log{{.VersionName}}" style="height: 300px !important; overflow: auto;">
-                                <!-- <input type="hidden" class="version_name" name="version_name" value={{.VersionName}}> -->
                                 <input type="hidden"  name="end_line" value>
                                 <input type="hidden"  name="start_line" value>
                                 <pre id="log_file{{.VersionName}}"></pre>
@@ -473,8 +450,8 @@ td, th {
 {{template "base/footer" .}}
 
 <script>
+    console.log({{.version_list_task}})
     $('.menu .item').tab()
-    // $('.ui.style.accordion').accordion();
 
     $(document).ready(function(){
     $('.ui.accordion').accordion({selector:{trigger:'.icon'}});
@@ -501,8 +478,6 @@ td, th {
             e.cancelBubble = true;   //ie兼容
         }
     }
-    // let timeid = window.setInterval(refreshStatus(version_name), 30000);
-    // document.ready(refreshStatus(version_name))
     let timeid = window.setInterval(loadJobStatus, 30000);
     $(document).ready(loadJobStatus);
     
diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index c10400bb2..d522d9bca 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -254,7 +254,8 @@ function renderInfo(obj,accObj,id){
             if(obj[key]==='--'){
                 $('#Label').text(obj[key])
             }else{
-                let labelArray = obj[key].trim().split(' ')
+                
+                let labelArray = obj[key].trim().replace(/ +/g,' ').split(' ')
                 let html=''
                 for(let i=0;i<labelArray.length;i++){
                     html += `<a class="ui label">${labelArray[i]}</a>`