From 0814c1cafbddc37626a0b37339c10a4380cfc029 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Thu, 24 Feb 2022 17:49:42 +0800
Subject: [PATCH] fix issue

---
 templates/admin/cloudbrain/list.tmpl           | 6 +++---
 templates/repo/cloudbrain/benchmark/new.tmpl   | 5 ++++-
 templates/repo/modelarts/inferencejob/new.tmpl | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl
index 55e4aeb10..521377838 100644
--- a/templates/admin/cloudbrain/list.tmpl
+++ b/templates/admin/cloudbrain/list.tmpl
@@ -122,7 +122,7 @@
                                     <span class="fitted">{{.JobName}}</span>
                                 </div>
                                 <div class="two wide column text center nowrap" style="width: 17.5%!important;">
-                                    {{if eq .JobType "DEBUG"}}
+                                    {{if eq .JobType "DEBUG" "SNN4IMAGENET" "BRAINSCORE"}}
                                     <div class="ui compact buttons">
                                         <form id="debugAgainForm-{{.JobID}}">
                                             {{$.CsrfTokenHtml}}
@@ -140,7 +140,7 @@
                                     {{end}}
                                     <!-- 停止任务 -->
                                     <div class="ui compact buttons">
-                                        {{if eq .JobType "DEBUG" "BENCHMARK"}}
+                                        {{if eq .JobType "DEBUG" "BENCHMARK" "SNN4IMAGENET" "BRAINSCORE"}}
                                         <form id="stopForm-{{.JobID}}"  style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
                                             <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class='ui basic ai_stop {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "SUCCEEDED" "STOPPED" "STOPPING"}}disabled {{else}} blue {{end}}button' data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else if eq .JobType "BENCHMARK" }}/cloudbrain/benchmark{{else if eq .ComputeResource "NPU" }}/modelarts/notebook{{end}}/{{.JobID}}/stop' data-jobid="{{.JobID}}">
@@ -306,7 +306,7 @@ function getParams(){
     const params = new URLSearchParams(window.location.search)
     let jobType = !params.get('jobType')? '{{.i18n.Tr "admin.cloudbrain.all_task_types"}}' : params.get('jobType')
     let listType = !params.get('listType')? '{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}' : params.get('listType')
-    let jobStatus = !params.get('jobStatus')? '{{.i18n.Tr "admin.cloudbrain.all_status"}}' : params.get('jobStatus')
+    let jobStatus = !params.get('jobStatus')? '{{.i18n.Tr "admin.cloudbrain.all_status"}}' : params.get('jobStatus').toUpperCase()
     const dropdownValueArray = [jobType,listType,jobStatus]
     $('#adminCloud .default.text ').each(function(index,e){
         $(e).text(dropdownValueArray[index])
diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl
index 5904ec094..3ea2641d8 100755
--- a/templates/repo/cloudbrain/benchmark/new.tmpl
+++ b/templates/repo/cloudbrain/benchmark/new.tmpl
@@ -49,6 +49,9 @@
     text-align: center;
     color: #C2C7CC;
 }
+.nowrapx {
+    white-space: nowrap !important;
+}
 
 </style>
 <!-- <div class="ui page dimmer">
@@ -113,7 +116,7 @@
                       <div class="eight wide field" id="engine_name">
                         <input type="hidden" id="benchmark_child_types_id_hidden" name="benchmark_child_types_id_hidden" value="{{.benchmark_child_types_id_hidden}}">
                         <label style="font-weight: normal;white-space: nowrap;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_child_type"}}</label>
-                        <select class="ui fluid selection dropdown nowrap" id="benchmark_child_types_id" style='width: 100%;' name="benchmark_child_types_id">
+                        <select class="ui fluid selection dropdown nowrapx" id="benchmark_child_types_id" style='width: 100%;' name="benchmark_child_types_id">
                         </select>
                       </div>
                 </div>
diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl
index 504a85abf..d84b4a45e 100644
--- a/templates/repo/modelarts/inferencejob/new.tmpl
+++ b/templates/repo/modelarts/inferencejob/new.tmpl
@@ -27,7 +27,7 @@
 }
 
 
-.nowrap {
+.nowrapx {
     white-space: nowrap !important;
 }
 </style>
@@ -140,7 +140,7 @@
                           </select>
                       </div>
                       <div class="eight wide field" id="engine_name">
-                        <select class="ui fluid selection dropdown nowrap" id="trainjob_engine_versions" name="engine_id" style="white-space: nowrap;">
+                        <select class="ui fluid selection dropdown nowrapx" id="trainjob_engine_versions" name="engine_id" style="white-space: nowrap;!">
                             {{range .engine_versions}}
                                 <option name="engine_id" value="{{.ID}}">{{.Value}}</option>
                             {{end}}