Merge branch 'inference-job' of https://git.openi.org.cn/OpenI/aiforge into inference-job

options/locale/locale_zh-CN.ini

@@ -942,7 +942,7 @@ modelarts.train_job_para_admin=任务参数管理
 modelarts.train_job_para.edit=编辑
 modelarts.train_job_para.connfirm=确定
 
-modelarts.infer_job_model = 模型
+modelarts.infer_job_model = 模型名称
 modelarts.infer_job_model_file = 模型文件
 modelarts.infer_job = 推理任务
 modelarts.infer_job.model_version = 模型/版本

templates/repo/modelarts/inferencejob/show.tmpl

@@ -266,9 +266,9 @@ td, th {
                                                 </td>
     
                                                 <td class="ti-text-form-content">
-                                                    <div class="text-span text-span-w" id="{{.VersionName}}-desc">
+                                                    <div class="text-span text-span-w" id="{{.VersionName}}-desc" style="width: 380px;">
                                                         {{if .Description}}
-                                                        <span>{{.Description}}</span>
+                                                        <span title="{{.Description}}">{{.Description}}</span>
                                                         {{else}}
                                                         <span>--</span>
                                                         {{end}}
@@ -308,8 +308,8 @@ td, th {
                                                     </td>
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
-                                                        <span style="color: #8a8e99">名称：</span><span>testTrainJob1_model_5d21</span>&nbsp;&nbsp;
-                                                        <span style="color: #8a8e99">版本：</span><span>asdasdasd</span>&nbsp;&nbsp;
+                                                        <span>{{.ModelName}}</span>&nbsp;&nbsp;
+                                                        <span style="color: #8a8e99">{{$.i18n.Tr "repo.modelarts.version"}}：</span><span>{{.ModelVersion}}</span>&nbsp;&nbsp;
                                                         
                                                         </div>
                                                     </td>
@@ -367,7 +367,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.infer_dataset "}}   
+                                                        {{$.i18n.Tr "repo.modelarts.infer_dataset"}}   
                                                     </td>
             
                                                     <td class="ti-text-form-content">
@@ -469,6 +469,7 @@ td, th {
 </div>
 {{template "base/footer" .}}
 <script>
+    console.log({{.task}})
 $(document).ready(function(){
     $('.secondary.menu .item').tab();
 });

templates/repo/modelarts/trainjob/show.tmpl

@@ -196,11 +196,12 @@ td, th {
                             <span>
                                 <div style="float: right;">
                                     {{$.CsrfTokenHtml}}
-                                    {{if and (.CanModify) (eq .Status "COMPLETED")}}
+                                    <!-- {{if and (.CanModify) (eq .Status "COMPLETED")}}
                                     <a class="ti-action-menu-item" onclick="showcreate({{.}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{else}}
                                     <a class="ti-action-menu-item disabled">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
-                                    {{end}}
+                                    {{end}} -->
+                                    <a class="ti-action-menu-item" onclick="showcreate({{.}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{$.CsrfTokenHtml}}
                                     {{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>
@@ -521,6 +522,7 @@ td, th {
 {{template "base/footer" .}}
 
 <script>
+    console.log({{.version_list_task}})
     $('.menu .item').tab()
 
     $(document).ready(function(){