Browse Source

fix issue

pull/3418/head
zhoupzh 2 years ago
parent
commit
f62b76c912
16 changed files with 48 additions and 12 deletions
  1. +2
    -0
      templates/repo/cloudbrain/inference/show.tmpl
  2. +4
    -0
      templates/repo/cloudbrain/new.tmpl
  3. +2
    -0
      templates/repo/cloudbrain/show.tmpl
  4. +2
    -0
      templates/repo/cloudbrain/trainjob/show.tmpl
  5. +10
    -5
      templates/repo/debugjob/index.tmpl
  6. +4
    -0
      templates/repo/grampus/notebook/gpu/new.tmpl
  7. +4
    -0
      templates/repo/grampus/notebook/npu/new.tmpl
  8. +3
    -1
      templates/repo/grampus/notebook/show.tmpl
  9. +2
    -0
      templates/repo/grampus/trainjob/show.tmpl
  10. +2
    -0
      templates/repo/modelarts/inferencejob/show.tmpl
  11. +4
    -0
      templates/repo/modelarts/notebook/new.tmpl
  12. +4
    -1
      templates/repo/modelarts/notebook/show.tmpl
  13. +1
    -0
      web_src/js/features/cloudbrainShow.js
  14. +3
    -0
      web_src/js/index.js
  15. +0
    -5
      web_src/js/standalone/cloudbrainNew.js
  16. +1
    -0
      web_src/vuepages/pages/notebook/debug/index.vue

+ 2
- 0
templates/repo/cloudbrain/inference/show.tmpl View File

@@ -294,6 +294,7 @@
</div>
</div>
<div style="clear:both">
{{if $.datasetDownload}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -314,6 +315,7 @@

</tbody>
</table>
{{end}}
</div>
</div>



+ 4
- 0
templates/repo/cloudbrain/new.tmpl View File

@@ -282,6 +282,10 @@
$('#messageInfo p').text(str)
return false
}
if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){
$('input[name="ckpt_name"]').parent().addClass("error")
return false
}
let min_value_task = value_task.toLowerCase()
$("input[name='display_job_name']").attr("value", min_value_task)
createFlag = true


+ 2
- 0
templates/repo/cloudbrain/show.tmpl View File

@@ -303,6 +303,7 @@
</div>
</div>
<div style="clear:both">
{{if $.datasetDownload}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -323,6 +324,7 @@

</tbody>
</table>
{{end}}
</div>
</div>
</div>


+ 2
- 0
templates/repo/cloudbrain/trainjob/show.tmpl View File

@@ -277,6 +277,7 @@
</div>
</div>
<div style="clear:both">
{{if $.datasetDownload}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -297,6 +298,7 @@

</tbody>
</table>
{{end}}
</div>
</div>



+ 10
- 5
templates/repo/debugjob/index.tmpl View File

@@ -195,7 +195,7 @@
<span>{{$.i18n.Tr "repo.modelarts.createtime"}}</span>
</div>
<div class="two wide column text center">
<span>{{$.i18n.Tr "repo.modelarts.computing_resources"}}</span>
<span>{{$.i18n.Tr "repo.modelarts.cluster.computing_resources"}}</span>
</div>
<div class="one wide column text center">
<span>{{$.i18n.Tr "repo.cloudbrain_creator"}}</span>
@@ -234,9 +234,14 @@
</div>
<div class="two wide column text center">
<!-- 任务计算资源 -->
<span style="font-size: 12px;margin-left: 0.4rem;"
class="">
{{.ComputeResource}}</span>
<span style="font-size: 12px;margin-left: 0.4rem;">
{{if eq .Cloudbrain.Type 2}}
{{$.i18n.Tr "cloudbrain.resource_cluster_c2net_simple"}}
{{else}}
{{$.i18n.Tr "cloudbrain.resource_cluster_openi_simple"}}
{{end}}
{{.ComputeResource}}
</span>
</div>
<div class="one wide column text center">
{{if .User.Name}}
@@ -297,7 +302,7 @@
class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING" "CREATING" "STARTING" "SUCCEEDED" "CREATE_FAILED" "DELETED"}}disabled {{else}}blue {{end}}button'
data-repopath='{{$.RepoLink}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{end}}/{{.Cloudbrain.ID}}/stop'
data-jobid="{{.Cloudbrain.ID}}">
{{if .BootFile}}data-bootfile="{{.BootFile}}"{{end}}
{{$.i18n.Tr "repo.stop"}}
</a>
{{else}}


+ 4
- 0
templates/repo/grampus/notebook/gpu/new.tmpl View File

@@ -190,6 +190,10 @@
$('#messageInfo p').text(str)
return false
}
if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){
$('input[name="ckpt_name"]').parent().addClass("error")
return false
}
let min_value_task = value_task.toLowerCase()
$("input[name='display_job_name']").attr("value", min_value_task)
createFlag = true


+ 4
- 0
templates/repo/grampus/notebook/npu/new.tmpl View File

@@ -180,6 +180,10 @@
$('#messageInfo p').text(str)
return false
}
if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){
$('input[name="ckpt_name"]').parent().addClass("error")
return false
}
let min_value_task = value_task.toLowerCase()
$("input[name='display_job_name']").attr("value",min_value_task)
document.getElementById("mask").style.display = "block"


+ 3
- 1
templates/repo/grampus/notebook/show.tmpl View File

@@ -344,6 +344,7 @@
</div>
</div>
<div style="clear:both">
{{if $.datasetDownload}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -370,8 +371,9 @@
</tr>
{{end}}
</tbody>
{{end}}
</table>
{{if eq .ComputeResource "NPU"}}
{{if and (eq .ComputeResource "NPU") ($.modelDownload)}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr>


+ 2
- 0
templates/repo/grampus/trainjob/show.tmpl View File

@@ -308,6 +308,7 @@
</div>
</div>
<div style="clear:both">
{{if $.datasetDownload}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -326,6 +327,7 @@
{{end}}
</tbody>
</table>
{{end}}
</div>
</div>
</div>


+ 2
- 0
templates/repo/modelarts/inferencejob/show.tmpl View File

@@ -278,6 +278,7 @@
</div>
</div>
<div style="clear:both">
{{if $.datasetDownload}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -299,6 +300,7 @@

</tbody>
</table>
{{end}}
</div>
</div>



+ 4
- 0
templates/repo/modelarts/notebook/new.tmpl View File

@@ -163,6 +163,10 @@
$('#messageInfo p').text(str)
return false
}
if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){
$('input[name="ckpt_name"]').parent().addClass("error")
return false
}
let min_value_task = value_task.toLowerCase()
$("input[name='display_job_name']").attr("value",min_value_task)
document.getElementById("mask").style.display = "block"


+ 4
- 1
templates/repo/modelarts/notebook/show.tmpl View File

@@ -246,6 +246,7 @@

</div>
<div style="clear:both">
{{if $.datasetDownload}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -268,7 +269,8 @@
{{end}}
</tbody>
</table>

{{end}}
{{if $.modelDownload}}
<table style="border:none" class="ui fixed small stackable table">
<thead>
<tr>
@@ -291,6 +293,7 @@
</tr>
</tbody>
</table>
{{end}}
</div>
</div>
</div>


+ 1
- 0
web_src/js/features/cloudbrainShow.js View File

@@ -823,6 +823,7 @@ export default async function initCloudrainSow() {
$("#select_model_version").dropdown("set value", "");
$("#select_model_checkpoint").dropdown("set text", "");
$("#select_model_checkpoint").dropdown("set value", "");
$("#model_checkpoint").empty();
}
},
});


+ 3
- 0
web_src/js/index.js View File

@@ -5226,3 +5226,6 @@ function initTopToHome() {
}

initTopToHome();
$(".question.circle.icon").hover(function () {
$(this).popup("show");
});

+ 0
- 5
web_src/js/standalone/cloudbrainNew.js View File

@@ -67,11 +67,6 @@
$(this).attr("id", "para" + cur_index);
});
});

$(".question.circle.icon").hover(function () {
$(this).popup("show");
});

var isValidate = false;
function validate() {
$(".ui.form").form({


+ 1
- 0
web_src/vuepages/pages/notebook/debug/index.vue View File

@@ -345,6 +345,7 @@ export default {
}
if(err.response.status===401){
location.href=`${AppSubUrl}/user/login`
return
}
this.btnStatus[index]=0
this.alertCb = false


Loading…
Cancel
Save