| @@ -126,22 +126,26 @@ | |||||
| {{template "custom/select_dataset_train" .}} | {{template "custom/select_dataset_train" .}} | ||||
| <div class="required unite min_title inline field" style="margin-top:2rem;"> | <div class="required unite min_title inline field" style="margin-top:2rem;"> | ||||
| <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> | <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> | ||||
| <select id="cloudbrain_resource_spec" class="ui search dropdown" blance="{{.PointAccount.Balance}}" | |||||
| <select id="cloudbrain_resource_spec" class="ui search dropdown" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} | |||||
| placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' | placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' | ||||
| name="resource_spec_id"> | name="resource_spec_id"> | ||||
| {{range .benchmark_resource_specs}} | {{range .benchmark_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 name="resource_spec_id" value="{{.Id}}" {{if $.CloudBrainPaySwitch}}unitprice="{{.UnitPrice}}"{{end}}> | |||||
| {{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(GB):{{MB2GB .MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(GB):{{MB2GB .ShareMemMiB}} | |||||
| {{if $.CloudBrainPaySwitch}} | |||||
| ,{{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{end}} | |||||
| </option> | </option> | ||||
| {{end}} | {{end}} | ||||
| </select> | </select> | ||||
| {{if .CloudBrainPaySwitch}} | |||||
| <div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:73px;font-size:12px;"> | <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>{{$.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;"> | <span style="float:right;"> | ||||
| <i class="question circle icon link" data-position="right center" data-variation="mini"></i> | <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> | <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | ||||
| </span> | </span> | ||||
| {{end}} | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="inline unite min_title field"> | <div class="inline unite min_title field"> | ||||
| @@ -226,15 +230,18 @@ | |||||
| <div class="required unite min_title inline field"> | <div class="required unite min_title inline field"> | ||||
| <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> | <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" | ||||
| placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' blance="{{.PointAccount.Balance}}" | |||||
| placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} | |||||
| name="resource_spec_id"> | name="resource_spec_id"> | ||||
| {{range .benchmark_resource_specs}} | {{range .benchmark_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 name="resource_spec_id" value="{{.Id}}" {{if $.CloudBrainPaySwitch}}unitprice="{{.UnitPrice}}"{{end}}> | |||||
| {{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(GB):{{MB2GB .MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(GB):{{MB2GB .ShareMemMiB}} | |||||
| {{if $.CloudBrainPaySwitch}} | |||||
| ,{{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{end}} | |||||
| </option> | </option> | ||||
| {{end}} | {{end}} | ||||
| </select> | </select> | ||||
| {{if .CloudBrainPaySwitch}} | |||||
| <div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:74px;font-size:12px;"> | <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>{{$.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;"> | <span style="float:right;"> | ||||
| @@ -242,6 +249,7 @@ | |||||
| <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | ||||
| </span> | </span> | ||||
| </div> | </div> | ||||
| {{end}} | |||||
| </div> | </div> | ||||
| <div class="inline unite min_title field required"> | <div class="inline unite min_title field required"> | ||||
| @@ -375,6 +383,7 @@ | |||||
| var val = $(this).val(); | var val = $(this).val(); | ||||
| var blance = $(this).attr('blance'); | var blance = $(this).attr('blance'); | ||||
| var unitPrice = $(this).find('option:selected').attr('unitprice'); | var unitPrice = $(this).find('option:selected').attr('unitprice'); | ||||
| if (!blance || !unitPrice) return; | |||||
| if (unitPrice == 0) { | if (unitPrice == 0) { | ||||
| cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | ||||
| } else { | } else { | ||||
| @@ -243,16 +243,19 @@ | |||||
| <div class="inline required field"> | <div class="inline required field"> | ||||
| <label>{{.i18n.Tr "cloudbrain.resource_specification"}}</label> | <label>{{.i18n.Tr "cloudbrain.resource_specification"}}</label> | ||||
| <select id="cloudbrain_resource_spec" class="ui search dropdown" blance="{{.PointAccount.Balance}}" | |||||
| <select id="cloudbrain_resource_spec" class="ui search dropdown" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} | |||||
| placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' | placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' | ||||
| name="resource_spec_id"> | name="resource_spec_id"> | ||||
| {{range .resource_specs}} | {{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 name="resource_spec_id" value="{{.Id}}" {{if $.CloudBrainPaySwitch}}unitprice="{{.UnitPrice}}"{{end}}> | |||||
| {{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(GB):{{MB2GB .MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(GB):{{MB2GB .ShareMemMiB}} | |||||
| {{if $.CloudBrainPaySwitch}} | |||||
| ,{{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{end}} | |||||
| </option> | </option> | ||||
| {{end}} | {{end}} | ||||
| </select> | </select> | ||||
| {{if .CloudBrainPaySwitch}} | |||||
| <div class="cloudbrain_resource_spec_blance_tip width70" style="padding:0 5px;margin:6px 0;margin-left:135px;font-size:12px;"> | <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>{{$.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;"> | <span style="float:right;"> | ||||
| @@ -260,6 +263,7 @@ | |||||
| <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | ||||
| </span> | </span> | ||||
| </div> | </div> | ||||
| {{end}} | |||||
| </div> | </div> | ||||
| <div class="inline required field"> | <div class="inline required field"> | ||||
| @@ -405,6 +409,7 @@ | |||||
| var val = $(this).val(); | var val = $(this).val(); | ||||
| var blance = $(this).attr('blance'); | var blance = $(this).attr('blance'); | ||||
| var unitPrice = $(this).find('option:selected').attr('unitprice'); | var unitPrice = $(this).find('option:selected').attr('unitprice'); | ||||
| if (!blance || !unitPrice) return; | |||||
| if (unitPrice == 0) { | if (unitPrice == 0) { | ||||
| cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | ||||
| } else { | } else { | ||||
| @@ -252,14 +252,17 @@ | |||||
| <div class="required min_title inline field"> | <div class="required min_title inline field"> | ||||
| <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> | <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> | ||||
| <select id="cloudbrain_resource_spec" class="ui search dropdown width485" placeholder="选择资源规格" | <select id="cloudbrain_resource_spec" class="ui search dropdown width485" placeholder="选择资源规格" | ||||
| style='width:385px' name="resource_spec_id" blance="{{.PointAccount.Balance}}"> | |||||
| style='width:385px' name="resource_spec_id" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}> | |||||
| {{range .train_resource_specs}} | {{range .train_resource_specs}} | ||||
| <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 name="resource_spec_id" value="{{.Id}}" {{if $.CloudBrainPaySwitch}}unitprice="{{.UnitPrice}}"{{end}}> | |||||
| {{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(GB):{{MB2GB .MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(GB):{{MB2GB .ShareMemMiB}} | |||||
| {{if $.CloudBrainPaySwitch}} | |||||
| ,{{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{end}} | |||||
| </option> | </option> | ||||
| {{end}} | {{end}} | ||||
| </select> | </select> | ||||
| {{if .CloudBrainPaySwitch}} | |||||
| <div class="cloudbrain_resource_spec_blance_tip width485" style="padding:0 5px;margin:6px 0;margin-left:154px;font-size:12px;"> | <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>{{$.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;"> | <span style="float:right;"> | ||||
| @@ -267,6 +270,7 @@ | |||||
| <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | ||||
| </span> | </span> | ||||
| </div> | </div> | ||||
| {{end}} | |||||
| </div> | </div> | ||||
| <div class="inline field" style="padding: 1rem 0;"> | <div class="inline field" style="padding: 1rem 0;"> | ||||
| @@ -513,6 +517,7 @@ | |||||
| var val = $(this).val(); | var val = $(this).val(); | ||||
| var blance = $(this).attr('blance'); | var blance = $(this).attr('blance'); | ||||
| var unitPrice = $(this).find('option:selected').attr('unitprice'); | var unitPrice = $(this).find('option:selected').attr('unitprice'); | ||||
| if (!blance || !unitPrice) return; | |||||
| if (unitPrice == 0) { | if (unitPrice == 0) { | ||||
| cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | ||||
| } else { | } else { | ||||
| @@ -222,14 +222,17 @@ | |||||
| <!-- 规格 --> | <!-- 规格 --> | ||||
| <div class="required unite min_title inline field" id="flaver_name"> | <div class="required unite min_title inline field" id="flaver_name"> | ||||
| <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label> | <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label> | ||||
| <select class="ui dropdown width80" id="trainjob-flavor" name="flavor" blance="{{.PointAccount.Balance}}"> | |||||
| <select class="ui dropdown width80" id="trainjob-flavor" name="flavor" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}> | |||||
| {{range .flavor_infos}} | {{range .flavor_infos}} | ||||
| <option name="flavor" value="{{.Code}}" unitprice="{{.UnitPrice}}"> | |||||
| <option name="flavor" value="{{.Code}}" {{if $.CloudBrainPaySwitch}}unitprice="{{.UnitPrice}}"{{end}}> | |||||
| {{.Value}} | {{.Value}} | ||||
| {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{if $.CloudBrainPaySwitch}} | |||||
| ,{{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{end}} | |||||
| </option> | </option> | ||||
| {{end}} | {{end}} | ||||
| </select> | </select> | ||||
| {{if .CloudBrainPaySwitch}} | |||||
| <div class="cloudbrain_resource_spec_blance_tip width80" style="padding:0 5px;margin:6px 0;margin-left:79px;font-size:12px;"> | <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>{{$.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;"> | <span style="float:right;"> | ||||
| @@ -237,6 +240,7 @@ | |||||
| <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | ||||
| </span> | </span> | ||||
| </div> | </div> | ||||
| {{end}} | |||||
| </div> | </div> | ||||
| <!-- 计算节点 --> | <!-- 计算节点 --> | ||||
| <div class="inline required unite min_title field"> | <div class="inline required unite min_title field"> | ||||
| @@ -480,6 +484,7 @@ | |||||
| var val = $(this).val(); | var val = $(this).val(); | ||||
| var blance = $(this).attr('blance'); | var blance = $(this).attr('blance'); | ||||
| var unitPrice = $(this).find('option:selected').attr('unitprice'); | var unitPrice = $(this).find('option:selected').attr('unitprice'); | ||||
| if (!blance || !unitPrice) return; | |||||
| if (unitPrice == 0) { | if (unitPrice == 0) { | ||||
| cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | ||||
| } else { | } else { | ||||
| @@ -92,13 +92,16 @@ | |||||
| </div> --> | </div> --> | ||||
| <div class="inline required field"> | <div class="inline required field"> | ||||
| <label>{{.i18n.Tr "cloudbrain.specification"}}</label> | <label>{{.i18n.Tr "cloudbrain.specification"}}</label> | ||||
| <select id="cloudbrain_flavor" class="ui search dropdown" placeholder="选择规格" style='width:385px' name="flavor" blance="{{.PointAccount.Balance}}"> | |||||
| <select id="cloudbrain_flavor" class="ui search dropdown" placeholder="选择规格" style='width:385px' name="flavor" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}> | |||||
| {{range .flavors}} | {{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 name="flavor" value="{{.Value}}" {{if $.CloudBrainPaySwitch}}unitprice="{{.UnitPrice}}"{{end}}>{{.Desc}} | |||||
| {{if $.CloudBrainPaySwitch}} | |||||
| ,{{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{end}} | |||||
| </option> | </option> | ||||
| {{end}} | {{end}} | ||||
| </select> | </select> | ||||
| {{if .CloudBrainPaySwitch}} | |||||
| <div class="cloudbrain_resource_spec_blance_tip width70" style="padding:0 5px;margin:6px 0;margin-left:135px;font-size:12px;"> | <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>{{$.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;"> | <span style="float:right;"> | ||||
| @@ -106,6 +109,7 @@ | |||||
| <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | ||||
| </span> | </span> | ||||
| </div> | </div> | ||||
| {{end}} | |||||
| </div> | </div> | ||||
| <!--<div class="inline required field"> | <!--<div class="inline required field"> | ||||
| <label>数据集存放路径</label> | <label>数据集存放路径</label> | ||||
| @@ -190,6 +194,7 @@ | |||||
| var val = $(this).val(); | var val = $(this).val(); | ||||
| var blance = $(this).attr('blance'); | var blance = $(this).attr('blance'); | ||||
| var unitPrice = $(this).find('option:selected').attr('unitprice'); | var unitPrice = $(this).find('option:selected').attr('unitprice'); | ||||
| if (!blance || !unitPrice) return; | |||||
| if (unitPrice == 0) { | if (unitPrice == 0) { | ||||
| cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | ||||
| } else { | } else { | ||||
| @@ -247,14 +247,17 @@ | |||||
| <div class="required inline min_title field" id="flaver_name"> | <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> | <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" blance="{{.PointAccount.Balance}}"> | |||||
| <select class="ui dropdown width48" id="trainjob-flavor" name="flavor" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}> | |||||
| {{range .flavor_infos}} | {{range .flavor_infos}} | ||||
| <option name="flavor" value="{{.Code}}" unitprice="{{.UnitPrice}}"> | |||||
| <option name="flavor" value="{{.Code}}" {{if $.CloudBrainPaySwitch}}unitprice="{{.UnitPrice}}"{{end}}> | |||||
| {{.Value}} | {{.Value}} | ||||
| {{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{if $.CloudBrainPaySwitch}} | |||||
| ,{{ if eq .UnitPrice 0 }}{{$.i18n.Tr "points.free"}}{{else}}{{.UnitPrice}}{{$.i18n.Tr "points.points_hour"}}{{end}} | |||||
| {{end}} | |||||
| </option> | </option> | ||||
| {{end}} | {{end}} | ||||
| </select> | </select> | ||||
| {{if .CloudBrainPaySwitch}} | |||||
| <div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;"> | <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>{{$.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;"> | <span style="float:right;"> | ||||
| @@ -262,6 +265,7 @@ | |||||
| <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a> | ||||
| </span> | </span> | ||||
| </div> | </div> | ||||
| {{end}} | |||||
| </div> | </div> | ||||
| <div class="inline required min_title field"> | <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> | <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label> | ||||
| @@ -518,8 +522,9 @@ | |||||
| $('#trainjob-flavor').on('change', function(e) { | $('#trainjob-flavor').on('change', function(e) { | ||||
| var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip'); | var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip'); | ||||
| var val = $(this).val(); | var val = $(this).val(); | ||||
| var blance = $(this).attr('blance'); | |||||
| var blance = $(this).attr('blance'); | |||||
| var unitPrice = $(this).find('option:selected').attr('unitprice'); | var unitPrice = $(this).find('option:selected').attr('unitprice'); | ||||
| if (!blance || !unitPrice) return; | |||||
| if (unitPrice == 0) { | if (unitPrice == 0) { | ||||
| cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide(); | ||||
| } else { | } else { | ||||
| @@ -48,6 +48,9 @@ export function initNotificationCount() { | |||||
| source.addEventListener('reward-operation', async (e) => { | source.addEventListener('reward-operation', async (e) => { | ||||
| try { | try { | ||||
| const data = JSON.parse(e.data); | const data = JSON.parse(e.data); | ||||
| if (data.OperateType !== 'INCREASE') { | |||||
| return; | |||||
| } | |||||
| const notice = $(` | const notice = $(` | ||||
| <div class="__notice-wrap" style="display:none;"> | <div class="__notice-wrap" style="display:none;"> | ||||
| <style> | <style> | ||||
| @@ -94,7 +97,7 @@ export function initNotificationCount() { | |||||
| <div class="__notice-container"> | <div class="__notice-container"> | ||||
| <div class="__notice-content"> | <div class="__notice-content"> | ||||
| <i class="ri-copper-diamond-line" style="padding-right:8px;color:white;font-size:18px;"></i> | <i class="ri-copper-diamond-line" style="padding-right:8px;color:white;font-size:18px;"></i> | ||||
| <span class="__notice-text">${data.OperateType === 'INCREASE' ? ('奖励积分 + ' + data.Amount) : ('扣减积分 - ' + data.Amount) }</span> | |||||
| <span class="__notice-text">${data.OperateType === 'INCREASE' ? ('奖励积分 + ' + data.Amount) : ('扣减积分 ' + data.Amount) }</span> | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| @@ -30,8 +30,8 @@ const en = { | |||||
| CurrAvailableCalcPoints: 'Currently Available Calculation Points', | CurrAvailableCalcPoints: 'Currently Available Calculation Points', | ||||
| totalGainCalcPoints: 'Total Gain of Calculation Points', | totalGainCalcPoints: 'Total Gain of Calculation Points', | ||||
| totalConsumeCalcPoints: 'Total Consume of Calculation Points', | totalConsumeCalcPoints: 'Total Consume of Calculation Points', | ||||
| totalGainDetail: 'Total gain Detail', | |||||
| totalConsumeDetail: 'Total Consume Detail', | |||||
| gainDetail: 'Gain Detail', | |||||
| consumeDetail: 'Consume Detail', | |||||
| serialNumber: 'Serial Number', | serialNumber: 'Serial Number', | ||||
| time: 'Time', | time: 'Time', | ||||
| scene: 'Scene', | scene: 'Scene', | ||||
| @@ -30,8 +30,8 @@ const zh = { | |||||
| CurrAvailableCalcPoints: '当前可用算力积分(分)', | CurrAvailableCalcPoints: '当前可用算力积分(分)', | ||||
| totalGainCalcPoints: '总获取算力积分(分)', | totalGainCalcPoints: '总获取算力积分(分)', | ||||
| totalConsumeCalcPoints: '总消耗算力积分(分)', | totalConsumeCalcPoints: '总消耗算力积分(分)', | ||||
| totalGainDetail: '总获取明细', | |||||
| totalConsumeDetail: '总消耗明细', | |||||
| gainDetail: '获取明细', | |||||
| consumeDetail: '消耗明细', | |||||
| serialNumber: '流水号', | serialNumber: '流水号', | ||||
| time: '时间', | time: '时间', | ||||
| scene: '场景', | scene: '场景', | ||||
| @@ -33,11 +33,11 @@ | |||||
| <div class="__r_p_tab"> | <div class="__r_p_tab"> | ||||
| <div class="__r_p_tab-item" :class="tabIndex === 0 ? '__focus' : ''" style="border-radius: 5px 0px 0px 5px" | <div class="__r_p_tab-item" :class="tabIndex === 0 ? '__focus' : ''" style="border-radius: 5px 0px 0px 5px" | ||||
| @click="tabChange(0)"> | @click="tabChange(0)"> | ||||
| {{ $t('totalGainDetail') }} | |||||
| {{ $t('gainDetail') }} | |||||
| </div> | </div> | ||||
| <div class="__r_p_tab-item" :class="tabIndex === 1 ? '__focus' : ''" style="border-radius: 0px 5px 5px 0px" | <div class="__r_p_tab-item" :class="tabIndex === 1 ? '__focus' : ''" style="border-radius: 0px 5px 5px 0px" | ||||
| @click="tabChange(1)"> | @click="tabChange(1)"> | ||||
| {{ $t('totalConsumeDetail') }} | |||||
| {{ $t('consumeDetail') }} | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="__r_p_table"> | <div class="__r_p_table"> | ||||