From ff3bfa53006b57c8a0b84396ff0c72a330fd4e56 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 22 Sep 2021 15:48:26 +0800 Subject: [PATCH] fix-377 --- routers/repo/cloudbrain.go | 2 +- templates/repo/cloudbrain/index.tmpl | 13 +++++++++---- templates/repo/modelarts/index.tmpl | 13 +++++++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index b2e987871..deac7b312 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -67,7 +67,7 @@ func CloudBrainIndex(ctx *context.Context) { timestamp := time.Now().Unix() for i, task := range ciTasks { - if task.Status == string(models.JobRunning) && (timestamp-int64(task.CreatedUnix) > 30) { + if task.Status == string(models.JobRunning) && (timestamp-int64(task.CreatedUnix) > 10) { ciTasks[i].CanDebug = true } else { ciTasks[i].CanDebug = false diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl index 227aa5d88..66d5a3305 100755 --- a/templates/repo/cloudbrain/index.tmpl +++ b/templates/repo/cloudbrain/index.tmpl @@ -431,7 +431,8 @@ } // 加载任务状态 - $(document).ready(function() { + var timeid = window.setInterval(loadJobStatus, 15000); + function loadJobStatus() { $(".job-status").each((index, job) => { const jobID = job.dataset.jobid; const repoPath = job.dataset.repopath; @@ -442,13 +443,17 @@ $.get(`/api/v1/repos/${repoPath}/cloudbrain/${jobID}`, (data) => { const jobID = data.JobID const status = data.JobStatus - $('#' + jobID).text(status) - // console.log(data) + if (status != job.textContent.trim()) { + //$('#' + jobID).text(status) + //if (status == 'STOPPED') { + window.location.reload() + //} + } }).fail(function(err) { console.log(err); }); }); - }); + }; // 获取弹窗 var modal = document.getElementById('imageModal'); diff --git a/templates/repo/modelarts/index.tmpl b/templates/repo/modelarts/index.tmpl index dabbe0b59..4fe9682c3 100755 --- a/templates/repo/modelarts/index.tmpl +++ b/templates/repo/modelarts/index.tmpl @@ -418,7 +418,8 @@ } // 加载任务状态 - $(document).ready(function() { + var timeid = window.setInterval(loadJobStatus, 15000); + function loadJobStatus() { $(".job-status").each((index, job) => { const jobID = job.dataset.jobid; const repoPath = job.dataset.repopath; @@ -429,13 +430,17 @@ $.get(`/api/v1/repos/${repoPath}/modelarts/${jobID}`, (data) => { const jobID = data.JobID const status = data.JobStatus - $('#' + jobID).text(status) - // console.log(data) + if (status != job.textContent.trim()) { + //$('#' + jobID).text(status) + //if (status == 'STOPPED') { + window.location.reload() + //} + } }).fail(function(err) { console.log(err); }); }); - }); + }; // 获取弹窗 var modal = document.getElementById('imageModal');