From ca8dfa9410a53ea248ffb536c109a1dfc31b753c Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 9 May 2022 14:46:00 +0800
Subject: [PATCH] fix issue

---
 options/locale/locale_en-US.ini               |  6 +-
 options/locale/locale_zh-CN.ini               |  5 +-
 templates/admin/cloudbrain/list.tmpl          | 18 +-----
 templates/admin/cloudbrain/search.tmpl        |  4 +-
 .../admin/cloudbrain/search_dashboard.tmpl    |  2 +-
 .../repo/cloudbrain/benchmark/index.tmpl      | 15 ++---
 templates/user/dashboard/cloudbrains.tmpl     | 56 ++++++-------------
 web_src/js/features/cloudrbanin.js            | 48 ++++++++++++++++
 8 files changed, 83 insertions(+), 71 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8ff34f9ae..0c01a5107 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1090,7 +1090,9 @@ modelarts.train_job_para.connfirm=train_job_para.connfirm
 
 modelarts.evaluate_job=Model Evaluation
 modelarts.evaluate_job.new_job=New Model Evaluation
+
 cloudbrain.benchmark.evaluate_type=Evaluation Type
+cloudbrain.benchmark.evaluate_scenes = Evaluation Scenes
 cloudbrain.benchmark.algorithm=Algorithm Evaluation
 cloudbrain.benchmark.model=Model Evaluation
 cloudbrain.benchmark.evaluate_child_type=Child Type
@@ -3013,8 +3015,8 @@ shared_memory = Shared Memory
 
 
 DEBUG = DEBUG
-SNN4IMAGENET =  SNN4IMAGENET
-BRAINSCORE = BRAINSCORE
+SNN4IMAGENET =  BENCHMARK
+BRAINSCORE = BENCHMARK
 TRAIN = TRAIN
 INFERENCE = INFERENCE
 BENCHMARK = BENCHMARK
\ No newline at end of file
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index a01fdd94a..f117c34f7 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1101,6 +1101,7 @@ modelarts.train_job_para.edit=编辑
 modelarts.train_job_para.connfirm=确定
 modelarts.evaluate_job=评测任务
 modelarts.evaluate_job.new_job=新建评测任务
+cloudbrain.benchmark.evaluate_scenes = 评测场景
 cloudbrain.benchmark.evaluate_type=评测类型
 cloudbrain.benchmark.algorithm=算法评测
 cloudbrain.benchmark.model=模型评测
@@ -3024,8 +3025,8 @@ memory = 内存
 shared_memory = 共享内存
 
 DEBUG = 调试任务
-SNN4IMAGENET =  调试任务-脉冲神经网络图片分类测评
-BRAINSCORE = 调试任务-神经相似性测评
+SNN4IMAGENET =  评测任务
+BRAINSCORE = 评测任务
 TRAIN = 训练任务
 INFERENCE = 推理任务
 BENCHMARK = 评测任务
diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl
index cf5df847c..60c3510a5 100755
--- a/templates/admin/cloudbrain/list.tmpl
+++ b/templates/admin/cloudbrain/list.tmpl
@@ -12,7 +12,8 @@
 <!-- 提示框 -->
 <div class="alert"></div>
 <div class="admin user">
-    <div class="cloudbrain_debug" style="display: none;" data-debug="{{$.i18n.Tr "repo.debug"}}" data-debug-again="{{$.i18n.Tr "repo.debug_again"}}"></div>
+    <div class="cloudbrain_debug" style="display: none;" data-debug="{{$.i18n.Tr "repo.debug"}}" data-debug-again="{{$.i18n.Tr "repo.debug_again"}}"
+    data-all-task="{{.i18n.Tr "admin.cloudbrain.all_task_types"}}" data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}" data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}"></div>
     {{template "admin/navbar" .}}
     <div class="ui container" style="width: 80%;">
         {{template "base/alert" .}}
@@ -314,17 +315,4 @@
         </div>
     </div>
 </div>
-{{template "base/footer" .}}
-<script>
-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').toUpperCase()
-    const dropdownValueArray = [jobType,listType,jobStatus]
-    $('#adminCloud .default.text ').each(function(index,e){
-        $(e).text(dropdownValueArray[index])
-    })
-}
-getParams()
-</script>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl
index c473343ef..ddd616eb4 100644
--- a/templates/admin/cloudbrain/search.tmpl
+++ b/templates/admin/cloudbrain/search.tmpl
@@ -16,8 +16,8 @@
                 <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=TRAIN&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="TRAIN">TRAIN</a>
                 <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=INFERENCE&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="INFERENCE">INFERENCE</a>
                 <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=BENCHMARK&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="BENCHMARK">BENCHMARK</a>
-                <!-- <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=SNN4IMAGENET&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="BENCHMARK">SNN4IMAGENET</a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=BRAINSCORE&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="BENCHMARK">BRAINSCORE</a> -->
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=SNN4IMAGENET&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="SNN4IMAGENET">SNN4IMAGENET</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=BRAINSCORE&listType={{$.ListType}}&jobStatus={{$.JobStatus}}" data-value="BRAINSCORE">BRAINSCORE</a>
             </div>
         </div>
         <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">  
diff --git a/templates/admin/cloudbrain/search_dashboard.tmpl b/templates/admin/cloudbrain/search_dashboard.tmpl
index 075c23e64..61f02f182 100644
--- a/templates/admin/cloudbrain/search_dashboard.tmpl
+++ b/templates/admin/cloudbrain/search_dashboard.tmpl
@@ -18,7 +18,7 @@
 <div class="ui container" style="width: 80%;">
     <div class="ui grid">
         <div class="row">
-            <div class="ui {{if $.PageIsUserCloudBrain}}sixteen{{else}}six{{end}} wide column" style="margin: 1rem 0;" id="adminCloud">
+            <div class="ui {{if $.PageIsUserCloudBrain}}sixteen{{else}}six{{end}} wide column" style="margin: 1rem 0;" id="userCloud">
                     <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">  
                         <div class="default text" style="color: rgba(0,0,0,.87);">{{.i18n.Tr "admin.cloudbrain.all_task_types"}}</div>
                         <i class="dropdown icon"></i>
diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl
index 3ceb9333b..8ded073b0 100755
--- a/templates/repo/cloudbrain/benchmark/index.tmpl
+++ b/templates/repo/cloudbrain/benchmark/index.tmpl
@@ -2,9 +2,6 @@
 {{template "base/head" .}}
 
 <style>
-    .fontsize14{
-        font-size: 14px;
-    }
     .padding0{
         padding: 0 !important;
     }
@@ -76,7 +73,7 @@
                                     <span>{{$.i18n.Tr "repo.modelarts.status"}}</span>
                                 </div>
                                 <div class="two wide column text center padding0" style="width: 10.5% !important;">
-                                        <span>{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}</span>
+                                        <span>{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}</span>
                                 </div>
                                 <div class="two wide column text center padding0" style="width: 10.5% !important;">
                                         <span>{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}</span>
@@ -110,7 +107,7 @@
                                     </a>
                                 </div>
                                 <!-- 任务状态 -->
-                                <div class="two wide column padding0"  style="width: 10.5% !important;">
+                                <div class="two wide column text center padding0"  style="width: 10.5% !important;">
                                     <span class="job-status" id="{{.Cloudbrain.ID}}" data-repopath="{{$.RepoRelPath}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}" data-jobid="{{.Cloudbrain.ID}}" data-version="{{.VersionName}}">
                                             <span><i id="{{.Cloudbrain.ID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i><span  id="{{.Cloudbrain.ID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
@@ -160,10 +157,11 @@
                                             </a>
                                             {{end}}
                                         </form>
+                                        {{if eq .JobType "BENCHMARK"}}
                                         <a class="ui basic button {{if $.IsSigned}} blue{{else}} disabled{{end}}" href="{{$.RepoLink}}/cloudbrain/{{.Cloudbrain.ID}}/rate" target="_blank">
                                                         {{$.i18n.Tr "repo.score"}}
                                         </a>
-
+                                        {{end}}
                                       <!-- 删除任务 -->
                                       <form  id="delForm-{{.Cloudbrain.ID}}" action="{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain/benchmark{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.Cloudbrain.ID}}/del" method="post">
                                             <input type="hidden" name="debugListType" value="all">
@@ -232,7 +230,4 @@
 </div>
 
 </div>
-{{template "base/footer" .}}
-<script>
-console.log({{.Tasks}})
-</script>
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl
index 0b0776c9b..9abee857c 100644
--- a/templates/user/dashboard/cloudbrains.tmpl
+++ b/templates/user/dashboard/cloudbrains.tmpl
@@ -12,7 +12,11 @@
 <!-- 提示框 -->
 <div class="alert"></div>
 <div class="explore users">
-    <div class="cloudbrain_debug" style="display: none;" data-debug="{{$.i18n.Tr "repo.debug"}}" data-debug-again="{{$.i18n.Tr "repo.debug_again"}}"></div>
+    <div class="cloudbrain_debug" style="display: none;" data-debug="{{$.i18n.Tr "repo.debug"}}" data-debug-again="{{$.i18n.Tr "repo.debug_again"}}"
+        data-debug-task="{{$.i18n.Tr "cloudbrain.DEBUG"}}"  data-train-task="{{$.i18n.Tr "cloudbrain.TRAIN"}}"
+        data-inference-task="{{$.i18n.Tr "cloudbrain.INFERENCE"}}" data-benchmark-task="{{$.i18n.Tr "cloudbrain.BENCHMARK"}}"
+        data-all-task="{{.i18n.Tr "admin.cloudbrain.all_task_types"}}" data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}"
+        data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}"></div>
     {{template "admin/cloudbrain/search_dashboard" .}}
     <div class="ui container" style="width: 80%;">
         {{template "base/alert" .}}
@@ -94,7 +98,7 @@
                                 
                                 {{$JobType := $.i18n.Tr (printf "cloudbrain.%s" .JobType)}}
                                 <div class="one wide column text center nowrap" style="width:10%">
-                                    <span style="font-size: 12px;" title="{{$JobType}}">{{$JobType}}</span>
+                                    <span style="font-size: 12px;" title="{{.JobType}}">{{$JobType}}</span>
                                 </div>
                                 <!-- 任务创建时间 -->
                                 <div class="two wide column text center nowrap" style="width: 11% !important;">
@@ -115,7 +119,7 @@
                                 </div>
                                 
                                 <div class="three wide column text center nowrap" style="width: 21.5%!important;">
-                                    {{if eq .JobType "DEBUG" "SNN4IMAGENET" "BRAINSCORE"}}
+                                    {{if eq .JobType "DEBUG"}}
                                     <div class="ui compact buttons">
                                         <form id="debugAgainForm-{{$JobID}}">
                                             {{$.CsrfTokenHtml}}
@@ -146,6 +150,14 @@
                                         </a>
                                         {{end}}
                                     </div>
+                                    {{if eq .JobType "BENCHMARK"}}
+                                    <div class="ui compact buttons">
+                                        <a class="ui basic button {{if $.IsSigned}} blue{{else}} disabled{{end}}" href="{{$.RepoLink}}/cloudbrain/{{.Cloudbrain.ID}}/rate" target="_blank">
+                                            {{$.i18n.Tr "repo.score"}}
+                                        </a>
+                                    </div>
+                                    
+                                    {{end}}
                                     <!-- 删除任务 -->
                                     <form class="ui compact buttons" id="delForm-{{$JobID}}" action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}/cloudbrain{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/train-job{{else}}/cloudbrain/train-job{{end}}{{end}}/{{$JobID}}/del?ishomepage=true' method="post">
                                         {{$.CsrfTokenHtml}}
@@ -195,7 +207,7 @@
                                 <!-- 任务类型 -->
                                 {{$JobType := $.i18n.Tr (printf "cloudbrain.%s" .JobType)}}
                                 <div class="one wide column text center nowrap" style="width:10%">
-                                    <span style="font-size: 12px;" title="{{$JobType}}">{{$JobType}}</span>
+                                    <span style="font-size: 12px;" title="{{.JobType}}">{{$JobType}}</span>
                                 </div>
                                 <!-- 任务创建时间 -->
                                 <div class="two wide column text center nowrap" style="width: 11% !important;">
@@ -291,38 +303,4 @@
         </div>
     </div>
 </div>
-{{template "base/footer" .}}
-<script>
-function getParams(){
-    const params = new URLSearchParams(window.location.search)
-    params.get('jobType')
-    let jobType
-    if(!params.get('jobType')){
-        jobType = '{{.i18n.Tr "admin.cloudbrain.all_task_types"}}'
-    }else{
-        if(params.get('jobType') === 'DEBUG'){
-            jobType = '{{$.i18n.Tr (printf "cloudbrain.DEBUG")}}'
-        }else if(params.get('jobType') === 'TRAIN'){
-            jobType = '{{$.i18n.Tr (printf "cloudbrain.TRAIN")}}'
-        }
-        else if(params.get('jobType') === 'INFERENCE'){
-            jobType = '{{$.i18n.Tr (printf "cloudbrain.INFERENCE")}}'
-        }
-        else if(params.get('jobType') === 'SNN4IMAGENET'){
-            jobType = '{{$.i18n.Tr (printf "cloudbrain.SNN4IMAGENET")}}'
-        }else if(params.get('jobType') === 'BENCHMARK'){
-            jobType = '{{$.i18n.Tr (printf "cloudbrain.BENCHMARK")}}'
-        }
-        else{
-            jobType = '{{$.i18n.Tr (printf "cloudbrain.BRAINSCORE")}}'
-        }
-    }
-    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').toUpperCase()
-    const dropdownValueArray = [jobType,listType,jobStatus]
-    $('#adminCloud .default.text ').each(function(index,e){
-        $(e).text(dropdownValueArray[index])
-    })
-}
-getParams()
-</script>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js
index 400cf2842..57b8f7d64 100644
--- a/web_src/js/features/cloudrbanin.js
+++ b/web_src/js/features/cloudrbanin.js
@@ -240,4 +240,52 @@ export default async function initCloudrain() {
     })
 }
 
+function userSearchControll() {
+    if($('#userCloud').length===0){
+        return 
+    }
+    const params = new URLSearchParams(window.location.search)
+    let jobType
+    if($('.cloudbrain_debug').length===1){
+        if(!params.get('jobType')){
+            jobType = $('.cloudbrain_debug').data('allTask')
+        }else{
+            if(params.get('jobType') === 'DEBUG'){
+                jobType = $('.cloudbrain_debug').data('debug-task')
+            }else if(params.get('jobType') === 'TRAIN'){
+                jobType = $('.cloudbrain_debug').data('train-task')
+            }
+            else if(params.get('jobType') === 'INFERENCE'){
+                jobType = $('.cloudbrain_debug').data('inference-task')
+            }
+            else{
+                jobType = $('.cloudbrain_debug').data('benchmark-task')
+            }
+        }
+    }
+    let listType = !params.get('listType')? $('.cloudbrain_debug').data('all-compute') : params.get('listType')
+    let jobStatus = !params.get('jobStatus')? $('.cloudbrain_debug').data('all-status') : params.get('jobStatus').toUpperCase()
+    const dropdownValueArray = [jobType,listType,jobStatus]
+    $('#userCloud .default.text ').each(function(index,e){
+        $(e).text(dropdownValueArray[index])
+    })
+}
+
+function AdaminSearchControll() {
+    if($('#adminCloud').length===0){
+        return 
+    }
+    const params = new URLSearchParams(window.location.search)
+    let jobType = !params.get('jobType')? $('.cloudbrain_debug').data('all-task') : params.get('jobType')
+    let listType = !params.get('listType')? $('.cloudbrain_debug').data('all-compute') : params.get('listType')
+    let jobStatus = !params.get('jobStatus')? $('.cloudbrain_debug').data('all-status') : params.get('jobStatus').toUpperCase()
+    const dropdownValueArray = [jobType,listType,jobStatus]
+    $('#adminCloud .default.text ').each(function(index,e){
+        $(e).text(dropdownValueArray[index])
+    })
+}
+userSearchControll()
+AdaminSearchControll()
+
+
     
\ No newline at end of file