#4319 fix-4166

Merged
zouap merged 3 commits from fix-4166 into V20230531 11 months ago
  1. +3
    -1
      routers/repo/grampus.go
  2. +1
    -1
      web_src/js/features/cloudbrainShow.js
  3. +2
    -0
      web_src/js/features/i18nVue.js
  4. +1
    -1
      web_src/js/index.js

+ 3
- 1
routers/repo/grampus.go View File

@@ -1693,11 +1693,13 @@ func GrampusDownloadLog(ctx *context.Context) {
ctx.ServerError(err.Error(), err)
return
}
fileName := job.JobName + "-log.txt"

nodeIdStr := ctx.Params(":nodeId")
var content string
if nodeIdStr != "" {
nodeId, _ := strconv.Atoi(nodeIdStr)
fileName = job.JobName + "-" + strconv.Itoa(nodeId+1) + "-log.txt"
if job.WorkServerNumber < 1 || nodeId > job.WorkServerNumber-1 {
ctx.NotFound("query parameter is wrong", nil)
return
@@ -1710,7 +1712,7 @@ func GrampusDownloadLog(ctx *context.Context) {
log.Error("GetTrainJobLog failed: %v", err, ctx.Data["MsgID"])
content = ""
}
fileName := job.JobName + "-log.txt"
ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+fileName)
ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
var b []byte = []byte(content)


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

@@ -263,7 +263,7 @@ export default async function initCloudrainSow() {
this.$container.find('.node-select').show();
this.$container.find('.node-select .ui.dropdown').dropdown({
values: new Array(this.workservernumber).fill(0).map((item, index) => ({
name: `节点 ${index + 1}`,
name: `${i18n['computeNode']} ${index + 1}`,
value: index.toString(),
selected: index === 0,
})),


+ 2
- 0
web_src/js/features/i18nVue.js View File

@@ -105,6 +105,7 @@ export const i18nVue = {
scrolled_logs_top_pls_retry: '您已翻阅至日志顶部,请稍后再试!',
scrolled_logs_bottom: '您已翻阅至日志底部',
scrolled_logs_bottom_pls_retry: '您已翻阅至日志底部,请稍后再试!',
computeNode: '计算节点',

cloudeBrainMirror: {
cloud_brain_mirror: '云脑镜像',
@@ -274,6 +275,7 @@ export const i18nVue = {
scrolled_logs_top_pls_retry: 'You have scrolled to the top of the log, please try again later!',
scrolled_logs_bottom: 'You have scrolled to the bottom of the log',
scrolled_logs_bottom_pls_retry: 'You have scrolled to the bottom of the log, please try again later!',
computeNode: 'Compute Node',

cloudeBrainMirror: {
cloud_brain_mirror: 'Cloud Brain Mirror',


+ 1
- 1
web_src/js/index.js View File

@@ -5317,7 +5317,7 @@ function initChartsNpu() {
const multipleNodeEl = $(chartEl).siblings('.node-select').show();
multipleNodeEl.find('.ui.dropdown').dropdown({
values: new Array(workServerNumber).fill(0).map((item, index) => ({
name: `节点 ${index + 1}`,
name: `${i18n['computeNode']} ${index + 1}`,
value: index.toString(),
selected: index === 0,
})),


Loading…
Cancel
Save