From 1dbca4f090cd53762cd486349dac3004ab8215e5 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 31 Oct 2022 10:59:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20issue=20=E5=85=B3=E4=BA=8E=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E6=9F=A5=E7=9C=8B=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/custom/max_log.tmpl | 11 +++++++-- templates/repo/cloudbrain/benchmark/show.tmpl | 11 +++++---- templates/repo/cloudbrain/inference/show.tmpl | 11 +++++---- templates/repo/cloudbrain/trainjob/show.tmpl | 11 +++++---- templates/repo/grampus/trainjob/show.tmpl | 5 +++- templates/repo/modelarts/inferencejob/show.tmpl | 11 +++++---- templates/repo/modelarts/trainjob/show.tmpl | 5 +++- templates/repo/modelarts/trainjob/version_new.tmpl | 7 ++++-- templates/repo/modelsafety/show.tmpl | 9 ++++--- web_src/js/features/cloudbrainShow.js | 28 ++++++++++++++++++---- 10 files changed, 80 insertions(+), 29 deletions(-) diff --git a/templates/custom/max_log.tmpl b/templates/custom/max_log.tmpl index 978274f4e..5e4a99905 100644 --- a/templates/custom/max_log.tmpl +++ b/templates/custom/max_log.tmpl @@ -2,14 +2,21 @@
-
+
+ + + +
+ + +
-
+
diff --git a/templates/repo/cloudbrain/benchmark/show.tmpl b/templates/repo/cloudbrain/benchmark/show.tmpl index de68a3241..faef41a8b 100755 --- a/templates/repo/cloudbrain/benchmark/show.tmpl +++ b/templates/repo/cloudbrain/benchmark/show.tmpl @@ -531,19 +531,22 @@ {{$.i18n.Tr "repo.modelarts.download_log"}} -
+
- {{$.i18n.Tr "repo.modelarts.download_log"}} + {{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}
- - diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl index fe127b89d..22dec1611 100644 --- a/templates/repo/cloudbrain/inference/show.tmpl +++ b/templates/repo/cloudbrain/inference/show.tmpl @@ -542,7 +542,10 @@ {{$.i18n.Tr "repo.modelarts.download_log"}} -
+
{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}
@@ -550,11 +553,11 @@
- - @@ -570,7 +573,7 @@ - + 

                              

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index ac08f5f5b..44ac57319 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -531,18 +531,21 @@
                                 
                                 {{$.i18n.Tr "repo.modelarts.download_log"}}
                             
-                            

+                            

                                 
                                 {{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}
                             

                         

                         

                             
-                                
                             
                             
-                                
                             
@@ -558,7 +561,7 @@
                                 
                                 
                                 
-                                	                                
+                                
                                 
                                 

                             

diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index 0813cf477..b78819eec 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -527,7 +527,10 @@
                                 
                                 {{$.i18n.Tr "repo.modelarts.download_log"}}
                             
-                            

+                            

                                 
                                 {{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}
                             

diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl
index 98240fbd4..10a2d8ea7 100644
--- a/templates/repo/modelarts/inferencejob/show.tmpl
+++ b/templates/repo/modelarts/inferencejob/show.tmpl
@@ -467,18 +467,21 @@ td, th {
                                     
                                     {{$.i18n.Tr "repo.modelarts.download_log"}}
                                 
-                                

+                                

                                     
                                     {{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}
                                 

                             

                             

                                     
-                                        
                                     
                                     
-                                        
                                     
@@ -493,7 +496,7 @@ td, th {
                                     
                                     
                                     
-                                    	                                
+                                    
                                     
                                     

                                 

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 74c124e76..938470fd2 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -555,7 +555,10 @@
                                 
                                 {{$.i18n.Tr "repo.modelarts.download_log"}}
                             
-                            

+                            

                                 
                                 {{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}
                             

diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl
index a65537260..4ebc5ed10 100644
--- a/templates/repo/modelarts/trainjob/version_new.tmpl
+++ b/templates/repo/modelarts/trainjob/version_new.tmpl
@@ -56,7 +56,10 @@
     {{template "repo/header" .}}
     

         
-        {{template "base/alert" .}}
+        {{if eq .NotStopTaskCount 0}}
+            {{template "base/alert" .}}
+        {{end}}
+        {{template "custom/alert_cb" .}}
         

             {{.i18n.Tr "repo.modelarts.train_job.new"}}
         

@@ -260,7 +263,7 @@
                 

 
                 

-                    
                     {{.i18n.Tr "repo.cloudbrain.cancel"}}
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index 1f0d2d3aa..dfd5dc923 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -474,7 +474,10 @@
                               
                               {{$.i18n.Tr "repo.modelarts.download_log"}}
                           
-                          

+                          

                               
                               {{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}
                           

@@ -482,11 +485,11 @@
                         

                              
-                                 
                              
                              
-                                 
                              
diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js
index d3338523d..449100485 100644
--- a/web_src/js/features/cloudbrainShow.js
+++ b/web_src/js/features/cloudbrainShow.js
@@ -41,7 +41,6 @@ export default async function initCloudrainSow() {
           if (data.Lines == 0) {
             if (max) {
               $("body").toast({
-                class: "info",
                 message: `您已翻阅至日志底部,请稍后再试！`,
               });
             } else {
@@ -88,7 +87,6 @@ export default async function initCloudrainSow() {
           if (data.Lines == 0) {
             if (max) {
               $("body").toast({
-                class: "info",
                 message: `您已翻阅至日志顶部,请稍后再试！`,
               });
             } else {
@@ -167,7 +165,6 @@ export default async function initCloudrainSow() {
         if (data.Lines == 0) {
           if (max) {
             $("body").toast({
-              class: "info",
               message: `您已翻阅至日志顶部,请稍后再试！`,
             });
           } else {
@@ -212,10 +209,16 @@ export default async function initCloudrainSow() {
           $(`#${version_name}-log-down`)
             .removeClass("ti-download-file")
             .addClass("disabled");
+          $(`.max-full-log${version_name} #${version_name}-log-down`)
+            .removeClass("ti-download-file")
+            .addClass("disabled");
         } else {
           $(`#${version_name}-log-down`)
             .addClass("ti-download-file")
             .removeClass("disabled");
+          $(`.max-full-log${version_name} #${version_name}-log-down`)
+            .addClass("ti-download-file")
+            .removeClass("disabled");
         }
         $(`#log${version_name} input[name=end_line${max}]`).val(data.EndLine); //如果变动就改变所对应的值
         if ($(this)[0].hasAttribute("data-tab")) {
@@ -241,7 +244,6 @@ export default async function initCloudrainSow() {
             if (data.Lines == 0) {
               if (max) {
                 $("body").toast({
-                  class: "info",
                   message: `您已翻阅至日志底部,请稍后再试！`,
                 });
               } else {
@@ -318,6 +320,24 @@ export default async function initCloudrainSow() {
           $(".file-info #log-file-exit").text(
             $(".full-log-dialog").data("exit")
           );
+          $(".file-info .log-file-down").text(
+            $(".full-log-dialog").data("log-down")
+          );
+          $(".file-info .log-file-down").text(
+            $(".full-log-dialog").data("log-down")
+          );
+          $(`.max-full-log${version_name} #${version_name}-log-down`).attr(
+            "href",
+            $(".full-log-dialog").data("href")
+          );
+          $(`.max-full-log${version_name} .log_top-max`).attr(
+            "title",
+            $(".full-log-dialog").data("scroll-top")
+          );
+          $(`.max-full-log${version_name} .log_bottom-max`).attr(
+            "title",
+            $(".full-log-dialog").data("scroll-bottom")
+          );
         },
         onVisible: function () {
           $(`#log-max${version_name}`).append(

From 8c8fb20130aaf0dca80a53d3c86d6acf46590c7c Mon Sep 17 00:00:00 2001
From: zhoupzh 
Date: Mon, 31 Oct 2022 11:36:45 +0800
Subject: [PATCH 2/2] fix issue

---
 options/locale/locale_en-US.ini           |  4 ++--
 templates/admin/cloudbrain/list.tmpl      | 11 +++++++++++
 templates/repo/debugjob/index.tmpl        | 12 ++++++++++++
 templates/user/dashboard/cloudbrains.tmpl | 14 +++++++++++++-
 web_src/js/features/cloudrbanin.js        |  8 +-------
 5 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index e7d730027..3d99ae138 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1217,8 +1217,8 @@ cloudbrain.benchmark.evaluate_train=Train Script
 cloudbrain.benchmark.evaluate_test=Test Script
 cloudbrain.benchmark.types={"type":[{"id":1,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=detection","first":"Target detection","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=reid","first":"Target re-identification","second":[{"id":1,"value":"Vehicle re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"Image-based person re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]},{"id":3,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=tracking","first":"Multi-target tracking","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"lix07","repo_name":"MOT_benchmark_script"}]}]}
 cloudbrain.morethanonejob=You already have a running or waiting task, create it after that task is over.
-cloudbrain.morethanonejob1=You have created a  similar task  that is waiting or running, please wait for the task to finish before creating it.
-cloudbrain.morethanonejob2=You can view all your Cloud Brain tasks in  Personal Center > Cloud Brain Tasks . 
+cloudbrain.morethanonejob1=You have created a  equivalent task  that is waiting or running, please wait for the task to finish before creating it.
+cloudbrain.morethanonejob2=You can view all your Cloud Brain tasks in  Home > Cloudbrain Task . 
 
 modelarts.infer_job_model = Model
 modelarts.infer_job_model_file = Model File
diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl
index 62fc76d50..b6dfec77d 100755
--- a/templates/admin/cloudbrain/list.tmpl
+++ b/templates/admin/cloudbrain/list.tmpl
@@ -497,6 +497,17 @@
             

         

     

+    

+        
 
+            

+                
+                

+                    
{{.i18n.Tr "repo.cloudbrain.morethanonejob1" | Safe }}

+                    
{{.i18n.Tr "repo.cloudbrain.morethanonejob2" | Safe}}

+                

+            

+        

+    

 

 
 

+
 

     
     

+
+    

+        
 
+            

+                
+                

+                    
{{.i18n.Tr "repo.cloudbrain.morethanonejob1" | Safe }}

+                    
{{.i18n.Tr "repo.cloudbrain.morethanonejob2" | Safe}}

+                

+            

+        

+