Merge pull request '任务队列显示waitcount正确' (#2515) from gpu-inference into V20220718

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2515
Reviewed-by: ychao_1983 <ychao_1983@sina.com>

templates/custom/wait_count_train.tmpl

@@ -1,13 +1,13 @@
 <div class="tooltip-wati-count" style="margin-left: 155px">
 	{{$queue := ""}}
 	{{$gpuQueue := 0}}
-	{{range $k,$v :=.gpu_types}}
+	{{range $k,$v :=.type}}
 	{{if eq $k 0}}
 	{{ $queue = $v.Queue }}
 	{{ end }}
 	{{ end }}
 
-	{{ range $k,$v :=.QueuesDetail }}
+	{{ range $k,$v :=.ctx.QueuesDetail }}
 	{{if eq $k $queue}}
 	{{$gpuQueue =$v}}
 	{{ end }}
@@ -17,12 +17,12 @@
 		style="margin-right: 0.5rem; font-size: 16px"
 	></i>
 	<span
-		>{{.i18n.Tr "repo.wait_count_start"}}
-		{{if .QueuesDetail}}
+		>{{.ctx.i18n.Tr "repo.wait_count_start"}}
+		{{if .type}}
 		{{ $gpuQueue }}
 		{{else}}
-		{{.WaitCount}}
+		{{.ctx.WaitCount}}
 		{{ end }}
-		{{.i18n.Tr "repo.wait_count_end"}}</span
+		{{.ctx.i18n.Tr "repo.wait_count_end"}}</span
 	>
 </div>

templates/repo/cloudbrain/benchmark/new.tmpl

@@ -62,7 +62,7 @@
                         <a class="active item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                     </div>
-                    {{template "custom/wait_count_train" .}}
+                    {{template "custom/wait_count_train" Dict "ctx" $ "type" .benchmark_gpu_types}}
                 </div>
                 <div>
                     <div class="required min_title inline field">
@@ -157,7 +157,7 @@
                         <a class="item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                     </div>
-                    {{template "custom/wait_count_train" .}}
+                    {{template "custom/wait_count_train" Dict "ctx" $ "type" .benchmark_gpu_types}}
                 </div>
 
                 <div>

templates/repo/cloudbrain/inference/new.tmpl

@@ -92,7 +92,7 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" .}}
+                    {{template "custom/wait_count_train" Dict "ctx" $ "type" .inference_gpu_types}}
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -126,7 +126,7 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" .}}
+                    {{template "custom/wait_count_train" Dict "ctx" $ "type" .train_gpu_types}}
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>

templates/repo/grampus/trainjob/gpu/new.tmpl

@@ -113,7 +113,7 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" .}}
+                    {{template "custom/wait_count_train" Dict "ctx" $}}
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>

templates/repo/grampus/trainjob/npu/new.tmpl

@@ -108,7 +108,7 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" .}}
+                    {{template "custom/wait_count_train" Dict "ctx" $}}
                 </div>
                 
                 <div class="required min_title inline field">

templates/repo/modelarts/inferencejob/new.tmpl

@@ -90,7 +90,7 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" .}}
+                    {{template "custom/wait_count_train" Dict "ctx" $}}
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>

templates/repo/modelarts/trainjob/new.tmpl

@@ -118,7 +118,7 @@
                             </svg>
                             Ascend NPU</a>
                     </div>
-                    {{template "custom/wait_count_train" .}}
+                    {{template "custom/wait_count_train" Dict "ctx" $}}
                 </div>
                 <div class="required inline min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>