新建任务时积分提示

options/locale/locale_en-US.ini

@@ -3122,4 +3122,13 @@ INFERENCE = INFERENCE
 BENCHMARK = BENCHMARK
 brain_area = Brain Area
 
-error.dataset_select = dataset select error：the count exceed the limit or has same name
+error.dataset_select = dataset select error：the count exceed the limit or has same name
+
+[points]
+points = points
+free = Free
+points_hour = Points/hour
+balance_of_points = Balance of Points:
+hours = Hours
+expected_time =	, expected to be available for 	
+points_acquisition_instructions = Points Acquisition Instructions

options/locale/locale_zh-CN.ini

@@ -3136,4 +3136,13 @@ INFERENCE = 推理任务
 BENCHMARK = 评测任务
 brain_area = 脑区
 
-error.dataset_select = 数据集选择错误：数量超过限制或者有同名数据集
+error.dataset_select = 数据集选择错误：数量超过限制或者有同名数据集
+
+[points]
+points = 积分
+free = 免费
+points_hour = 积分/每小时
+balance_of_points = 积分余额：
+hours = 小时
+expected_time =	，预计可用	
+points_acquisition_instructions = 积分获取说明

templates/repo/cloudbrain/benchmark/new.tmpl

@@ -126,15 +126,23 @@
                     {{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"
+                        <select id="cloudbrain_resource_spec" class="ui search dropdown" blance="{{.PointAccount.Balance}}"
                             placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
                             name="resource_spec_id">
                             {{range .benchmark_resource_specs}}
-                            <option name="resource_spec_id" value="{{.Id}}">
+                            <option name="resource_spec_id" value="{{.Id}}" unitprice="{{.UnitPrice}}">
                                 {{$.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}}
+                                {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}}
                             </option>
                             {{end}}
                         </select>
+                        <div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:73px;font-size:12px;">
+                        <span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
+                        <span style="float:right;">
+                            <i class="question circle icon link" data-position="right center" data-variation="mini"></i>
+                            <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
+                        </span>
+                    </div>
                     </div>
                     <div class="inline unite min_title field">
                         <button class="ui create_train_job green button">
@@ -218,14 +226,22 @@
                     <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'
+                            placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' blance="{{.PointAccount.Balance}}"
                             name="resource_spec_id">
                             {{range .benchmark_resource_specs}}
-                            <option name="resource_spec_id" value="{{.Id}}">
+                            <option name="resource_spec_id" value="{{.Id}}" unitprice="{{.UnitPrice}}">
                                 {{$.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}}
+                                {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}}
                             </option>
                             {{end}}
                         </select>
+                        <div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:74px;font-size:12px;">
+                            <span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
+                            <span style="float:right;">
+                                <i class="question circle icon link" data-position="right center" data-variation="mini"></i>
+                                <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
+                            </span>
+                        </div>
                     </div>
 
                     <div class="inline unite min_title field required">
@@ -352,4 +368,19 @@
     $('.ui.create_train_job.green.button').click(function (e) {
         validate()
     })
+
+    ;(function() {
+        $('#cloudbrain_resource_spec').on('change', function(e) {
+            var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip');
+            var val = $(this).val();
+            var blance = $(this).attr('blance');
+            var unitPrice = $(this).find('option:selected').attr('unitprice');
+            if (unitPrice == 0) {
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide();
+            } else {
+                var canUseTime = Number(blance) / Number(unitPrice);
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').text(canUseTime.toFixed(2)).parent().show();
+            }
+        }).trigger('change');
+    })();
 </script>

templates/repo/cloudbrain/new.tmpl

@@ -104,7 +104,26 @@
         top: 14px;
         z-index: 2; */
     }
+    .inline.field {
+        padding-left: 12rem !important;
+    }
+
+    .inline.field>label {
+        width: 120px !important;
+        text-align: right;
+    }
 
+    .inline.field .dropdown.selection {
+        width: 60% !important;
+    }
+
+    .width70 {
+        width: 60% !important;
+    }
+
+    .inline.field input {
+        width: 40% !important;
+    }
 </style>
 
 <div id="mask">
@@ -119,170 +138,176 @@
 
 <div class="repository">
     {{template "repo/header" .}}
-    <div class="repository new repo ui middle very relaxed page grid">
-        <div class="column">
-            <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
-            {{template "base/alert" .}}
-            <div class="ui negative message" id="messageInfo">
-                <p></p>
-            </div>
+    <div class="ui container">
+        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+            {{.i18n.Tr "repo.cloudbrain.new"}}
+        </h4>
+        <div class="ui negative message" id="messageInfo" style="display:none">
+            <p></p>
+        </div>
+        <div class="ui attached segment" style="border-top:none;">
             <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name='isBranches' value="{{.Branches}}">
-                <h3 class="ui top attached header">
-                    {{.i18n.Tr "repo.cloudbrain.new"}}
-                </h3>
-                <div class="ui attached segment">
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
-                        <div class="ui blue small menu compact selectcloudbrain">
-                            <a class="active item" href="{{.RepoLink}}/cloudbrain/create">
-                                <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
-                                    height="16">
-                                    <path fill="none" d="M0 0h24v24H0z" />
-                                    <path
-                                        d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
-                                </svg>
-                                CPU/GPU
-                            </a>
-                            <a class="item" href="{{.RepoLink}}/modelarts/notebook/create">
-                                <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
-                                    height="16">
-                                    <path fill="none" d="M0 0h24v24H0z" />
-                                    <path
-                                        d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
-                                </svg>
-                                Ascend NPU</a>
-                        </div>
-                    </div>
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.task_name"}}</label>
-                        <input name="display_job_name" id="cloudbrain_job_name"
-                            placeholder="{{.i18n.Tr "cloudbrain.task_name"}}" value="{{.display_job_name}}" tabindex="3"
-                            autofocus required maxlength="255" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
+                    <div class="ui blue small menu compact selectcloudbrain">
+                        <a class="active item" href="{{.RepoLink}}/cloudbrain/create">
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
+                                height="16">
+                                <path fill="none" d="M0 0h24v24H0z" />
+                                <path
+                                    d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
+                            </svg>
+                            CPU/GPU
+                        </a>
+                        <a class="item" href="{{.RepoLink}}/modelarts/notebook/create">
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
+                                height="16">
+                                <path fill="none" d="M0 0h24v24H0z" />
+                                <path
+                                    d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
+                            </svg>
+                            Ascend NPU</a>
                     </div>
+                </div>
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.task_name"}}</label>
+                    <input name="display_job_name" id="cloudbrain_job_name"
+                        placeholder="{{.i18n.Tr "cloudbrain.task_name"}}" value="{{.display_job_name}}" tabindex="3"
+                        autofocus required maxlength="255" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
+                </div>
 
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.task_type"}}</label>
-                        <select id="cloudbrain_job_type" class="ui search dropdown"
-                            placeholder="{{.i18n.Tr "cloudbrain.task_type"}}" style='width:385px' name="job_type">
-                            <option name="job_type" value="DEBUG">DEBUG</option>
-                        </select>
-                    </div>
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.task_type"}}</label>
+                    <select id="cloudbrain_job_type" class="ui search dropdown"
+                        placeholder="{{.i18n.Tr "cloudbrain.task_type"}}" style='width:385px' name="job_type">
+                        <option name="job_type" value="DEBUG">DEBUG</option>
+                    </select>
+                </div>
 
-                    <div class="inline required field cloudbrain_benchmark">
-                        <label style="vertical-align: top; margin-top:9px">数据集类别</label>
-                        <select class="ui search dropdown" multiple="multiple" id="cloudbrain_benchmark_category"
-                            style='width:385px'>
-                            {{range .benchmark_categories}}
-                            <option value="{{.Value}}">{{.Value}}</option>
-                            {{end}}
-                        </select>
-                        <div class="mini ui buttons" style="vertical-align: top; margin-top:9px">
-                            <button class="ui button reset">重置</button>
-                            <div class="or"></div>
-                            <button class="ui positive button active all_selected">全选</button>
-                        </div>
-                    </div>
-                    <input id="store_category" type="hidden" name="get_benchmark_category">
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "repo.modelarts.code_version"}}</label>
-                        <select class="ui dropdown width80 left2 {{if not .Branches}}error{{end}}" id="code_version"
-                            name="branch_name">
-                            {{if .branch_name}}
-                            <option name="branch_name" value="{{.branch_name}}">{{.branch_name}}</option>
-                            {{range $k, $v :=.Branches}}
-                            {{ if ne $v $.branch_name }}
-                            <option name="branch_name" value="{{$v}}">{{$v}}</option>
-                            {{end}}
-                            {{end}}
-                            {{else}}
-                            <option name="branch_name" value="{{.branchName}}">{{.branchName}}</option>
-                            {{range $k, $v :=.Branches}}
-                            {{ if ne $v $.branchName }}
-                            <option name="branch_name" value="{{$v}}">{{$v}}</option>
-                            {{end}}
-                            {{end}}
-                            {{end}}
-                        </select>
-                    </div>
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
-                        <select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型"
-                            style='width:385px' name="gpu_type">
-                            {{range .gpu_types}}
-                            <option value="{{.Queue}}">{{.Value}}</option>
-                            {{end}}
-                        </select>
+                <div class="inline required field cloudbrain_benchmark">
+                    <label style="vertical-align: top; margin-top:9px">数据集类别</label>
+                    <select class="ui search dropdown" multiple="multiple" id="cloudbrain_benchmark_category"
+                        style='width:385px'>
+                        {{range .benchmark_categories}}
+                        <option value="{{.Value}}">{{.Value}}</option>
+                        {{end}}
+                    </select>
+                    <div class="mini ui buttons" style="vertical-align: top; margin-top:9px">
+                        <button class="ui button reset">重置</button>
+                        <div class="or"></div>
+                        <button class="ui positive button active all_selected">全选</button>
                     </div>
+                </div>
+                <input id="store_category" type="hidden" name="get_benchmark_category">
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "repo.modelarts.code_version"}}</label>
+                    <select class="ui dropdown width80 left2 {{if not .Branches}}error{{end}}" id="code_version"
+                        name="branch_name">
+                        {{if .branch_name}}
+                        <option name="branch_name" value="{{.branch_name}}">{{.branch_name}}</option>
+                        {{range $k, $v :=.Branches}}
+                        {{ if ne $v $.branch_name }}
+                        <option name="branch_name" value="{{$v}}">{{$v}}</option>
+                        {{end}}
+                        {{end}}
+                        {{else}}
+                        <option name="branch_name" value="{{.branchName}}">{{.branchName}}</option>
+                        {{range $k, $v :=.Branches}}
+                        {{ if ne $v $.branchName }}
+                        <option name="branch_name" value="{{$v}}">{{$v}}</option>
+                        {{end}}
+                        {{end}}
+                        {{end}}
+                    </select>
+                </div>
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
+                    <select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型"
+                        style='width:385px' name="gpu_type">
+                        {{range .gpu_types}}
+                        <option value="{{.Queue}}">{{.Value}}</option>
+                        {{end}}
+                    </select>
+                </div>
 
-                    <div id="images-new-cb">
+                <div id="images-new-cb">
 
-                    </div>
-                    <div id="select-multi-dataset">
+                </div>
+                <div id="select-multi-dataset">
 
+                </div>
+                
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
+                    <select id="cloudbrain_resource_spec" class="ui search dropdown" blance="{{.PointAccount.Balance}}"
+                        placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
+                        name="resource_spec_id">
+                        {{range .resource_specs}}
+                        <option name="resource_spec_id" value="{{.Id}}" unitprice="{{.UnitPrice}}">
+                            {{$.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}}，
+                            {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}}
+                        </option>
+                        {{end}}
+                    </select>
+                    <div class="cloudbrain_resource_spec_blance_tip width70" style="padding:0 5px;margin:6px 0;margin-left:135px;font-size:12px;">
+                        <span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
+                        <span style="float:right;">
+                            <i class="question circle icon link" data-position="right center" data-variation="mini"></i>
+                            <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
+                        </span>
                     </div>
-                    
-                    <div class="inline required field">
-                        <label>{{.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 .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>
 
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.dataset_storage_path"}}</label>
-                        <input name="dataset_path" id="cloudbrain_dataset_path" value="{{.dataset_path}}" tabindex="3"
-                            disabled autofocus required maxlength="255" readonly="readonly">
-                    </div>
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.model_storage_path"}}</label>
-                        <input name="model_path" id="cloudbrain_model_path" value="{{.model_path}}" tabindex="3"
-                            disabled autofocus required maxlength="255" readonly="readonly">
-                    </div>
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.code_storage_path"}}</label>
-                        <input name="code_path" id="cloudbrain_code_path" value="{{.code_path}}" tabindex="3" disabled
-                            autofocus required maxlength="255" readonly="readonly">
-                    </div>
-                    <div class="inline required field cloudbrain_benchmark">
-                        <label>{{.i18n.Tr "cloudbrain.benchmark_path"}}</label>
-                        <input name="benchmark_path" id="cloudbrain_benchmark_path" value="{{.benchmark_path}}"
-                            tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
-                    </div>
-                    <div class="inline required field cloudbrain_snn4imagenet">
-                        <label>{{.i18n.Tr "cloudbrain.snn4imagenet_path"}}</label>
-                        <input name="snn4imagenet_path" id="cloudbrain_snn4imagenet_path" value="{{.snn4imagenet_path}}"
-                            tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
-                    </div>
-                    <div class="inline required field cloudbrain_brainscore">
-                        <label>{{.i18n.Tr "cloudbrain.brainscore_path"}}</label>
-                        <input name="brainscore_path" id="cloudbrain_brainscore_path" value="{{.brainscore_path}}"
-                            tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
-                    </div>
-                    <div class="inline required field" hidden>
-                        <label>{{.i18n.Tr "cloudbrain.start_command"}}</label>
-                        <textarea name="command" rows="10" readonly="readonly">{{.command}}</textarea>
-                    </div>
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.dataset_storage_path"}}</label>
+                    <input name="dataset_path" id="cloudbrain_dataset_path" value="{{.dataset_path}}" tabindex="3"
+                        disabled autofocus required maxlength="255" readonly="readonly">
+                </div>
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.model_storage_path"}}</label>
+                    <input name="model_path" id="cloudbrain_model_path" value="{{.model_path}}" tabindex="3"
+                        disabled autofocus required maxlength="255" readonly="readonly">
+                </div>
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.code_storage_path"}}</label>
+                    <input name="code_path" id="cloudbrain_code_path" value="{{.code_path}}" tabindex="3" disabled
+                        autofocus required maxlength="255" readonly="readonly">
+                </div>
+                <div class="inline required field cloudbrain_benchmark">
+                    <label>{{.i18n.Tr "cloudbrain.benchmark_path"}}</label>
+                    <input name="benchmark_path" id="cloudbrain_benchmark_path" value="{{.benchmark_path}}"
+                        tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
+                </div>
+                <div class="inline required field cloudbrain_snn4imagenet">
+                    <label>{{.i18n.Tr "cloudbrain.snn4imagenet_path"}}</label>
+                    <input name="snn4imagenet_path" id="cloudbrain_snn4imagenet_path" value="{{.snn4imagenet_path}}"
+                        tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
+                </div>
+                <div class="inline required field cloudbrain_brainscore">
+                    <label>{{.i18n.Tr "cloudbrain.brainscore_path"}}</label>
+                    <input name="brainscore_path" id="cloudbrain_brainscore_path" value="{{.brainscore_path}}"
+                        tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
+                </div>
+                <div class="inline required field" hidden>
+                    <label>{{.i18n.Tr "cloudbrain.start_command"}}</label>
+                    <textarea name="command" rows="10" readonly="readonly">{{.command}}</textarea>
+                </div>
 
-                    <div class="inline field">
-                        <label></label>
-                        <button class="ui green button">
-                            {{.i18n.Tr "repo.cloudbrain.new"}}
-                        </button>
-                        <a class="ui button cancel"
-                            href="{{.RepoLink}}/debugjob?debugListType=all">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
-                    </div>
+                <div class="inline field">
+                    <label></label>
+                    <button class="ui green button">
+                        {{.i18n.Tr "repo.cloudbrain.new"}}
+                    </button>
+                    <a class="ui button cancel"
+                        href="{{.RepoLink}}/debugjob?debugListType=all">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                 </div>
-            </form>
+            </form> 
         </div>
-    </div>
+    </div>   
 </div>
 {{template "base/footer" .}}
 <script>
@@ -374,4 +399,19 @@
         $('#store_category').attr("value", selected_value)
     })
 
+    ;(function() {
+        $('#cloudbrain_resource_spec').on('change', function(e) {
+            var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip');
+            var val = $(this).val();
+            var blance = $(this).attr('blance');
+            var unitPrice = $(this).find('option:selected').attr('unitprice');
+            if (unitPrice == 0) {
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide();
+            } else {
+                var canUseTime = Number(blance) / Number(unitPrice);
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').text(canUseTime.toFixed(2)).parent().show();
+            }
+        }).trigger('change');        
+    })();
+
 </script>

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -25,6 +25,10 @@
         margin-left: -2px;
     }
 
+    .width485 {
+        width: 48.5% !important;       
+    }
+
     .width85 {
         width: 85% !important;
         margin-left: 10.5rem !important;
@@ -247,13 +251,22 @@
 
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
-                    <select id="cloudbrain_resource_spec" class="ui search dropdown" placeholder="选择资源规格"
-                        style='width:385px' name="resource_spec_id">
+                    <select id="cloudbrain_resource_spec" class="ui search dropdown width485" placeholder="选择资源规格"
+                        style='width:385px' name="resource_spec_id" blance="{{.PointAccount.Balance}}">
                         {{range .train_resource_specs}}
-                        <option name="resource_spec_id" value="{{.Id}}">
-                            GPU数：{{.GpuNum}}，CPU数：{{.CpuNum}}，内存(MB)：{{.MemMiB}}，共享内存(MB)：{{.ShareMemMiB}}</option>
+                        <option name="resource_spec_id" value="{{.Id}}" unitprice="{{.UnitPrice}}">
+                            GPU数：{{.GpuNum}}，CPU数：{{.CpuNum}}，内存(MB)：{{.MemMiB}}，共享内存(MB)：{{.ShareMemMiB}}，
+                            {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}}
+                        </option>
                         {{end}}
                     </select>
+                    <div class="cloudbrain_resource_spec_blance_tip width485" style="padding:0 5px;margin:6px 0;margin-left:154px;font-size:12px;">
+                        <span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
+                        <span style="float:right;">
+                            <i class="question circle icon link" data-position="right center" data-variation="mini"></i>
+                            <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
+                        </span>
+                    </div>
                 </div>
 
                 <div class="inline field" style="padding: 1rem 0;">
@@ -493,4 +506,19 @@
         send_run_para()
         validate()
     })
+
+    ;(function() {
+        $('#cloudbrain_resource_spec').on('change', function(e) {
+            var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip');
+            var val = $(this).val();
+            var blance = $(this).attr('blance');
+            var unitPrice = $(this).find('option:selected').attr('unitprice');
+            if (unitPrice == 0) {
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide();
+            } else {
+                var canUseTime = Number(blance) / Number(unitPrice);
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').text(canUseTime.toFixed(2)).parent().show();
+            }
+        }).trigger('change');        
+    })();
 </script>

templates/repo/modelarts/inferencejob/new.tmpl

@@ -222,11 +222,21 @@
                 <!-- 规格 -->
                 <div class="required unite min_title inline field" id="flaver_name">
                     <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <select class="ui dropdown width80" id="trainjob-flavor" name="flavor">
+                    <select class="ui dropdown width80" id="trainjob-flavor" name="flavor" blance="{{.PointAccount.Balance}}">
                         {{range .flavor_infos}}
-                            <option name="flavor" value="{{.Code}}">{{.Value}}</option>
+                            <option name="flavor" value="{{.Code}}" unitprice="{{.UnitPrice}}">
+                                {{.Value}}
+                                {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}}
+                            </option>
                         {{end}}
                     </select>
+                    <div class="cloudbrain_resource_spec_blance_tip width80" style="padding:0 5px;margin:6px 0;margin-left:79px;font-size:12px;">
+                        <span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
+                        <span style="float:right;">
+                            <i class="question circle icon link" data-position="right center" data-variation="mini"></i>
+                            <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
+                        </span>
+                    </div>
                 </div>
                 <!-- 计算节点 -->
                 <div class="inline required unite min_title field">
@@ -463,4 +473,19 @@
         get_name()
         validate()
     })
+
+    ;(function() {
+        $('#trainjob-flavor').on('change', function(e) {
+            var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip');
+            var val = $(this).val();
+            var blance = $(this).attr('blance');
+            var unitPrice = $(this).find('option:selected').attr('unitprice');
+            if (unitPrice == 0) {
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide();
+            } else {
+                var canUseTime = Number(blance) / Number(unitPrice);
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').text(canUseTime.toFixed(2)).parent().show();
+            }
+        }).trigger('change');        
+    })();
 </script>

templates/repo/modelarts/notebook/new.tmpl

@@ -3,6 +3,26 @@
 .inline.required.field.cloudbrain_benchmark {
         display: none;
 }
+.inline.field {
+    padding-left: 12rem !important;
+}
+
+.inline.field>label {
+    width: 120px !important;
+    text-align: right;
+}
+
+.inline.field .dropdown.selection {
+    width: 60% !important;
+}
+
+.width70 {
+    width: 60% !important;
+}
+
+.inline.field input {
+    width: 40% !important;
+}
 </style>
 
 <div id="mask">
@@ -16,87 +36,92 @@
 </div>
 <div class="repository">
     {{template "repo/header" .}}
-    <div class="repository new repo ui middle very relaxed page grid">
-        <div class="column">
-            <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
-            {{template "base/alert" .}}
-            <div class="ui negative message" id="messageInfo">
-                    <p></p>
-            </div>
+    <div class="ui container">
+        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+            {{.i18n.Tr "repo.cloudbrain.new"}}
+        </h4>
+        <div class="ui negative message" id="messageInfo" style="display:none">
+            <p></p>
+        </div>
+        <div class="ui attached segment" style="border-top:none;">
             <form class="ui form" id="form_id" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
-                <h3 class="ui top attached header">
-                    {{.i18n.Tr "repo.cloudbrain.new"}}
-                </h3>
-                <div class="ui attached segment">
-                    <!-- <br> -->
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
-                        <div class="ui blue small menu compact selectcloudbrain">
-                            <a class="item" href="{{.RepoLink}}/cloudbrain/create">
-                                <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
-                                    <path fill="none" d="M0 0h24v24H0z"/>
-                                    <path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
-                                </svg>
-                                CPU/GPU</a>
-                            <a class="active item" href="{{.RepoLink}}/modelarts/notebook/create">
-                                <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
-                                    <path fill="none" d="M0 0h24v24H0z"/>
-                                    <path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
-                                </svg>
-                                Ascend NPU</a>
-                        </div>
-                    </div>
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.task_name"}}</label>
-                        <input name="display_job_name" id="cloudbrain_job_name" placeholder="任务名称" value="{{.display_job_name}}" tabindex="3" autofocus required maxlength="255" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
+                    <div class="ui blue small menu compact selectcloudbrain">
+                        <a class="item" href="{{.RepoLink}}/cloudbrain/create">
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
+                                <path fill="none" d="M0 0h24v24H0z"/>
+                                <path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
+                            </svg>
+                            CPU/GPU</a>
+                        <a class="active item" href="{{.RepoLink}}/modelarts/notebook/create">
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
+                                <path fill="none" d="M0 0h24v24H0z"/>
+                                <path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
+                            </svg>
+                            Ascend NPU</a>
                     </div>
+                </div>
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.task_name"}}</label>
+                    <input name="display_job_name" id="cloudbrain_job_name" placeholder="任务名称" value="{{.display_job_name}}" tabindex="3" autofocus required maxlength="255" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
+                </div>
 
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.mirror"}}</label>
-                        <select id="cloudbrain_image" class="ui search dropdown" placeholder="{{.i18n.Tr "cloudbrain.choose_mirror"}}" style='width:385px' name="image_id">
-                            {{range .images}}
-                                <option name="image_id" value="{{.Id}}">{{.Value}}</option>
-                            {{end}}
-                        </select>
-                    </div>
-                    <div id="select-multi-dataset">
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.mirror"}}</label>
+                    <select id="cloudbrain_image" class="ui search dropdown" placeholder="{{.i18n.Tr "cloudbrain.choose_mirror"}}" style='width:385px' name="image_id">
+                        {{range .images}}
+                            <option name="image_id" value="{{.Id}}">{{.Value}}</option>
+                        {{end}}
+                    </select>
+                </div>
+                <div id="select-multi-dataset">
 
-                    </div>
+                </div>
 
-                    <!--<div class="inline required field">
-                        <label>工作环境</label>
-                        <input name="de" id="cloudbrain_de" value="{{.env}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
-                    </div>
-                    <div class="inline required field">
-                        <label>类型</label>
-                        <input name="job_type" id="cloudbrain_job_type" value="{{.notebook_type}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
-                    </div> -->
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "cloudbrain.specification"}}</label>
-                        <select id="cloudbrain_flavor" class="ui search dropdown" placeholder="选择规格" style='width:385px' name="flavor">
-                            {{range .flavors}}
-                                <option name="flavor" value="{{.Value}}">{{.Desc}}</option>
-
-                            {{end}}
-                        </select>
-                    </div>
-                    <!--<div class="inline required field">
-                        <label>数据集存放路径</label>
-                        <input name="dataset_path" id="cloudbrain_dataset_path" value="{{.dataset_path}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
-                    </div> -->
-                    <div class="inline field">
-                        <label>{{.i18n.Tr "cloudbrain.description"}}</label>
-                        <input name="description" id="cloudbrain_description" tabindex="3" autofocus maxlength="255">
-                    </div>
-                    <div class="inline field">
-                        <label></label>
-                        <button class="ui green button">
-                            {{.i18n.Tr "repo.cloudbrain.new"}}
-                        </button>
-                        <a class="ui button cancel" href="{{.RepoLink}}/debugjob?debugListType=all">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                <!--<div class="inline required field">
+                    <label>工作环境</label>
+                    <input name="de" id="cloudbrain_de" value="{{.env}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
+                </div>
+                <div class="inline required field">
+                    <label>类型</label>
+                    <input name="job_type" id="cloudbrain_job_type" value="{{.notebook_type}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
+                </div> -->
+                <div class="inline required field">
+                    <label>{{.i18n.Tr "cloudbrain.specification"}}</label>
+                    <select id="cloudbrain_flavor" class="ui search dropdown" placeholder="选择规格" style='width:385px' name="flavor" blance="{{.PointAccount.Balance}}">
+                        {{range .flavors}}
+                            <option name="flavor" value="{{.Value}}" unitprice="{{.UnitPrice}}">{{.Desc}}，
+                            {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}}
+                            </option>
+                        {{end}}
+                    </select>
+                    <div class="cloudbrain_resource_spec_blance_tip width70" style="padding:0 5px;margin:6px 0;margin-left:135px;font-size:12px;">
+                        <span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
+                        <span style="float:right;">
+                            <i class="question circle icon link" data-position="right center" data-variation="mini"></i>
+                            <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
+                        </span>
                     </div>
                 </div>
+                <!--<div class="inline required field">
+                    <label>数据集存放路径</label>
+                    <input name="dataset_path" id="cloudbrain_dataset_path" value="{{.dataset_path}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
+                </div> -->
+                <div class="inline field">
+                    <label>{{.i18n.Tr "cloudbrain.description"}}</label>
+                    <input name="description" id="cloudbrain_description" tabindex="3" autofocus maxlength="255">
+                </div>
+                <div class="inline field">
+                    <label></label>
+                    <button class="ui green button">
+                        {{.i18n.Tr "repo.cloudbrain.new"}}
+                    </button>
+                    <a class="ui button cancel" href="{{.RepoLink}}/debugjob?debugListType=all">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                </div>
             </form>
         </div>
     </div>
@@ -158,4 +183,19 @@
     }
     });
     });
+
+    ;(function() {
+        $('#cloudbrain_flavor').on('change', function(e) {
+            var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip');
+            var val = $(this).val();
+            var blance = $(this).attr('blance');
+            var unitPrice = $(this).find('option:selected').attr('unitprice');
+            if (unitPrice == 0) {
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide();
+            } else {
+                var canUseTime = Number(blance) / Number(unitPrice);
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').text(canUseTime.toFixed(2)).parent().show();
+            }
+        }).trigger('change');        
+    })();
 </script>

templates/repo/modelarts/trainjob/new.tmpl

@@ -247,11 +247,21 @@
 
                 <div class="required inline min_title field" id="flaver_name">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
-                    <select class="ui dropdown width48" id="trainjob-flavor" name="flavor">
+                    <select class="ui dropdown width48" id="trainjob-flavor" name="flavor" blance="{{.PointAccount.Balance}}">
                         {{range .flavor_infos}}
-                        <option name="flavor" value="{{.Code}}">{{.Value}}</option>
+                        <option name="flavor" value="{{.Code}}" unitprice="{{.UnitPrice}}">
+                            {{.Value}}
+                            {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}}
+                        </option>
                         {{end}}
                     </select>
+                    <div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
+                        <span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
+                        <span style="float:right;">
+                            <i class="question circle icon link" data-position="right center" data-variation="mini"></i>
+                            <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
+                        </span>
+                    </div>
                 </div>
                 <div class="inline required min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label>
@@ -503,4 +513,19 @@
         send_run_para()
         validate()
     })
+
+    ;(function() {
+        $('#trainjob-flavor').on('change', function(e) {
+            var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip');
+            var val = $(this).val();
+            var blance = $(this).attr('blance');
+            var unitPrice = $(this).find('option:selected').attr('unitprice');
+            if (unitPrice == 0) {
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide();
+            } else {
+                var canUseTime = Number(blance) / Number(unitPrice);
+                cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').text(canUseTime.toFixed(2)).parent().show();
+            }
+        }).trigger('change');        
+    })();
 </script>