From 5c03a3e804be42222e070a8c8b66198e6f448778 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 30 Nov 2021 10:55:10 +0800 Subject: [PATCH 1/4] fix issue --- templates/repo/modelmanage/index.tmpl | 373 ---------------------------------- web_src/js/components/Model.vue | 305 +++++++++++++++++++++++++++ web_src/js/index.js | 20 +- 3 files changed, 323 insertions(+), 375 deletions(-) create mode 100644 web_src/js/components/Model.vue diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl index 0b0f2eb42..e69de29bb 100644 --- a/templates/repo/modelmanage/index.tmpl +++ b/templates/repo/modelmanage/index.tmpl @@ -1,373 +0,0 @@ - -{{template "base/head" .}} - - -
-
-
-
-
-
-
-
-
-{{$repository := .Repository.ID}} - -
- -
- {{template "repo/header" .}} - -
- {{template "base/alert" .}} -
-
-
- {{if .Permission.CanWrite $.UnitTypeCloudBrain}} - {{$.i18n.Tr "repo.modelarts.train_job.new_train"}}{{end}} -
-
- - -
-
-
- -
- -
-
-
- {{$.i18n.Tr "repo.modelarts.model_name"}} -
-
- {{$.i18n.Tr "repo.modelarts.version"}} -
-
- {{$.i18n.Tr "repo.modelarts.version_nums"}} -
-
- {{$.i18n.Tr "repo.modelarts.model_size"}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} -
-
- {{$.i18n.Tr "repo.modelarts.computing_resources"}} -
-
- {{$.i18n.Tr "repo.modelarts.createtime"}} -
-
- {{$.i18n.Tr "repo.cloudbrain_creator"}} -
-
- {{$.i18n.Tr "repo.cloudbrain_operate"}} -
- -
- -
- -
-
- - -
- - {{svg "octicon-tasklist" 16}} - Model-abcd - -
- -
- 0.0.3 -
- -
- 20 -
- -
- 20.28MB -
- -
- Mindspore -
- -
- CPU -
- -
- 2021/09/20 12:06:13 -
- -
- {{if .User.Name}} - - {{else}} - - {{end}} -
- -
- -
-
-
- -
- -
-
-
- -
- -
- - - - - - - -
-
-
- 删除任务 -
- -
-

你确认删除该任务么？此任务一旦删除不可恢复。

-
-
-
- 取消操作 -
-
- 确定操作 -
-
-
-
- -
-
-
-

导入新模型

-
-
-
-
-
- - -
- -
Select Gender
- -
-
Male
-
Female
-
-
- -
-
- -
- -
Select Gender
- -
-
Male
-
Female
-
-
- -
-
- -
- - -
-
- - -
-
- - -
-
- - -
- -
- -
-
-
- -
-
- - -
- - -{{template "base/footer" .}} - - - diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue new file mode 100644 index 000000000..ae71253d6 --- /dev/null +++ b/web_src/js/components/Model.vue @@ -0,0 +1,305 @@ + + + + + diff --git a/web_src/js/index.js b/web_src/js/index.js index 1b718ed53..0f60504de 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -39,6 +39,7 @@ import Images from './components/Images.vue'; import EditTopics from './components/EditTopics.vue'; import DataAnalysis from './components/DataAnalysis.vue' import Contributors from './components/Contributors.vue' +import Model from './components/Model.vue'; Vue.use(ElementUI); Vue.prototype.$axios = axios; @@ -2916,11 +2917,12 @@ $(document).ready(async () => { initVueEditTopic(); initVueContributors(); initVueImages(); + initVueModel(); initVueDataAnalysis(); initTeamSettings(); initCtrlEnterSubmit(); initNavbarContentToggle(); - // initTopicbar(); + // initTopicbar();vim // closeTopicbar(); initU2FAuth(); initU2FRegister(); @@ -3646,7 +3648,7 @@ function initVueContributors() { function initVueImages() { const el = document.getElementById('images'); - console.log("el",el) + if (!el) { return; @@ -3658,6 +3660,20 @@ function initVueImages() { render: h => h(Images) }); } +function initVueModel() { + const el = document.getElementById('model_list'); + + + if (!el) { + return; + } + + new Vue({ + el: el, + + render: h => h(Model) + }); +} function initVueDataAnalysis() { const el = document.getElementById('data_analysis'); console.log("el",el) From d684c8ef3f997b151f80df4e1e5091e881eeda74 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 1 Dec 2021 16:26:10 +0800 Subject: [PATCH 2/4] fix issue --- templates/repo/modelmanage/index.tmpl | 434 +++++++++++++++++++++++++++++++ templates/repo/modelmanage/showinfo.tmpl | 0 web_src/js/components/Model.vue | 277 ++++++++++++-------- 3 files changed, 607 insertions(+), 104 deletions(-) create mode 100644 templates/repo/modelmanage/showinfo.tmpl diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl index e69de29bb..243c48d26 100644 --- a/templates/repo/modelmanage/index.tmpl +++ b/templates/repo/modelmanage/index.tmpl @@ -0,0 +1,434 @@ + +{{template "base/head" .}} + + +
+
+
+
+
+
+
+
+
+{{$repository := .Repository.ID}} + +
+ +
+ {{template "repo/header" .}} + +
+ {{template "base/alert" .}} +
+
+
+ {{if .Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.modelarts.train_job.new_train"}}{{end}} +
+
+ + +
+
+
+ +
+ + + + + +
+ +
+
+
+ +
+ +
+ + +
+ + + + +
+
+
+ 删除任务 +
+ +
+

你确认删除该任务么？此任务一旦删除不可恢复。

+
+
+
+ 取消操作 +
+
+ 确定操作 +
+
+
+
+
+
+
+

导入新模型

+
+
+
+
+

+
+ +
+
+ + + + +
+
+ + + +
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+
+
+ +
+
+ + +
+ + +{{template "base/footer" .}} + + + diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl new file mode 100644 index 000000000..e69de29bb diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue index ae71253d6..95806664e 100644 --- a/web_src/js/components/Model.vue +++ b/web_src/js/components/Model.vue @@ -3,102 +3,111 @@ ' } $("#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 diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue index 95806664e..64dbcc641 100644 --- a/web_src/js/components/Model.vue +++ b/web_src/js/components/Model.vue @@ -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 Date: Thu, 2 Dec 2021 10:38:06 +0800 Subject: [PATCH 4/4] fix issue --- templates/repo/modelmanage/showinfo.tmpl | 6 ++++++ web_src/js/components/Model.vue | 23 +++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl index e69de29bb..c1e353237 100644 --- a/templates/repo/modelmanage/showinfo.tmpl +++ b/templates/repo/modelmanage/showinfo.tmpl @@ -0,0 +1,6 @@ +{{template "base/head" .}} +
+ {{template "repo/header" .}} +
+
+
\ No newline at end of file diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue index 64dbcc641..77c746b2f 100644 --- a/web_src/js/components/Model.vue +++ b/web_src/js/components/Model.vue @@ -1,7 +1,7 @@