diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index b1c339080..1eee752a1 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -839,7 +839,7 @@ modelarts.train_job.new_place=描述字数不超过256个字符 modelarts.model_name=模型名称 modelarts.model_size=模型大小 modelarts.import_model=导入模型 -modelarts.train_job.new_place=描述字数不超过255个字符 +modelarts.train_job.label_place=输入标签,多个标签用空格区分 modelarts.modify=修改 modelarts.current_version=当前版本 modelarts.parent_version=父版本 diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl index 8dfed110b..c260d1f37 100644 --- a/templates/repo/modelmanage/index.tmpl +++ b/templates/repo/modelmanage/index.tmpl @@ -10,6 +10,10 @@ .content-padding{ padding: 40px !important; } +.model_disabled{ + background-color: rgba(245, 245, 246, 100) !important; + color: rgba(136, 136, 136, 100) !important; +}
@@ -82,7 +86,7 @@
@@ -91,10 +146,9 @@ function changeInfo(version){ let versionData = data.filter((item)=>{ return item.Version === version }) - let initObj = transObj(versionData)[0] - let initModelAcc = transObj(versionData)[1] - let id= transObj(data)[2] - $('#showInfo').empty() + let returnArray = [] + returnArray = transObj(versionData) + let [initObj,initModelAcc,id] = returnArray renderInfo(initObj,initModelAcc,id) }) } @@ -105,9 +159,9 @@ function loadInfo(){ html += `` } $('#dropdown').append(html) - let initObj = transObj(data)[0] - let initModelAcc = transObj(data)[1] - let id= transObj(data)[2] + let returnArray = [] + returnArray = transObj(data) + let [initObj,initModelAcc,id] = returnArray renderInfo(initObj,initModelAcc,id) }) } @@ -155,12 +209,14 @@ function tranSize(value){ size=size.toFixed(2);//保留的小数位数 return size+unitArr[index]; } -function editorFn(text,id){ +function editorFn(context){ + let id= context.dataset.id + let text = context.dataset.desc $('#edit-td').replaceWith("
"); } function editorCancel(text,id){ - $('#edit-div').replaceWith('
'+text+'
') + $('#edit-div').replaceWith(`
${text}
`) } function editorSure(text,id){ let description=$('#textarea-value').val() @@ -173,46 +229,66 @@ function editorSure(text,id){ type:'PUT', data:data }).done((res)=>{ - $('#edit-div').replaceWith('
'+description+'
') + $('#edit-div').replaceWith(`
${description}
`) }) } function renderInfo(obj,accObj,id){ - let html = '' - html += '
' - html += '基本信息' - html += '' - html += '' for(let key in obj){ - html += '' - html += `` if(key==="Description"){ - let description = obj[key] - html += '' + $(`#${key}`).text(obj[key]) + $(`#${key}`).attr("title",obj[key]) + + $('#edit-pencil').attr("data-id",id) + $('#edit-pencil').attr("data-desc",obj[key]) + + + }else{ - html += `` + $(`#${key}`).text(obj[key]) + $(`#${key}`).attr("title",obj[key]) } - html += '' + } - - html += '' - html += '
${key}
'+description+'
${obj[key]}
' - html += '
' - html += '
' - html += '模型精度' - html += '' - html += '' for(let key in accObj){ - html += '' - html += `` - html += `` - html += '' - } - html += '' - html += '
${key}${accObj[key]}
' - html += '
' - html += '
' - $('#showInfo').append(html) + $(`#${key}`).text(accObj[key]) + $(`#${key}`).attr("title",accObj[key]) + } + // let html = '' + // html += '
' + // html += '基本信息' + // html += '' + // html += '' + // for(let key in obj){ + // html += '' + // html += `` + // if(key==="Description"){ + // let description = obj[key] + // html += '' + // }else{ + // html += `` + // } + // html += '' + // } + + // html += '' + // html += '
${key}
'+description+'
${obj[key]}
' + // html += '
' + // html += '
' + // html += '模型精度' + // html += '' + // html += '' + // for(let key in accObj){ + // html += '' + // html += `` + // html += `` + // html += '' + // } + // html += '' + // html += '
${key}${accObj[key]}
' + // html += '
' + // html += '
' + // $('#showInfo').append(html) } \ No newline at end of file diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue index dafcce29f..563f0ac7d 100644 --- a/web_src/js/components/Model.vue +++ b/web_src/js/components/Model.vue @@ -149,7 +149,8 @@ export default { fullscreenLoading: false, url:'', isLoading:true, - loadNodeMap:new Map() + loadNodeMap:new Map(), + submitId:{} }; }, methods: { @@ -191,6 +192,9 @@ export default { .modal({ centered: false, onShow:function(){ + $('#model_header').text("创建模型新版本") + $('input[name="Name"]').addClass('model_disabled') + $('input[name="Version"]').addClass('model_disabled') $('.ui.dimmer').css({"background-color":"rgb(136, 136, 136,0.7)"}) $("#job-name").empty() $('#name').val(name) @@ -207,6 +211,68 @@ export default { }) .modal('show') }, + check(){ + let jobid = document.getElementById("JobId").value + let versionname = document.getElementById("VersionName").value + let name= document.getElementById("name").value + let version= document.getElementById("version").value + if(jobid==""){ + $(".required.ten.wide.field").addClass("error") + return false + }else{ + $(".required.ten.wide.field").removeClass("error") + } + if(versionname==""){ + $(".required.six.widde.field").addClass("error") + return false + }else{ + $(".required.six.widde.field").removeClass("error") + } + if(name==""){ + $("#modelname").addClass("error") + return false + }else{ + $("#modelname").removeClass("error") + } + if(versionname==""){ + $("#verionname").addClass("error") + return false + }else{ + $("#verionname").removeClass("error") + } + return true + + }, + submit(){ + let context = this + let flag= this.check() + console.log(flag) + if(flag){ + let data = $("#formId").serialize() + $("#mask").css({"display":"block","z-index":"9999"}) + $.ajax({ + url:url_href, + type:'POST', + data:data, + success:function(res){ + $('.ui.modal.second').modal('hide') + console.log(res) + }, + error: function(xhr){ + // 隐藏 loading + // 只有请求不正常(状态码不为200)才会执行 + console.log("-------------",xhr,context) + $('.ui.error.message').text(xhr.responseText) + $('.ui.error.message').css('display','block') + }, + complete:function(xhr){ + $("#mask").css({"display":"none","z-index":"1"}) + } + }) + }else{ + return false + } + }, deleteModel(id,name){ let tree={cName:name} @@ -314,10 +380,15 @@ export default { }, mounted() { + this.submitId = document.getElementById("submitId") this.getModelList() this.url = location.href.split('show_model')[0] - } + this.submitId.addEventListener("click", this.submit) + }, + beforeDestroy() { // 实例销毁之前对点击事件进行解绑 + this.submitId.removeEventListener('click', this.submit); + } };