Browse Source

Merge pull request '修改云脑创建调试任务后点击取消跳转的问题。' (#1111) from zhou into V20211213

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1111
Reviewed-by: lewis <747342561@qq.com>
pull/1113/head
lewis 3 years ago
parent
commit
a6e37cbd6a
5 changed files with 7 additions and 29 deletions
  1. +1
    -20
      templates/repo/cloudbrain/new.tmpl
  2. +1
    -5
      templates/repo/modelarts/notebook/new.tmpl
  3. +1
    -1
      templates/repo/modelarts/trainjob/index.tmpl
  4. +0
    -2
      templates/repo/modelarts/trainjob/show.tmpl
  5. +4
    -1
      web_src/js/index.js

+ 1
- 20
templates/repo/cloudbrain/new.tmpl View File

@@ -93,16 +93,6 @@
display: none; display: none;
} }


.select2-container .select2-selection--single{
height:38px !important;
}

.select2-container--default .select2-selection--single {
border : 1px solid rgba(34,36,38,.15) !important;
}
.select2-container--default .select2-selection--single .select2-selection__rendered{
line-height: 38px !important;
}
</style> </style>


<div id="mask"> <div id="mask">
@@ -258,7 +248,7 @@
<button class="ui green button" > <button class="ui green button" >
{{.i18n.Tr "repo.cloudbrain.new"}} {{.i18n.Tr "repo.cloudbrain.new"}}
</button> </button>
<a class="ui button" href="{{.RepoLink}}/debugjob??debugListType=CPU/GPU">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
<a class="ui button cancel" href="">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
</div> </div>
</div> </div>
</form> </form>
@@ -268,12 +258,7 @@
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
<script> <script>

// let url_href = window.location.pathname.split('create')[0]
// $(".ui.button").attr('href',url_href)
let form = document.getElementById('form_id'); let form = document.getElementById('form_id');


@@ -291,10 +276,6 @@
$('#messageInfo p').text(str) $('#messageInfo p').text(str)
return false return false
} }
// if(!value_image || !value_data){
// console.log("------------------------")
// return false
// }
let min_value_task = value_task.toLowerCase() let min_value_task = value_task.toLowerCase()
$("input[name='job_name']").attr("value",min_value_task) $("input[name='job_name']").attr("value",min_value_task)
document.getElementById("mask").style.display = "block" document.getElementById("mask").style.display = "block"


+ 1
- 5
templates/repo/modelarts/notebook/new.tmpl View File

@@ -92,7 +92,7 @@
<button class="ui green button"> <button class="ui green button">
{{.i18n.Tr "repo.cloudbrain.new"}} {{.i18n.Tr "repo.cloudbrain.new"}}
</button> </button>
<a class="ui button" href="{{.RepoLink}}/debugjob??debugListType=CPU/GPU">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
<a class="ui button cancel" href="">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
</div> </div>
</div> </div>
</form> </form>
@@ -102,10 +102,6 @@
{{template "base/footer" .}} {{template "base/footer" .}}


<script> <script>
// 取消创建跳转
let url_href = window.location.pathname.split('create')[0]
$(".ui.button").attr('href',url_href)

// 判断必填选项是否填写正确 // 判断必填选项是否填写正确
let form = document.getElementById('form_id'); let form = document.getElementById('form_id');




+ 1
- 1
templates/repo/modelarts/trainjob/index.tmpl View File

@@ -53,7 +53,7 @@
<div class="bgtask-content-txt">代码版本:您还没有初始化代码仓库,请先<a href="{{.RepoLink}}">创建代码版本;</a></div> <div class="bgtask-content-txt">代码版本:您还没有初始化代码仓库,请先<a href="{{.RepoLink}}">创建代码版本;</a></div>
{{end}} {{end}}
<div class="bgtask-content-txt">数据集:云脑1提供 CPU / GPU 资源,云脑2提供 Ascend NPU 资源,调试使用的数据集也需要上传到对应的环境;</div> <div class="bgtask-content-txt">数据集:云脑1提供 CPU / GPU 资源,云脑2提供 Ascend NPU 资源,调试使用的数据集也需要上传到对应的环境;</div>
<div class="bgtask-content-txt">使用说明:可以参考启智AI协作平台<a href="https://git.openi.org/zeizei/OpenI_Learning">小白训练营课程。</a></div>
<div class="bgtask-content-txt">使用说明:可以参考启智AI协作平台<a href="https://git.openi.org.cn/zeizei/OpenI_Learning">小白训练营课程。</a></div>
</div> </div>
</div> </div>
{{else}} {{else}}


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

@@ -473,8 +473,6 @@ td, th {
{{template "base/footer" .}} {{template "base/footer" .}}


<script> <script>
console.log({{.version_list_task}})
console.log({{.}})
$('.menu .item').tab() $('.menu .item').tab()
// $('.ui.style.accordion').accordion(); // $('.ui.style.accordion').accordion();




+ 4
- 1
web_src/js/index.js View File

@@ -3745,6 +3745,7 @@ function initFilterBranchTagDropdown(selector) {
}); });
}); });
$data.remove(); $data.remove();
console.log("-this",this)
new Vue({ new Vue({
delimiters: ['${', '}'], delimiters: ['${', '}'],
el: this, el: this,
@@ -4133,4 +4134,6 @@ $('.question.circle.icon').hover(function(){
}); });


//云脑详情页面跳转回上一个页面 //云脑详情页面跳转回上一个页面
$(".section.backTodeBug").attr("href",localStorage.getItem('all'))
$(".section.backTodeBug").attr("href",localStorage.getItem('all'))
//新建调试取消跳转
$(".ui.button.cancel").attr("href",localStorage.getItem('all'))

Loading…
Cancel
Save