提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

templates/repo/cloudbrain/show.tmpl

@@ -258,20 +258,58 @@ td, th {
                                                         </div>
                                                     </td>
                                                 </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                            {{$.i18n.Tr "repo.cloudbrain_creator"}}
+                                                        </td>
+
+                                                        <td class="ti-text-form-content">
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                                {{.User.Name}}
+                                                            </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" id="{{.VersionName}}-computeresource">
+                                                               CPU/GPU
+                                                            </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" id="{{.VersionName}}-computeresource">
+                                                               DEBUG
+                                                            </div>
+                                                        </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                            {{$.i18n.Tr "cloudbrain.gpu_type"}}
+                                                        </td>
+
+                                                        <td class="ti-text-form-content">
+                                                            <div class="text-span text-span-w">
+                                                                {{$.resource_type}}
+                                                            </div>
+                                                        </td>
+                                                </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_time"}}
+                                                        创建时间
                                                     </td>
 
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
                                                             <span style="font-size: 12px;" class="">
-                                                              {{if not (eq .StartTime 0)}}
-																 {{TimeSinceUnix1 .StartTime}}
-																{{else}}
 																{{TimeSinceUnix1 .CreatedUnix}}
-																{{end}}
                                                             </span>
                                                         </div>
                                                     </td>
@@ -287,132 +325,111 @@ td, th {
                                                         </div>
                                                     </td>
                                                 </tr>
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "cloudbrain.mirror"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
-                                                            {{.Image}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "cloudbrain.dataset_storage_path"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="dataset_storage_path">
-                                                           {{$.dataset_path}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-
-                                                 <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "cloudbrain.code_storage_path"}}
-                                                    </td>
+                                               
 
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="code_storage_path">
-                                                           {{$.code_path}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-                                                
+                                               
                                             </tbody>
                                         </table>
                                     </div>
                                     <div class="ac-grid-col">
                                             <table class="ti-form">
                                                 <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 "cloudbrain.mirror"}}
+                                                        </td>
 
-
+                                                        <td class="ti-text-form-content">
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                                {{.Image}}
+                                                            </div>
+                                                        </td>
+                                                    </tr>
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            {{$.i18n.Tr "cloudbrain.gpu_type"}}
+                                                         {{$.i18n.Tr "repo.modelarts.train_job.dataset"}}
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w">
-                                                                {{$.resource_type}}
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-BenchmarkTypeName">
+                                                                {{$.datasetname}}
                                                             </div>
                                                         </td>
                                                     </tr>
+                                                    
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                           ExitCode
+                                                                {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                         </td>
 
                                                         <td class="ti-text-form-content">
                                                             <div class="text-span text-span-w">
-                                                                {{$.result.JobStatus.AppExitCode}}
+                                                                {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
                                                             </div>
                                                         </td>
                                                     </tr>
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                         {{$.i18n.Tr "repo.cloudbrain.endtime"}}
+                                                            {{$.i18n.Tr "cloudbrain.dataset_storage_path"}}
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" id="{{.VersionName}}-BenchmarkTypeName">
-                                                                {{if not (eq .EndTime 0)}}
-																 {{TimeSinceUnix1 .EndTime}}
-																{{else}}
-                                                                    --
-																{{end}}
+                                                            <div class="text-span text-span-w" id="dataset_storage_path">
+                                                            {{$.dataset_path}}
                                                             </div>
                                                         </td>
                                                     </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.dataset"}}
+                                                            {{$.i18n.Tr "cloudbrain.model_storage_path"}}
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" id="{{.VersionName}}-BenchmarkTypeName">
-                                                                {{$.datasetname}}
+                                                            <div class="text-span text-span-w" id="model_storage_path">
+                                                            {{$.model_path}}
                                                             </div>
                                                         </td>
                                                     </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.standard"}}
+                                                            {{$.i18n.Tr "cloudbrain.code_storage_path"}}
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w">
-                                                                {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
+                                                            <div class="text-span text-span-w" id="code_storage_path">
+                                                            {{$.code_path}}
                                                             </div>
                                                         </td>
                                                     </tr>
-
+                                                
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            {{$.i18n.Tr "repo.cloudbrain_creator"}}
+                                                         开始运行时间
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
-                                                                {{.User.Name}}
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-BenchmarkTypeName">
+                                                                {{if not (eq .StartTime 0)}}
+																 {{TimeSinceUnix1 .StartTime}}
+																{{else}}
+                                                                 --
+																{{end}}
                                                             </div>
                                                         </td>
                                                     </tr>
-                                                    <tr class="ti-no-ng-animate">
+                                                    
+                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            {{$.i18n.Tr "cloudbrain.model_storage_path"}}
+                                                         结束运行时间
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" id="model_storage_path">
-                                                            {{$.model_path}}
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-BenchmarkTypeName">
+                                                                {{if not (eq .EndTime 0)}}
+																 {{TimeSinceUnix1 .EndTime}}
+																{{else}}
+                                                                    --
+																{{end}}
                                                             </div>
                                                         </td>
                                                     </tr>
@@ -490,7 +507,7 @@ td, th {
          let podEventArray = podEvents[task0];
          if(podEventArray != null){
              for(var i=0; i < podEventArray.length;i++){
-                 html +="<p>" +podEventArray[i]["reason"] +  "</p>";
+                 html +="<p>[" +podEventArray[i]["reason"] +  "]</p>";
                  html +="<p>" +podEventArray[i]["message"] +  "</p>";
                  html +="<p>" +podEventArray[i]["action"] +  "</p>";
              }
@@ -498,7 +515,7 @@ td, th {
          let extras= jsonObj["extras"];
          if(extras != null){
             for(var i=0; i < extras.length;i++){
-                 html +="<p>" +extras[i]["reason"] +  "</p>";
+                 html +="<p>[" +extras[i]["reason"] +  "]</p>";
                  html +="<p>" +extras[i]["message"] +  "</p>";
                  html +="<p>" +extras[i]["action"] +  "</p>";
             }