Browse Source

Merge pull request 'fix-2902 全屏日志相关issue' (#3123) from fix-2902 into V20221102

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/3123
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
fix-mod
chenshihai 2 years ago
parent
commit
597839a96f
3 changed files with 5 additions and 5 deletions
  1. +3
    -3
      templates/custom/max_log.tmpl
  2. +1
    -1
      templates/repo/grampus/trainjob/show.tmpl
  3. +1
    -1
      web_src/js/features/cloudbrainShow.js

+ 3
- 3
templates/custom/max_log.tmpl View File

@@ -1,11 +1,11 @@
<div> <div>
<div class="ui modal max-full-log{{.VersionName}} container" style="height: 90%;margin: 3rem auto;"> <div class="ui modal max-full-log{{.VersionName}} container" style="height: 90%;margin: 3rem auto;">
<div class="file-info" style="padding: 2rem;justify-content: space-between;">
<div class="file-info" style="padding: 2rem;justify-content: space-between;height: 10%;">
<div id="log-file-title" style="font-size: 16px;font-weight:600"></div> <div id="log-file-title" style="font-size: 16px;font-weight:600"></div>
<div class="file-info"> <div class="file-info">
<a class="file-info" id="{{.VersionName}}-log-down" href=""> <a class="file-info" id="{{.VersionName}}-log-down" href="">
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;" class="log-file-down"></span>
<span style="margin-left: 0.3rem;font-size: 12px;" class="log-file-down"></span>
</a> </a>
<div class="file-info close-log-dialog" data-version="{{.VersionName}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"> <div class="file-info close-log-dialog" data-version="{{.VersionName}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<i class="ri-fullscreen-exit-fill" style="font-size: 16px;"></i> <i class="ri-fullscreen-exit-fill" style="font-size: 16px;"></i>
@@ -16,7 +16,7 @@
</div> </div>
</div> </div>
<div style="margin: 0 2.5rem;border: 1px solid #e8e8e8;height: 88%;position: relative;">
<div style="margin: 0 2.5rem;border: 1px solid #e8e8e8;height: 85%;position: relative;">
<span> <span>
<a style="position: absolute; right: -32px;cursor: pointer;" <a style="position: absolute; right: -32px;cursor: pointer;"
class="log_top-max" data-version="{{.VersionName}}" data-max="-max"><i class="icon-to-top"></i></a> class="log_top-max" data-version="{{.VersionName}}" data-max="-max"><i class="icon-to-top"></i></a>


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

@@ -527,7 +527,7 @@
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
</a> </a>
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-log-type="c2Net"
data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/grampus/train-job/{{.JobID}}/download_log" data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/grampus/train-job/{{.JobID}}/download_log"
data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}"> data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">


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

@@ -287,7 +287,7 @@ export default async function initCloudrainSow() {
); );
} }
).fail((err) => { ).fail((err) => {
$(`#log${version_name} .ui.inverted.active.dimmer`).css(
$(`#log${max}${version_name} .ui.inverted.active.dimmer`).css(
"display", "display",
"none" "none"
); );


Loading…
Cancel
Save