Merge pull request '修复若干训练任务的Bug' (#945) from liuzx_trainjob into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/945
Reviewed-by: liuzx <liuzx@pcl.ac.cn>

routers/repo/modelarts.go

@@ -1011,6 +1011,9 @@ func TrainJobShow(ctx *context.Context) {
 		}
 	}
 
+	pager := context.NewPagination(VersionListCount, setting.UI.IssuePagingNum, page, 5)
+	pager.SetDefaultParams(ctx)
+	ctx.Data["Page"] = pager
 	ctx.Data["jobID"] = jobID
 	ctx.Data["jobName"] = VersionListTasks[0].JobName
 	ctx.Data["version_list_task"] = VersionListTasks

templates/repo/cloudbrain/show.tmpl

@@ -11,7 +11,7 @@
                 {{.i18n.Tr "repo.cloudbrain"}}
             </a>
             <div class="divider"> / </div>
-            <a class="section" href="{{.RepoLink}}/modelarts/notebook">
+            <a class="section" href="{{.RepoLink}}/cloudbrain">
                 {{$.i18n.Tr "repo.modelarts.notebook"}}
             </a>
             <div class="divider"> / </div>

templates/repo/modelarts/trainjob/show.tmpl

@@ -87,7 +87,7 @@
     padding-right: 20px;
     color: #8a8e99;
     font-size: 12px;
-    white-space: nowrap;
+    white-space: nowrap !important;
     width: 80px;
     line-height: 30px;
 }
@@ -103,6 +103,7 @@ td, th {
     padding: 0;
 }
 .ac-grid-col .text-span {
+    width: 450px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -212,10 +213,10 @@ td, th {
                                     <span class="cti-mgRight-sm">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>   
                                     <span class="cti-mgRight-sm"> {{$.i18n.Tr "repo.modelarts.current_version"}}：{{.VersionName}}</span>
                                     <span class="cti-mgRight-sm">  {{$.i18n.Tr "repo.modelarts.parent_version"}}：{{.PreVersionName}}</span>
-                                    <span class="cti-mgRight-sm ac-text-normal title_text">{{$.i18n.Tr "repo.modelarts.status"}}：
+                                    <span class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.status"}}：
                                         <span id="{{.VersionName}}-status-span"><i id="icon" style="vertical-align: middle;" class="{{.Status}}"></i><span id="text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
-                                    <span class="ac-text-normal title_text">{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}：</span>
+                                    <span class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}：</span>
                                     <span class="cti-mgRight-sm uc-accordionTitle-black" id="{{.VersionName}}-duration-span">{{.TrainJobDuration}}</span>
                                     <span data-tooltip="刷新" style="cursor: pointer;" data-inverted="" onclick="refreshStatus({{.VersionName}})"><i class="redo icon redo-color"></i></span>
 
@@ -368,12 +369,12 @@ td, th {
                                                         </td>
                                                     </tr>
                                                     <tr class="ti-no-ng-animate">
-                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80" >
                                                             {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} 
                                                         </td>
                 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w">
+                                                            <div class="text-span text-span-w" title="{{.Parameters}}">
                                                                 {{.Parameters}}
                                                             </div>
                                                         </td>
@@ -395,7 +396,7 @@ td, th {
                                                         </td>
                 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w">
+                                                            <div class="text-span text-span-w" title="{{.Cloudbrain.Description}}">
                                                                 {{.Cloudbrain.Description}}
                                                             </div>
                                                         </td>
@@ -410,7 +411,7 @@ td, th {
                     </div>
                     <div class="ui tab" data-tab="second{{$k}}">
                         <div>
-                            <div class="ui message{{.VersionName}}" style="display: none;">
+                            <div class="ui message message{{.VersionName}}" style="display: none;">
                                 <div id="header"></div>
                             </div>
                             <div class="ui top attached segment" style="background: #f0f0f0;">
@@ -449,7 +450,7 @@ td, th {
                 </div>
             </div>
         </div>
-        {{end}}
+        {{end}} {{template "base/paginate" .}}
     </div>
     <!-- 确认模态框 -->
     <div id="deletemodel">

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -339,7 +339,7 @@
 {{template "base/footer" .}}
 
 <script>
-    let url_href = {{.RepoLink}}+'/modelarts/train-job'
+    let url_href = location.pathname.split('create_version')[0]
     let url_post = location.pathname
     let version_name = location.search.split('?version_name=')[1]
     $("#parents_version").val(version_name)