Browse Source

fix issue

tags/v1.22.4.2^2
zhoupzh 4 years ago
parent
commit
fac91851f9
3 changed files with 21 additions and 11 deletions
  1. +0
    -0
      templates/admin/cloudbrain/images.tmpl
  2. +20
    -10
      templates/repo/modelarts/trainjob/show.tmpl
  3. +1
    -1
      web_src/js/components/images/adminImages.vue

templates/admin/cloudbrain/images.html → templates/admin/cloudbrain/images.tmpl View File


+ 20
- 10
templates/repo/modelarts/trainjob/show.tmpl View File

@@ -844,7 +844,8 @@ td, th {
let scrollHeight = container.scrollHeight
let clientHeight = container.clientHeight
let scrollLeft = container.scrollLeft
if((parseInt(scrollTop) + clientHeight == scrollHeight || parseInt(scrollTop) + clientHeight +1 == scrollHeight || parseInt(scrollTop) + clientHeight - 1 == scrollHeight) && (scrollLeft===0)){
console.log(parseInt(scrollTop),clientHeight,scrollHeight)
if(((parseInt(scrollTop) + clientHeight == scrollHeight || parseInt(scrollTop) + clientHeight +1 == scrollHeight || parseInt(scrollTop) + clientHeight - 1 == scrollHeight)) && parseInt(scrollTop)!==0){
let end_line = $(`#log${version_name} input[name=end_line]`).val()
$.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => {
if (data.Lines == 0){
@@ -868,7 +869,7 @@ td, th {
});
}

if(scrollTop == 1 && scrollLeft==0){
if([1,2,3,4,5].includes(scrollTop) && scrollLeft==0){
let start_line = $(`#log${version_name} input[name=start_line]`).val()
$.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${start_line}&lines=50&order=asc`, (data) => {
@@ -897,7 +898,6 @@ td, th {
const dist = Math.ceil(needScrollTop / 10);
_currentY += dist;
//移动一个十分之一
console.log(_currentY, targetY)
dom.scrollTo(currentX || 0, _currentY);
// 如果移动幅度小于十个像素,直接移动,否则递归调用,实现动画效果
if (needScrollTop > 10 || needScrollTop < -10) {
@@ -909,24 +909,34 @@ td, th {
}

$('.log_top').click(function(){
let logContentDom = document.querySelector('.log')
if(!logContentDom)
return
let version_name = $('.log_top').data('version')
// let logContentDom = document.querySelector('.log')
// if(!logContentDom)
// return
// let version_name = $('.log_top').data('version')
let version_name = $(this).data('version')
let logContentDom = document.querySelector(`#log${version_name}`)
$(`#log_file${version_name}`).siblings('pre').remove()
$.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=&lines=50&order=asc`, (data) => {
$(`#log${version_name} input[name=end_line]`).val(data.EndLine) //如果变动就改变所对应的值
$(`#log${version_name} input[name=start_line]`).val(data.StartLine)
$(`#log${version_name}`).prepend('<pre>' + data.Content)
$(`.message${version_name} #header`).text('您已翻阅至日志顶部')
$(`.message${version_name}`).css('display', 'block')
setTimeout(function(){
$(`.message${version_name}`).css('display', 'none')
}, 1000)
scrollAnimation(logContentDom, logContentDom.scrollTop, 0);
})

})
$('.log_bottom').click(function(){
$('.log_bottom').click(function(e){
let logContentDom = document.querySelector('.log')
let version_name = $('.log_bottom').data('version')
console.log($(this).data('version'))
let version_name = $(this).data('version')
let logContentDom = document.querySelector(`#log${version_name}`)
console.log(version_name)
console.log($(`#log${version_name}`).siblings('pre'))
$(`#log_file${version_name}`).siblings('pre').remove()
$.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=&lines=50&order=desc`, (data) => {


+ 1
- 1
web_src/js/components/images/adminImages.vue View File

@@ -22,7 +22,7 @@
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'全部',private:''}">全部</el-dropdown-item>
<el-dropdown-item :command="{label:'公开',private:false}">公开</el-dropdown-item>
<el-dropdown-item :command="{label:'公开',private:true}">私有</el-dropdown-item>
<el-dropdown-item :command="{label:'私有',private:true}">私有</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>


Loading…
Cancel
Save