-
+
-
+
@@ -167,6 +156,8 @@
.modal({
centered: false,
onShow:function(){
+ $('#model_header').text("导入新模型")
+ $('input[name="Version"]').addClass('model_disabled')
$('.ui.dimmer').css({"background-color":"rgb(136, 136, 136,0.7)"})
$("#job-name").empty()
createModelName()
@@ -232,68 +223,5 @@
$(".ui.dropdown.selection.search.width70").removeClass("loading")
})
}
-
- function 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
-
- }
-
- $('#submitId').click(function(){
- let flag=check()
- 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')
- window.location.href=location.href
- },
- error: function(xhr){
- // 隐藏 loading
- // 只有请求不正常（状态码不为200）才会执行
- console.log("-------------",xhr)
- $('.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
- }
-
- })
diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 821340eb0..31f8896d1 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -78,6 +78,67 @@
+
+
+
+
+
+ | 模型名称 |
+ |
+
+
+ | 版本 |
+ |
+
+
+ | 标签 |
+
+
+
+
+
+
+ |
+
+
+ | 大小 |
+ |
+
+
+ | 创建时间 |
+ |
+
+
+ | 模型描述 |
+
|
+
+
+
+
+
+
+
+
+
+ | 准确率 |
+ |
+
+
+ | F1 |
+ |
+
+
+ | 精确率 |
+ |
+
+
+ | 召回率 |
+ |
+
+
+
+
+
@@ -91,10 +152,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 +165,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 +215,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 +235,35 @@ 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 += `| ${key} | `
if(key==="Description"){
- let description = obj[key]
- html += ''+description+' | '
- }else{
- html += `${obj[key]} | `
+ $(`#${key}`).text(obj[key])
+ $(`#${key}`).attr("title",obj[key])
+ $('#edit-pencil').attr("data-id",id)
+ $('#edit-pencil').attr("data-desc",obj[key])
+ }
+ else if(key==="Label"){
+ let labelArray = obj[key].split(' ')
+ let html=''
+ for(let i=0;i${labelArray[i]}`
+ }
+ $('#Label').append(html)
}
- html += '
'
+ else{
+ $(`#${key}`).text(obj[key])
+ $(`#${key}`).attr("title",obj[key])
+ }
+
}
-
- html += ''
- html += '
'
- html += '
'
- html += '
'
- html += ''
- html += '
'
- html += ''
for(let key in accObj){
- html += ''
- html += `| ${key} | `
- html += `${accObj[key]} | `
- html += '
'
- }
- html += ''
- html += '
'
- html += '
'
- html += '
'
- $('#showInfo').append(html)
+ $(`#${key}`).text(accObj[key])
+ $(`#${key}`).attr("title",accObj[key])
+ }
}
\ No newline at end of file
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index dafcce29f..03cdc1eea 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -119,7 +119,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
- :page-sizes="[10]"
+ :page-sizes="[5,10,15]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalNum">
@@ -149,7 +149,8 @@ export default {
fullscreenLoading: false,
url:'',
isLoading:true,
- loadNodeMap:new Map()
+ loadNodeMap:new Map(),
+ submitId:{}
};
},
methods: {
@@ -179,7 +180,7 @@ export default {
}
},
handleSizeChange(val){
- this.params.size = val
+ this.params.pageSize = val
this.getModelList()
},
handleCurrentChange(val){
@@ -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,67 @@ 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,context)
+ if(flag){
+ let data = $("#formId").serialize()
+ $("#mask").css({"display":"block","z-index":"9999"})
+ $.ajax({
+ url:url_href,
+ type:'POST',
+ data:data,
+ success:function(res){
+ context.getModelList()
+ $('.ui.modal.second').modal('hide')
+ },
+ error: function(xhr){
+ // 隐藏 loading
+ // 只有请求不正常（状态码不为200）才会执行
+ $('.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}
@@ -230,6 +295,8 @@ export default {
onHidden: function() {
if (flag == false) {
$('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
+ }else{
+ $('.alert').html('删除成功').removeClass('alert-danger').addClass('alert-success').show().delay(1500).fadeOut();
}
}
})
@@ -261,6 +328,7 @@ export default {
this.$axios.get(location.href+'_api',{
params:this.params
}).then((res)=>{
+ $(".ui.grid").removeAttr("style")
$("#loadContainer").removeClass("loader")
let TrainTaskInfo
this.tableData = res.data.data
@@ -314,10 +382,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);
+ }
};
diff --git a/web_src/js/index.js b/web_src/js/index.js
index a1f044b4a..98046785b 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -4124,4 +4124,10 @@ function initDropDown() {
$("#dropdown_explore").dropdown({
on:'hover' ,//鼠标悬浮显示，默认值是click
});
-}
\ No newline at end of file
+}
+
+//云脑提示
+$('.question.circle.icon').hover(function(){
+ $(this).popup('show')
+ $('.ui.popup.mini.top.center').css({"border-color":'rgba(50, 145, 248, 100)',"color":"rgba(3, 102, 214, 100)","border-radius":"5px","border-shadow":"none"})
+});
\ No newline at end of file
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index 3c1769639..a04510211 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -552,9 +552,22 @@ display: block;
.letf2{
margin-left: -2px;
}
+.width70{
+ width: 70% !important;
+}
+.width83{
+ width: 83% !important;
+}
+.content-padding{
+ padding: 40px !important;
+}
+.model_disabled{
+ background-color: rgba(245, 245, 246, 100) !important;
+ color: rgba(136, 136, 136, 100) !important;
+}
.edge{
margin-left:0 !important;
margin-right: 0 !important;
padding-left:0 !important;
padding-right:0 !important;
- }
\ No newline at end of file
+ }