Browse Source

fix issue

pull/1036/head
zhoupzh 3 years ago
parent
commit
b35db13cb1
2 changed files with 40 additions and 46 deletions
  1. +18
    -32
      templates/repo/modelmanage/index.tmpl
  2. +22
    -14
      web_src/js/components/Model.vue

+ 18
- 32
templates/repo/modelmanage/index.tmpl View File

@@ -281,27 +281,6 @@
})
.modal('show')
}
// function showcreateVue(){
// console.log("--vue--------")
// $('.ui.modal.second')
// .modal({
// centered: false,
// onShow:function(){
// $('.ui.dimmer').css({"background-color":"rgb(136, 136, 136,0.7)"})
// $("#job-name").empty()
// createModelName()
// loadTrainList()
// },
// onHide:function(){
// document.getElementById("formId").reset();
// $('#choice_model').dropdown('clear')
// $('#choice_version').dropdown('clear')
// $('.ui.dimmer').css({"background-color":""})
// }
// })
// .modal('show')
// }
// 删除时用户确认
function assertDelete(obj) {
if (obj.style.color == "rgb(204, 204, 204)") {
@@ -337,6 +316,22 @@
}
})
})
function versionAdd(version){
let versionArray = version.split('.')
if(versionArray[2]=='9'){
if(versionArray[1]=='9'){
versionArray[0] = String(Number(versionArray[1])+1)
versionArray[1] = '0'
}else{
versionArray[1]=String(Number(versionArray[1])+1)
}
}else{
versionArray[2]=String(Number(versionArray[2])+1)
}
console.log(versionArray.join('.'))
return versionArray.join('.')
}
function loadTrainList(){
$.get(`${repolink}/modelmanage/query_train_job?repoId=${repoId}`, (data) => {
const n_length = data.length
@@ -346,15 +341,11 @@
train_html += '</div>'
}
$("#job-name").append(train_html)
$(".ui.dropdown.selection.search.width83").removeClass("loading")
console.log(data)
$(".ui.dropdown.selection.search.width83").removeClass("loading")
})
}
function loadTrainVersion(value){
$.get(`${repolink}/modelmanage/query_train_job_version?JobID=${value}`, (data) => {

const n_length = data.length
let train_html=''
for (let i=0;i<n_length;i++){
@@ -363,7 +354,6 @@
}
$("#job-version").append(train_html)
$(".ui.dropdown.selection.search.width70").removeClass("loading")
console.log(data)
})
}

@@ -396,7 +386,6 @@
}else{
$("#verionname").removeClass("error")
}

return true
}
@@ -426,9 +415,6 @@
return false
}
})
})
</script>


+ 22
- 14
web_src/js/components/Model.vue View File

@@ -158,12 +158,25 @@ export default {
},
methods: {
load(tree, treeNode, resolve) {
setTimeout(() => {
resolve([
{ID:"27-1",Name:"",Version:"0.0.3",VersionCount:'20',Size:2510550,EngineName:'Mindspore',ComputeResource:'NPU',CreatedUnix:1638265850,UserName:'zhoupz'},
{ID:"27-2",Name:"",Version:"0.0.3",VersionCount:'20',Size:2510550,EngineName:'Mindspore',ComputeResource:'NPU',CreatedUnix:1638265840,UserName:'zhoupz'},
])
}, 1000)
console.log("tree",tree)
this.$axios.get(this.url+'show_model_child_api',{params:{
name:tree.Name
}}).then((res)=>{
console.log(res)
let TrainTaskInfo
let tableData
tableData= res.data
console.log("-----tableData---",tableData)
for(let i=0;i<res.data.count;i++){
TrainTaskInfo = JSON.parse(res.data[i].TrainTaskInfo)
tableData[i].EngineName = TrainTaskInfo.EngineName.split('-')[0]
tableData[i].ComputeResource = TrainTaskInfo.ComputeResource
tableData[i].Name=''
}
console.log("=====-----tabledata---".tableData)
resolve(tableData)
})
},
tableHeaderStyle({row,column,rowIndex,columnIndex}){
if(rowIndex===0){
@@ -186,7 +199,8 @@ export default {
$('.ui.dimmer').css({"background-color":"rgb(136, 136, 136,0.7)"})
$("#job-name").empty()
$('#name').val(name)
$('#version').val("0.0.2")
let version_string = versionAdd(version)
$('#version').val(version_string)
loadTrainList()
},
onHide:function(){
@@ -198,13 +212,7 @@ export default {
})
.modal('show')
},
function(version){
let versionArray = version.split('.')
if(Number(versionArray[2])==9){
versionArray[1] = Number(versionArray[1])+1
}

},
deleteModel(id){
this.$axios.delete(this.url+'delete_model',{
params:{


Loading…
Cancel
Save