Browse Source

#2949 训练任务详情页智算中心没有自动刷新

#3113 【智算npu训练】结果下载页签点击刷新图标,提示文字应刷新
tags/v1.22.11.1^2
chenshihai 3 years ago
parent
commit
ea2da61282
7 changed files with 46 additions and 6 deletions
  1. +1
    -1
      templates/repo/cloudbrain/inference/show.tmpl
  2. +1
    -1
      templates/repo/cloudbrain/trainjob/show.tmpl
  3. +1
    -1
      templates/repo/grampus/trainjob/show.tmpl
  4. +1
    -1
      templates/repo/modelarts/inferencejob/show.tmpl
  5. +1
    -1
      templates/repo/modelarts/trainjob/show.tmpl
  6. +26
    -1
      web_src/js/features/cloudbrainShow.js
  7. +15
    -0
      web_src/js/features/cloudrbanin.js

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

@@ -315,7 +315,7 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w">
<span style="font-size: 12px;" class="">
<span style="font-size: 12px;" id="{{.VersionName}}-startTime">
{{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}}
{{else}}


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

@@ -331,7 +331,7 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w">
<span style="font-size: 12px;">
<span style="font-size: 12px;" id="{{.VersionName}}-startTime">
{{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}}
{{else}}


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

@@ -330,7 +330,7 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w">
<span style="font-size: 12px;" class="">
<span style="font-size: 12px;" id="{{.VersionName}}-startTime">
{{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}}
{{else}}


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

@@ -263,7 +263,7 @@ td, th {

<td class="ti-text-form-content">
<div class="text-span text-span-w">
<span style="font-size: 12px;" class="">
<span style="font-size: 12px;" id="{{.VersionName}}-startTime">
{{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}}
{{else}}


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

@@ -370,7 +370,7 @@

<td class="ti-text-form-content">
<div class="text-span text-span-w">
<span style="font-size: 12px;" class="">
<span style="font-size: 12px;" id="{{.VersionName}}-startTime">
{{if not (eq .Cloudbrain.StartTime 0)}}
{{TimeSinceUnix1 .Cloudbrain.StartTime}}
{{else}}


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

@@ -14,6 +14,18 @@ export default async function initCloudrainSow() {
};
}

function paddingZeros(str, len) {
str = str.toString();
if (str.length < len) {
str = new Array(len - str.length).fill('0').join('') + str;
}
return str;
}

function timeFormat(date) {
return `${date.getFullYear()}-${paddingZeros(date.getMonth() + 1, 2)}-${paddingZeros(date.getDate(), 2)} ${paddingZeros(date.getHours(), 2)}:${paddingZeros(date.getMinutes(), 2)}:${paddingZeros(date.getSeconds(), 2)}`;
}

function logScroll(version_name, repoPath, ID) {
let container = document.querySelector(`#log${version_name}`);
let scrollTop = container.scrollTop;
@@ -217,7 +229,6 @@ export default async function initCloudrainSow() {
let ID = $(`#accordion${version_name}`).data("jobid");
let repoPath = $(`#accordion${version_name}`).data("repopath");
refreshStatusShow(version_name, ID, repoPath);
$(`.log-info-${version_name} .log_bottom`).trigger("click");
e.stopPropagation();
});
$(".stop-show-version").click(function (e) {
@@ -265,6 +276,13 @@ export default async function initCloudrainSow() {

e.stopPropagation();
});
$('.ui.pointing.secondary.menu .item:eq(0)').click(function(e) {
const self = $(this);
setTimeout(function() {
self.closest('.accordion').find('.refresh-status').trigger('click');
}, 20);
});
function refreshStatusShow(version_name, ID, repoPath) {
$.get(
`/api/v1/repos/${repoPath}/${ID}?version_name=${version_name}`,
@@ -276,13 +294,20 @@ export default async function initCloudrainSow() {
//accroding下的运行时长
$(`#${version_name}-duration-span`).text(data.JobDuration);
//配置信息详情页的状态
data.StartTime !== undefined && data.StartTime > 0 && $(`#${version_name}-startTime`).text(timeFormat(new Date(data.StartTime * 1000)));
//配置信息详情页的状态
$(`#${version_name}-status`).text(data.JobStatus);
//配置信息详情页的状态
$(`#${version_name}-duration`).text(data.JobDuration);
//配置信息详情页的状态
$(`#${version_name}-ai_center`).text(data.AiCenter);
}
).fail(function (err) {
console.log(err);
});
const accordionEl = $(`#accordion${version_name}`);
const activeTab = accordionEl.find('.ui.pointing.secondary.menu .item:not(:eq(0)).active');
activeTab.trigger('click');
}
//
$(".content-pad").on("click", ".load-model-file", function () {


+ 15
- 0
web_src/js/features/cloudrbanin.js View File

@@ -1,4 +1,16 @@
export default async function initCloudrain() {
function paddingZeros(str, len) {
str = str.toString();
if (str.length < len) {
str = new Array(len - str.length).fill('0').join('') + str;
}
return str;
}

function timeFormat(date) {
return `${date.getFullYear()}-${paddingZeros(date.getMonth() + 1, 2)}-${paddingZeros(date.getDate(), 2)} ${paddingZeros(date.getHours(), 2)}:${paddingZeros(date.getMinutes(), 2)}:${paddingZeros(date.getSeconds(), 2)}`;
}

let debug_button = $(".cloudbrain_debug").data("debug");
let debug_again_button = $(".cloudbrain_debug").data("debug-again");
let timeid = window.setInterval(loadJobStatus, 15000);
@@ -200,8 +212,11 @@ export default async function initCloudrain() {
$(`#${versionname}-status-span span`).text(data.JobStatus);
$(`#${versionname}-status-span i`).attr("class", data.JobStatus);
// detail status and duration
data.StartTime !== undefined && data.StartTime > 0 && $("#" + versionname + "-startTime").text(timeFormat(new Date(data.StartTime * 1000)));
$("#" + versionname + "-duration").text(data.JobDuration);
$("#" + versionname + "-status").text(data.JobStatus);
$("#" + versionname + "-ai_center").text(data.AiCenter);

if (stopArray.includes(data.JobStatus)) {
$("#" + versionname + "-stop").addClass("disabled");
}


Loading…
Cancel
Save