Browse Source

fix issue

tags/v1.22.7.1
zhoupzh 3 years ago
parent
commit
2f6bf2c7a2
3 changed files with 11 additions and 6 deletions
  1. +1
    -1
      templates/repo/cloudbrain/inference/show.tmpl
  2. +1
    -1
      templates/repo/cloudbrain/trainjob/show.tmpl
  3. +9
    -4
      web_src/js/features/cloudbrainShow.js

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

@@ -266,7 +266,7 @@
onclick="javascript:parseInfo()">{{$.i18n.Tr "repo.cloudbrain.runinfo"}}</a>
<a class="item load-model-file" data-tab="four"
data-download-flag="{{$.canDownload}}" data-path="{{$.RepoLink}}/cloudbrain/inference-job/{{.JobID}}/result_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
data-gpu-flag="true" data-download-flag="{{$.canDownload}}" data-path="{{$.RepoLink}}/cloudbrain/inference-job/{{.JobID}}/result_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
</div>
<div class="ui tab active" data-tab="first" style="height:400px">
<div style="padding-top: 10px;">


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

@@ -288,7 +288,7 @@
onclick="javascript:parseInfo()">{{$.i18n.Tr "repo.cloudbrain.runinfo"}}</a>
<a class="item" data-tab="third{{$k}}"
onclick="loadLog({{.VersionName}})">{{$.i18n.Tr "repo.modelarts.log"}}</a>
<a class="item load-model-file" data-tab="four{{$k}}" data-download-flag="{{$.canDownload}}" data-path="{{$.RepoLink}}/cloudbrain/train-job/{{.JobID}}/model_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
<a class="item load-model-file" data-tab="four{{$k}}" data-gpu-flag="true" data-download-flag="{{$.canDownload}}" data-path="{{$.RepoLink}}/cloudbrain/train-job/{{.JobID}}/model_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
</div>
<div class="ui tab active" data-tab="first{{$k}}">
<div style="padding-top: 10px;">


+ 9
- 4
web_src/js/features/cloudbrainShow.js View File

@@ -161,7 +161,8 @@ export default async function initCloudrainSow() {

//
$(".content-pad").on("click", ".load-model-file", function () {
let downloadFlag = $(this).data("download-flag");
let downloadFlag = $(this).data("download-flag") || "";
let gpuFlag = $(this).data("gpu-flag") || "";
console.log("11111111111", downloadFlag);
let version_name = $(this).data("version");
let parents = $(this).data("parents") || "";
@@ -172,7 +173,7 @@ export default async function initCloudrainSow() {
console.log(url);
$.get(url, (data) => {
$(`#dir_list${version_name}`).empty();
renderDir(path, data, version_name, downloadFlag);
renderDir(path, data, version_name, downloadFlag, gpuFlag);
if (init === "init") {
$(`input[name=model${version_name}]`).val("");
$(`input[name=modelback${version_name}]`).val(version_name);
@@ -252,7 +253,7 @@ export default async function initCloudrainSow() {
}
}

function renderDir(path, data, version_name, downloadFlag) {
function renderDir(path, data, version_name, downloadFlag, gpuFlag) {
let html = "";
html += "<div class='ui grid' style='margin:0;'>";
html += "<div class='row' style='padding: 0;'>";
@@ -276,7 +277,11 @@ export default async function initCloudrainSow() {
"</span>";
} else {
if (downloadFlag) {
html += `<a href="${location.href}/result_download?version_name=${version_name}&file_name=${data.Dirs[i].FileName}&parent_dir=${data.Dirs[i].ParenDir}&jobName=${data.task.JobName}">`;
if (gpuFlag) {
html += `<a href="${location.href}/result_download?version_name=${version_name}&fileName=${data.Dirs[i].FileName}&parentDir=${data.Dirs[i].ParenDir}&jobName=${data.task.JobName}">`;
} else {
html += `<a href="${location.href}/result_download?version_name=${version_name}&file_name=${data.Dirs[i].FileName}&parent_dir=${data.Dirs[i].ParenDir}">`;
}
} else {
html += `<a class="disabled">`;
}


Loading…
Cancel
Save