Merge pull request '云脑任务队列排队和增加终态问题' (#2507) from gpu-inference into V20220718

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2507
Reviewed-by: wangj <wangj@noreply.localhost>

templates/custom/wait_count_train.tmpl

@@ -3,13 +3,13 @@
 	{{$gpuQueue := 0}}
 	{{range $k,$v :=.gpu_types}}
 	{{if eq $k 0}}
-	{{ $queue := $v.Queue }}
+	{{ $queue = $v.Queue }}
 	{{ end }}
 	{{ end }}
 
 	{{ range $k,$v :=.QueuesDetail }}
 	{{if eq $k $queue}}
-	{{$gpuQueue :=$v}}
+	{{$gpuQueue =$v}}
 	{{ end }}
 	{{ end }}
 	<i

templates/repo/debugjob/index.tmpl

@@ -386,7 +386,7 @@
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
                                             <a id="ai-stop-{{.Cloudbrain.ID}}"
-                                                class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED"}}disabled {{else}}blue {{end}}button'
+                                                class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED" "CREATE_FAILED"}}disabled {{else}}blue {{end}}button'
                                                 data-repopath="{{$.RepoLink}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{.Cloudbrain.ID}}/stop"
                                                 data-jobid="{{.Cloudbrain.ID}}">
                                                 {{$.i18n.Tr "repo.stop"}}
@@ -405,7 +405,7 @@
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
                                             <a id="ai-delete-{{.Cloudbrain.ID}}"
-                                                class='ui basic ai_delete {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "SUCCEEDED"}}blue {{else}}disabled {{end}}button'
+                                                class='ui basic ai_delete {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "SUCCEEDED" "CREATE_FAILED"}}blue {{else}}disabled {{end}}button'
                                                 style="border-radius: .28571429rem;">
                                                 {{$.i18n.Tr "repo.delete"}}
                                             </a>

web_src/js/features/cloudrbanin.js

@@ -123,6 +123,7 @@ export default async function initCloudrain() {
               "KILLED",
               "COMPLETED",
               "SUCCEEDED",
+              "CREATE_FAILED"
             ].includes(status)
           ) {
             $("#ai-delete-" + ID)
@@ -166,6 +167,7 @@ export default async function initCloudrain() {
           "START_FAILED",
           "SUCCEEDED",
           "STOPPED",
+          "CREATE_FAILED",
         ].includes(status)
       ) {
         return;
@@ -177,6 +179,7 @@ export default async function initCloudrain() {
         "KILLING",
         "COMPLETED",
         "SUCCEEDED",
+        "CREATE_FAILED",
         "STOPPED",
       ];
       $.get(
@@ -385,6 +388,7 @@ export default async function initCloudrain() {
           "KILLED",
           "COMPLETED",
           "SUCCEEDED",
+          "CREATE_FAILED",
         ].includes(data.JobStatus)
       ) {
         $("#ai-delete-" + ID)