From 8da28c98882dd4cb3797e2f22bba421b92521ef2 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 3 Dec 2021 11:20:39 +0800 Subject: [PATCH] fix issue --- templates/repo/cloudbrain/index.tmpl | 59 +- templates/repo/debugjob/index.tmpl | 572 +++++++++++++++++++ templates/repo/header.tmpl | 2 +- templates/repo/modelarts/notebook/index.tmpl | 73 ++- templates/repo/modelarts/trainjob/index.tmpl | 91 +-- templates/repo/modelarts/trainjob/show.tmpl | 13 +- web_src/less/openi.less | 32 ++ 7 files changed, 683 insertions(+), 159 deletions(-) create mode 100644 templates/repo/debugjob/index.tmpl diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl index b23021c55..5307c937d 100755 --- a/templates/repo/cloudbrain/index.tmpl +++ b/templates/repo/cloudbrain/index.tmpl @@ -250,8 +250,9 @@
CPU / GPU
- CPU / GPU - Ascend NPU + 全部 + CPU / GPU + Ascend NPU
{{if .Permission.CanWrite $.UnitTypeCloudBrain}} @@ -285,16 +286,23 @@
-
+
{{$.i18n.Tr "repo.cloudbrain_task"}}
-
- {{$.i18n.Tr "repo.cloudbrain_status_createtime"}} +
+ {{$.i18n.Tr "repo.modelarts.status"}}
-
+
+ {{$.i18n.Tr "repo.modelarts.createtime"}} +
+
+ {{$.i18n.Tr "repo.modelarts.computing_resources"}} +
+ +
{{$.i18n.Tr "repo.cloudbrain_creator"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_operate"}}
@@ -306,41 +314,26 @@
-
+
{{.JobName}}
- -
+
- - {{.Status}} - - +
+
{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}
- +
+ + {{.ComputeResource}} +
{{if .User.Name}} @@ -348,7 +341,7 @@ {{end}}
-
+
{{if and (ne .Status "WAITING") (ne .JobType "DEBUG")}} @@ -382,9 +375,9 @@
- + diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl new file mode 100644 index 000000000..e6f2046c7 --- /dev/null +++ b/templates/repo/debugjob/index.tmpl @@ -0,0 +1,572 @@ + +{{template "base/head" .}} + + + + +
+
+
+
+
+
+
+
+
+ +
+ +
+ {{template "repo/header" .}} + +
+
+
+
+ {{$.i18n.Tr "repo.modelarts.notebook"}} + {{$.i18n.Tr "repo.modelarts.train_job"}} +
+
+
+
+ {{svg "octicon-server" 16}} +
全部
+ +
+ 全部 + CPU / GPU + Ascend NPU +
+
+ {{if .Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}}{{end}} +
+
+ +
+
+
+ + +
+
+
+
+ {{$.i18n.Tr "repo.cloudbrain_task"}} +
+
+ {{$.i18n.Tr "repo.modelarts.status"}} +
+
+ {{$.i18n.Tr "repo.modelarts.createtime"}} +
+
+ {{$.i18n.Tr "repo.modelarts.computing_resources"}} +
+
+ {{$.i18n.Tr "repo.cloudbrain_creator"}} +
+
+ {{$.i18n.Tr "repo.cloudbrain_operate"}} +
+
+
+ {{range .Tasks}} +
+
+ +
+ + {{.JobName}} + +
+
+ + + {{.Status}} + +
+
+ + {{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}} +
+
+ + {{.ComputeResource}} +
+
+ {{if .User.Name}} + + {{else}} + + {{end}} +
+
+
+ {{if and (ne .Status "WAITING") (ne .JobType "DEBUG")}} + + 评分 + + {{end}} + + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + {{if eq .ComputeResource "CPU/GPU"}} + + {{$.i18n.Tr "repo.debug"}} + + {{else}} + + {{$.i18n.Tr "repo.debug"}} + + {{end}} + {{else}} + + {{$.i18n.Tr "repo.debug"}} + + {{end}} + +
+ {{$.CsrfTokenHtml}} + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + + {{$.i18n.Tr "repo.stop"}} + + {{else}} + + {{$.i18n.Tr "repo.stop"}} + + {{end}} +
+
+
+ + + + + + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.submit_image"}} + {{else}} + {{$.i18n.Tr "repo.submit_image"}} + {{end}} +
+ + +
+ {{$.CsrfTokenHtml}} + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + + {{$.i18n.Tr "repo.delete"}} + + {{else}} + + {{$.i18n.Tr "repo.delete"}} + + {{end}} +
+ +
+ + +
+
+ {{end}} {{template "base/paginate" .}} +
+
+
+
+
+
+
+
+ + +
+
+
+ 删除任务 +
+ +
+

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

+
+
+
+ 取消操作 +
+
+ 确定操作 +
+
+
+
+ +
+{{template "base/footer" .}} + + \ No newline at end of file diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index bfa373365..0257b6080 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -138,7 +138,7 @@ {{end}} {{if .Permission.CanRead $.UnitTypeCloudBrain}} - + {{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}} {{end}} diff --git a/templates/repo/modelarts/notebook/index.tmpl b/templates/repo/modelarts/notebook/index.tmpl index 16af3bed3..4134cdd43 100755 --- a/templates/repo/modelarts/notebook/index.tmpl +++ b/templates/repo/modelarts/notebook/index.tmpl @@ -214,21 +214,32 @@
-
{{svg "octicon-server" 16}}
Ascend NPU
- CPU / GPU - Ascend NPU + 全部 + CPU / GPU + Ascend NPU
{{if .Permission.CanWrite $.UnitTypeCloudBrain}} {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}}{{end}}
- + {{if eq 0 (len .Tasks)}} +
+
+
未创建过任务
+
+
代码版本：您还没有初始化代码仓库，请先创建代码版本；
+
运行时长：最长不超过4个小时，超过4个小时将自动停止；
+
数据集：云脑1提供 CPU / GPU 资源，云脑2提供 Ascend NPU 资源，调试使用的数据集也需要上传到对应的环境。
+
使用说明：可以参考启智AI协作平台小白训练营课程
+
+
+ {{else}}
@@ -255,58 +266,67 @@
-
- {{$.i18n.Tr "repo.cloudbrain_task"}} +
+ {{$.i18n.Tr "repo.cloudbrain_task"}}
-
- {{$.i18n.Tr "repo.cloudbrain_status_createtime"}} +
+ {{$.i18n.Tr "repo.modelarts.status"}}
+ {{$.i18n.Tr "repo.modelarts.createtime"}} +
+
+ {{$.i18n.Tr "repo.modelarts.computing_resources"}} +
+ +
{{$.i18n.Tr "repo.cloudbrain_creator"}}
- {{$.i18n.Tr "repo.cloudbrain_operate"}} + {{$.i18n.Tr "repo.cloudbrain_operate"}}
- - - {{range .Tasks}}
-
- +
-
+
{{.JobName}}
- -
+
+ + + {{.Status}} + +
+
- - {{.Status}} - + {{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}
- +
+ + {{.ComputeResource}} +
+
{{if .User.Name}} {{else}} {{end}}
- -
+
{{template "base/alert" .}} - - - -
-
- {{$.i18n.Tr "repo.modelarts.notebook"}} + {{$.i18n.Tr "repo.modelarts.notebook"}} {{$.i18n.Tr "repo.modelarts.train_job"}}
- - {{if .Permission.CanWrite $.UnitTypeCloudBrain}} {{$.i18n.Tr "repo.modelarts.train_job.new_train"}}{{end}}
@@ -262,22 +224,6 @@
- - - -
@@ -308,13 +254,9 @@
{{$.i18n.Tr "repo.cloudbrain_operate"}}
- -
- +
- - {{range .Tasks}}
@@ -340,14 +282,6 @@
{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}
-
@@ -366,27 +300,6 @@
- - -
{{$.CsrfTokenHtml}} diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index a3fdddf38..f66fb50c5 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -573,7 +573,12 @@ td, th { }, onApprove: function() { $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/del_version`,{version_name:version_name},(data)=>{ - $('#accordion'+version_name).remove() + if(data.VersionListCount===0){ + location.href=`/${userName}/${repoPath}/modelarts/train-job` + }else{ + $('#accordion'+version_name).remove() + } + }).fail(function(err) { console.log(err); }); @@ -657,12 +662,6 @@ td, th { } } - function downloadModelFile(version_name,filename){ - $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_download?version_name=${version_name}&file_name=${filename}`, (data) => { - console.log(data) - - }) - } function renderDir(data,version_name){ let html="" html += "
" diff --git a/web_src/less/openi.less b/web_src/less/openi.less index f75a0a4c7..d09d60fa6 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -336,4 +336,36 @@ display: block; margin-left: 4px !important; color: #3291F8; +} +//缺省页 +.bgtask-none{ + background: #fff !important; + border: 0 !important; + box-shadow: none !important; + padding-bottom: 0 !important; + padding-top: 2em !important; + +} +.bgtask-header-pic { + height: 80px; + text-align: center; + background: url(//ai-studio-static-online.cdn.bcebos.com/aistudio/dist/1638363279337/images/search_empty.png) top no-repeat; + background-size: 80px 80px; +} +.bgtask-content{ + margin: 2rem auto 0; + /* width: 500px; */ + text-align: left; +} +.bgtask-content-txt { + font-size: 14px; + color: #a6a6a6; + line-height: 22px; + margin-bottom: 4px; +} +.bgtask-content-header { + text-align: center; + color: #3F3F40; + font-size: 18px; + margin-bottom: 1rem; } \ No newline at end of file