@@ -302,34 +287,35 @@
case 13:return false;
}
});
- let sever_num = $('#trainjob_work_server_num')
- $('.add').click(function () {
- sever_num.val(parseInt(sever_num.val()) + 1)
- if (sever_num.val() >= 26) {
- sever_num.val(parseInt(sever_num.val()) - 1)
- }
- })
- $('.min').click(function () {
- sever_num.val(parseInt(sever_num.val()) - 1)
- if (sever_num.val() <= 0) {
- sever_num.val(parseInt(sever_num.val()) + 1)
- }
+ $(document).ready(function(){
+ let params = $('.dynamic.field').data('params')
+ params&¶ms.parameter.forEach((item,index)=>{
+ Add_parameter(index,flag=true,item)
+ })
+
})
// 参数增加、删除、修改、保存
- function Add_parameter(i) {
- value = '
' +
- '
' +
- ' ' +
- '
' +
- '
' +
- '' +
- '
' +
- '
' +
- '' +
- '' +
- '' +
- '
'
+ function Add_parameter(i,flag=false,paramsObject={}) {
+ let value = ''
+ value += `
'
$(".dynamic.field").append(value)
+
}
$('#add_run_para').click(function () {
@@ -347,80 +333,13 @@
})
});
- $('.ui.parameter.green.button').click(function () {
- var parameters = [];
- $('table tr').each(function () {
- $(this).find('td:eq(1)').each(function () {
- parameters.push($(this).text());
- })
- $(this).find('input').each(function () {
- parameters.push($(this).text())
- })
-
- });
- $('.ui.parameter.modal')
- .modal('hide');
- for (var i = 2; i < parameters.length; i++) {
- switch (i) {
- // 数据集uuid待完成
- // case (2):
- // console.log(1)
- // break;
- // $("#trainjob_datasets").val(parameters[i]);
- // console.log($("#trainjob_datasets").val())
- case (3):
- $("input[name='boot_file']").val(parameters[i]);
- break;
- case (4):
- var para = parameters[i].split(" ")
- for (var j = 0; j < para.length; j++) {
- var para_name = para[j].split('=')[0]
- var para_value = para[j].split('=')[1]
- var len = $(".dynamic.field .two.fields").length
- Add_parameter(len)
- var pid = 'para' + len
- $(".dynamic.field" + " #" + pid + "").find("input[name=shipping_first-name]").val(para_name)
- $(".dynamic.field" + " #" + pid + "").find("input[name=shipping_last-name]").val(para_value)
- }
- break;
- // 数据集pool_id待完成
- // case (5):
- // $("select[name='pool_id']").val(parameters[i]);
- // break;
- case (6):
- $("input[name='work_server_number']").val(parameters[i]);
- break;
- }
- }
- })
- $('.ui.save.checkbox').click(function () {
- $(this).checkbox({
- onChange: function () {
- if ($('.ui.save.checkbox').checkbox('is checked')) {
- $('#save_para').removeClass("disabled")
-
- } else {
- $('#save_para').addClass("disabled")
- }
- }
- });
- })
$('.question.circle.icon').hover(function () {
$(this).popup('show')
});
- $(".item.active.parameter_config").click(function () {
- $('.ui.parameter.modal')
- .modal('setting', 'closable', false)
- .modal('show');
- })
- $('.ui.deny.button').click(function () {
- $('.ui.parameter.modal')
- .modal('hide');
- })
$('select.dropdown')
.dropdown();
@@ -489,8 +408,8 @@
var run_parameters = []
var msg = {}
$(".dynamic.field .two.fields").each(function () {
- var para_name = $(this).find('input[name=shipping_first-name]').val()
- var para_value = $(this).find('input[name=shipping_last-name]').val()
+ var para_name = $(this).find('input.shipping_first-name').val()
+ var para_value = $(this).find('input.shipping_last-name').val()
run_parameters.push({ "label": para_name, "value": para_value })
})
msg["parameter"] = run_parameters
diff --git a/templates/repo/grampus/trainjob/gpu/new.tmpl b/templates/repo/grampus/trainjob/gpu/new.tmpl
index 85fc1ef67..142e5bd90 100755
--- a/templates/repo/grampus/trainjob/gpu/new.tmpl
+++ b/templates/repo/grampus/trainjob/gpu/new.tmpl
@@ -179,25 +179,8 @@
{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}
-
- {{if .params}}
- {{if ne 0 (len .params)}}
- {{range $k ,$v := .params}}
-
- {{end}}
- {{end}}
- {{end}}
+
+
@@ -248,125 +231,58 @@
$('.menu .item')
.tab();
- let sever_num = $('#trainjob_work_server_num')
- $('.add').click(function(){
- sever_num.val(parseInt(sever_num.val())+1)
- if(sever_num.val()>=26){
- sever_num.val(parseInt(sever_num.val())-1)
- }
- })
- $('.min').click(function(){
- sever_num.val(parseInt(sever_num.val())-1)
- if(sever_num.val()<=0){
- sever_num.val(parseInt(sever_num.val())+1)
- }
+
+ $(document).ready(function(){
+ let params = $('.dynamic.field').data('params')
+ params&¶ms.parameter.forEach((item,index)=>{
+ Add_parameter(index,flag=true,item)
+ })
+
})
// 参数增加、删除、修改、保存
- function Add_parameter(i){
- value = '
' +
- '
' +
- ' ' +
- '
' +
- '
' +
- '' +
- '
'+
- '
' +
- '' +
- '' +
- '' +
- '
'
+ function Add_parameter(i,flag=false,paramsObject={}) {
+ let value = ''
+ value += `
'
$(".dynamic.field").append(value)
- }
- $('#add_run_para').click(function(){
+ }
+
+ $('#add_run_para').click(function () {
var len = $(".dynamic.field .two.fields").length
Add_parameter(len)
});
- $(".dynamic.field").on("click",".trash.icon", function() {
+ $(".dynamic.field").on("click", ".trash.icon", function () {
var index = $(this).parent().parent().index()
$(this).parent().parent().remove()
var len = $(".dynamic.field .two.fields").length
- $(".dynamic.field .two.fields").each(function(){
+ $(".dynamic.field .two.fields").each(function () {
var cur_index = $(this).index()
$(this).attr('id', 'para' + cur_index)
})
});
- $('.ui.parameter.green.button').click(function(){
- var parameters = [];
- $('table tr').each(function() {
- $(this).find('td:eq(1)').each(function(){
- parameters.push($(this).text());
- })
- $(this).find('input').each(function(){
- parameters.push($(this).text())
- })
-
- });
- $('.ui.parameter.modal')
- .modal('hide');
- for(var i = 2; i < parameters.length; i++){
- switch(i) {
- // 数据集uuid待完成
- // case (2):
- // console.log(1)
- // break;
- // $("#trainjob_datasets").val(parameters[i]);
- // console.log($("#trainjob_datasets").val())
- case (3):
- $("input[name='boot_file']").val(parameters[i]);
- break;
- case (4):
- var para = parameters[i].split(" ")
- for(var j = 0; j < para.length; j++){
- var para_name = para[j].split('=')[0]
- var para_value = para[j].split('=')[1]
- var len = $(".dynamic.field .two.fields").length
- Add_parameter(len)
- var pid = 'para' + len
- $(".dynamic.field"+ " #" + pid + "").find("input[name=shipping_first-name]").val(para_name)
- $(".dynamic.field"+ " #" + pid + "").find("input[name=shipping_last-name]").val(para_value)
- }
- break;
- // 数据集pool_id待完成
- // case (5):
- // $("select[name='pool_id']").val(parameters[i]);
- // break;
- case (6):
- $("input[name='work_server_number']").val(parameters[i]);
- break;
- }
- }
- })
-
- $('.ui.save.checkbox').click(function(){
- $(this).checkbox({
- onChange: function(){
- if ($('.ui.save.checkbox').checkbox('is checked')){
- $('#save_para').removeClass("disabled")
-
- }else{
- $('#save_para').addClass("disabled")
- }
- }
- });
- })
$('.question.circle.icon').hover(function(){
$(this).popup('show')
});
- $(".item.active.parameter_config").click(function(){
- $('.ui.parameter.modal')
- .modal('setting', 'closable', false)
- .modal('show');
- })
-
- $('.ui.deny.button').click(function(){
- $('.ui.parameter.modal')
- .modal('hide');
- })
$('select.dropdown')
.dropdown();
@@ -432,13 +348,13 @@
document.getElementById("mask").style.display = "none"
}
}
- function send_run_para(){
+ function send_run_para() {
var run_parameters = []
var msg = {}
- $(".dynamic.field .two.fields").each(function(){
- var para_name = $(this).find('input[name=shipping_first-name]').val()
- var para_value = $(this).find('input[name=shipping_last-name]').val()
- run_parameters.push({"label": para_name, "value": para_value})
+ $(".dynamic.field .two.fields").each(function () {
+ var para_name = $(this).find('input.shipping_first-name').val()
+ var para_value = $(this).find('input.shipping_last-name').val()
+ run_parameters.push({ "label": para_name, "value": para_value })
})
msg["parameter"] = run_parameters
msg = JSON.stringify(msg)
@@ -446,7 +362,7 @@
}
validate();
$('.ui.create_train_job.green.button').click(function(e) {
- send_run_para();
+ send_run_para()
validate();
})
\ No newline at end of file
diff --git a/templates/repo/grampus/trainjob/npu/new.tmpl b/templates/repo/grampus/trainjob/npu/new.tmpl
index 612c61833..9b31f4c7a 100755
--- a/templates/repo/grampus/trainjob/npu/new.tmpl
+++ b/templates/repo/grampus/trainjob/npu/new.tmpl
@@ -152,7 +152,6 @@
{{end}}
-