From 292b805607f8c7b1c0bdd6f4cdc192e0ac21e52e Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Sat, 7 May 2022 15:30:39 +0800
Subject: [PATCH] fix issue

---
 templates/repo/cloudbrain/benchmark/new.tmpl | 268 ++++++++++++++-----
 web_src/js/features/images.js                |  12 +
 2 files changed, 209 insertions(+), 71 deletions(-)

diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl
index 0db184206..32445432f 100755
--- a/templates/repo/cloudbrain/benchmark/new.tmpl
+++ b/templates/repo/cloudbrain/benchmark/new.tmpl
@@ -31,7 +31,9 @@
     margin-left: 1.5rem;
     width: 81% !important;
 }
-
+.width48{
+    width: 48.5% !important;
+}
 .add{font-size: 18px;
     padding: 0.5rem;
     border: 1px solid rgba(187, 187, 187, 100);
@@ -74,90 +76,175 @@
             {{.i18n.Tr "repo.modelarts.evaluate_job.new_job"}}
         </h4>
         <div class="ui attached segment">
+
+            <!-- <form class="ui form">
+                <div class="required unite min_title inline field">
+                    <label style="font-weight: normal;">评测场景</label>
+                    <div class="ui blue small menu compact selectcloudbrain">
+                        <a class="active item alogrithm_benchmark" href="javascript:void(0)">算法评测</a>
+                        <a class="item model_benchmark" href="javascript:void(0)">模型评测</a>
+                    </div>
+                </div>
+            </form> -->
             <!-- equal width  -->
-            <form class="ui form" action="{{.Link}}" method="post">
+            <form class="ui form alogrithm_form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
-
-
+                <input type="hidden" name="job_type" value="BENCHMARK">
                 <div class="required unite min_title inline field">
-                    <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
-                    <input style="width: 80%;" name="display_job_name" id="trainjob_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}" tabindex="3" autofocus required maxlength="254">
+                    <label style="font-weight: normal;">评测场景</label>
+                    <div class="ui blue small menu compact selectcloudbrain">
+                        <a class="active item alogrithm_benchmark" href="{{.Link}}?type=alogrithm">算法评测</a>
+                        <a class="item model_benchmark" href="{{.Link}}?type=model">模型评测</a>
+                    </div>
                 </div>
-                <div class="unite min_title inline field">
-                    <label style="font-weight: normal;" for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}&nbsp;&nbsp;</label>
-                    <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="254" placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}} onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 255)">{{.description}}</textarea>
-                </div>
-
-                 <div class="required unite min_title inline field">
-                        <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
-                        <select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型" style='width:385px' name="gpu_type">
-                            {{range .benchmark_gpu_types}}
-                                <option value="{{.Queue}}">{{.Value}}</option>
-                            {{end}}
-                        </select>
-                </div>
-
-
-                <div class="required unite inline min_title  fields" style="width: 90%;">
-                    <div class="required eight wide field">
-                         <label style="font-weight: normal;white-space: nowrap;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}</label>
-                         <span>&nbsp;</span>
-                         <select class="ui fluid selection search dropdown" id="benchmark_types_id" name="benchmark_types_id" >
-                            {{range .benchmark_types}}
-                                {{if eq .Id $.benchmarkTypeID}}
-                                    <option value="{{.Id}}" selected="true">{{.First}}</option>
-                                {{else}}
-                                    <option value="{{.Id}}">{{.First}}</option>
+                
+                <div>
+                    <div class="required unite min_title inline field">
+                        <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
+                        <input style="width: 80%;" name="display_job_name" id="trainjob_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}" tabindex="3" autofocus required maxlength="254">
+                    </div>
+                    <div class="unite min_title inline field">
+                        <label style="font-weight: normal;" for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}&nbsp;&nbsp;</label>
+                        <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="254" placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}} onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 255)">{{.description}}</textarea>
+                    </div>
+    
+                        <div class="required unite min_title inline field">
+                            <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
+                            <select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型" style='width:385px' name="gpu_type">
+                                {{range .benchmark_gpu_types}}
+                                    <option value="{{.Queue}}">{{.Value}}</option>
                                 {{end}}
-                            {{end}}
-                        </select>
-                      </div>
-                      <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 nowrapx" id="benchmark_child_types_id" style='width: 100%;' name="benchmark_child_types_id">
-                        </select>
-                      </div>
-                </div>
-
-                <div id="images-new-cb">
-
+                            </select>
+                    </div>
+    
+    
+                    <div class="required unite inline min_title  fields" style="width: 90%;">
+                        <div class="required eight wide field">
+                                <label style="font-weight: normal;white-space: nowrap;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}</label>
+                                <span>&nbsp;</span>
+                                <select class="ui fluid selection search dropdown" id="benchmark_types_id" name="benchmark_types_id" >
+                                {{range .benchmark_types}}
+                                    {{if eq .Id $.benchmarkTypeID}}
+                                        <option value="{{.Id}}" selected="true">{{.First}}</option>
+                                    {{else}}
+                                        <option value="{{.Id}}">{{.First}}</option>
+                                    {{end}}
+                                {{end}}
+                            </select>
+                            </div>
+                            <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 nowrapx" id="benchmark_child_types_id" style='width: 100%;' name="benchmark_child_types_id">
+                            </select>
+                            </div>
+                    </div>
+    
+                    <div id="images-new-cb">
+    
+                    </div>
+    
+    
+    
+                    <div class="required unite min_title inline field">
+                            <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
+                            <select id="cloudbrain_resource_spec" class="ui search dropdown" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' name="resource_spec_id">
+                                {{range .benchmark_resource_specs}}
+                                    <option name="resource_spec_id" value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}：{{.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{.ShareMemMiB}}</option>
+                                {{end}}
+                            </select>
+                    </div>
+    
+                    <div class="inline unite min_title field required">
+                            <label style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}</label>
+                            <input disabled="disabled" style="width: 33.5%;" name="train_file" id="train_file" value="train.py" tabindex="3" autofocus required maxlength="254" >
+                            <a id="train_href_id" href="https://git.openi.org.cn/CV_benchmark/CV_reID_benchmark" target="_blank">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}</a>
+                    </div>
+    
+                    <div class="inline unite min_title field required">
+                            <label style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}}</label>
+                            <input disabled="disabled" style="width: 33.5%;" name="test_file" id="test_file" value="test.py" tabindex="3" autofocus required maxlength="254" >
+                            <a id="test_href_id" href="https://git.openi.org.cn/CV_benchmark/CV_reID_benchmark" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
+                    </div>
+    
+    
+                    <div class="inline unite min_title field">
+                        <button class="ui create_train_job green button">
+                        {{.i18n.Tr "repo.cloudbrain.new"}}
+                        </button>
+                        <a class="ui button" href="/">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    </div>
                 </div>
 
+                
 
+                <!-- 模态框 -->
 
+            </form>
+            <form class="ui form model_form" action="{{.Link}}" method="post" style="display: none;">
+                {{.CsrfTokenHtml}}
+                <input type="hidden" name="action" value="update">
                 <div class="required unite min_title inline field">
-                        <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
-                        <select id="cloudbrain_resource_spec" class="ui search dropdown" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' name="resource_spec_id">
-                            {{range .benchmark_resource_specs}}
-                                <option name="resource_spec_id" value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}：{{.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{.ShareMemMiB}}</option>
+                    <label style="font-weight: normal;">评测场景</label>
+                    <div class="ui blue small menu compact selectcloudbrain">
+                        <a class="item alogrithm_benchmark" href="{{.Link}}?type=alogrithm">算法评测</a>
+                        <a class="active item model_benchmark" href="{{.Link}}?type=model">模型评测</a>
+                    </div>
+                </div>
+                <div>
+                    <div class="required unite min_title inline field">
+                        <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
+                        <input style="width: 80%;" name="display_job_name" id="trainjob_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}" tabindex="3" autofocus required maxlength="254">
+                    </div>
+                    <div class="unite min_title inline field">
+                        <label style="font-weight: normal;" for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}&nbsp;&nbsp;</label>
+                        <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="254" placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}} onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 255)">{{.description}}</textarea>
+                    </div>
+    
+                    <div class="required unite min_title inline field">
+                        <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
+                        <select id="cloudbrain_gpu_type" class="ui search dropdown width48" placeholder="选择GPU类型"  name="gpu_type">
+                            {{range .benchmark_gpu_types}}
+                                <option value="{{.Queue}}">{{.Value}}</option>
                             {{end}}
                         </select>
-                </div>
+                    </div>
 
-                <div class="inline unite min_title field required">
-                        <label style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}</label>
-                        <input disabled="disabled" style="width: 33.5%;" name="train_file" id="train_file" value="train.py" tabindex="3" autofocus required maxlength="254" >
-                        <a id="train_href_id" href="https://git.openi.org.cn/CV_benchmark/CV_reID_benchmark" target="_blank">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}</a>
-                </div>
-
-                <div class="inline unite min_title field required">
-                        <label style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}}</label>
-                        <input disabled="disabled" style="width: 33.5%;" name="test_file" id="test_file" value="test.py" tabindex="3" autofocus required maxlength="254" >
-                        <a id="test_href_id" href="https://git.openi.org.cn/CV_benchmark/CV_reID_benchmark" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
-                </div>
-
-
-                <div class="inline unite min_title field">
-                    <button class="ui create_train_job green button">
-                    {{.i18n.Tr "repo.cloudbrain.new"}}
-                    </button>
-                    <a class="ui button" href="/">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    <div class="required unite min_title inline field">
+                        <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.task_type"}}</label>
+                        <select id="cloudbrain_job_type" class="ui search dropdown width48 job_type" placeholder="select {{.i18n.Tr "cloudbrain.task_type"}}" name="job_type">
+                            <option name="job_type" value="SNN4IMAGENET">SNN4IMAGENET</option>
+                            <option name="job_type" value="BRAINSCORE">BRAINSCORE</option>
+                        </select>
+                        <span>
+                            <i class="question circle icon  link" data-content={{.i18n.Tr "repo.modelarts.train_job.boot_file_helper"}} data-position="right center" data-variation="mini"></i>
+                        </span>
+                        <a id="benchmark_model_example" href="https://git.openi.org.cn/yult/snn4imagenet">查看样例</a>
+                    </div>
+    
+                    
+    
+                    <div id="images-new-cb-copy">
+    
+                    </div>
+                    {{template "custom/select_dataset_train" .}}
+                    <div class="required unite min_title inline field" style="margin-top:2rem;">
+                            <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
+                            <select id="cloudbrain_resource_spec" class="ui search dropdown" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' name="resource_spec_id">
+                                {{range .benchmark_resource_specs}}
+                                    <option name="resource_spec_id" value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}：{{.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{.ShareMemMiB}}</option>
+                                {{end}}
+                            </select>
+                    </div>
+                    
+                    <div class="inline unite min_title field">
+                        <button class="ui create_train_job green button">
+                        {{.i18n.Tr "repo.cloudbrain.new"}}
+                        </button>
+                        <a class="ui button" href="/">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    </div>
                 </div>
-
-                <!-- 模态框 -->
-
             </form>
         </div>
     </div>
@@ -166,7 +253,7 @@
 
 <script>
     let repolink =  {{.RepoLink}}
-
+    console.log({{$.jobType}})
     let url_href = window.location.pathname.split('create')[0]
     $(".ui.button").attr('href',url_href)
 
@@ -177,6 +264,30 @@
         setChildType();
     })
 
+    
+    $(document).ready(()=>{
+        $('.ui.search.dropdown.job_type').dropdown({
+            onChange: function(value, text, $selectedItem) {
+                console.log(value,text)
+                if(value==="BRAINSCORE"){
+                    $('#benchmark_model_example').attr('href','https://git.openi.org.cn/yult/similarity2brain_ann')
+                }else{
+                    $('#benchmark_model_example').attr('href','https://git.openi.org.cn/yult/snn4imagenet')
+                }
+            }
+        })
+        console.log("==============")
+        const params = new URLSearchParams(location.search)
+        if(params.get('type')=='model'){
+            console.log(2)
+            $('.model_form').css('display','block')
+            $('.alogrithm_form').css('display','none')
+        }else if(params.get('type')=='alogrithm'){
+            console.log(1)
+            $('.model_form').css('display','none')
+            $('.alogrithm_form').css('display','block')
+        }
+    })
     function setChildType(){
         let type_id = $('#benchmark_types_id').val();
         if(type_id == 3){
@@ -201,6 +312,21 @@
         })
     }
 
+    // $('.alogrithm_benchmark').on('click',(e)=>{
+    //     $('.alogrithm_benchmark').addClass('active')
+    //     $('.model_benchmark').removeClass('active')
+    //     $('.model_form').css('display','none')
+    //     $('.alogrithm_form').css('display','block')
+    // })
+    // $('.model_benchmark').on('click',(e)=>{
+    //     $('.model_benchmark').addClass('active')
+    //     $('.alogrithm_benchmark').removeClass('active')
+    //     $('.model_form').css('display','block')
+    //     $('.alogrithm_form').css('display','none')
+
+    // })
+    
+
     document.onreadystatechange = function() {
         if (document.readyState === "complete") {
            setChildType();
diff --git a/web_src/js/features/images.js b/web_src/js/features/images.js
index 0cafb3901..05cb02b48 100644
--- a/web_src/js/features/images.js
+++ b/web_src/js/features/images.js
@@ -209,7 +209,19 @@ export default async function initImage(){
             render: h => h(selectImages)
         });
     }
+    function initVueselectImagesCopy() {
+        const el = document.getElementById('images-new-cb-copy');
+        if (!el) {
+            return;
+        }
+        
+        new Vue({
+            el:el,            
+            render: h => h(selectImages)
+        });
+    }
     initVueImages()
     initVueAdminImages()
     initVueselectImages()
+    initVueselectImagesCopy()
 }
\ No newline at end of file