#3873 fix issue

Merged
chenshihai merged 4 commits from fix-3718 into V20230322 1 year ago
  1. +0
    -1
      templates/repo/debugjob/index.tmpl
  2. +1
    -0
      templates/repo/modelarts/trainjob/index.tmpl
  3. +11
    -11
      web_src/js/components/images/Images.vue
  4. +3
    -3
      web_src/js/components/images/adminImages.vue
  5. +4
    -4
      web_src/js/features/i18nVue.js

+ 0
- 1
templates/repo/debugjob/index.tmpl View File

@@ -340,7 +340,6 @@
</form>
</div>
{{if not .BootFile}}
{{.Cloudbrain.Type}}{{.ComputeResource}}
<div class="ui compact buttons"
style="{{if (eq .ComputeResource "CPU/GPU")}} visibility: visible {{else}} visibility: hidden{{end}}">
<div class="ui dropdown" id="model_more"


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

@@ -52,6 +52,7 @@
<div class="item" data-value="all">{{$.i18n.Tr "repo.gpu_type_all"}}</div>
<div class="item" data-value="CPU/GPU">CPU/GPU</div>
<div class="item" data-value="NPU">NPU</div>
<div class="item" data-value="GCU">GCU</div>
</div>
</div>
{{if .Permission.CanWrite $.UnitTypeCloudBrain}}


+ 11
- 11
web_src/js/components/images/Images.vue View File

@@ -66,7 +66,7 @@
</el-table-column>
<el-table-column
:label="$i18n['cloudeBrainMirror']['mirror_description']"
min-width="28%"
min-width="26%"
align="left"
prop="description"
>
@@ -87,7 +87,7 @@
<el-table-column
prop="cloudbrainType"
:label="$i18n['cloudeBrainMirror']['available_clusters']"
min-width="10%"
min-width="15%"
align="center"
>
<template slot-scope="scope">
@@ -129,7 +129,7 @@
{{ scope.row.updatedUnix | transformTimestamp }}
</template>
</el-table-column>
<el-table-column align="center" min-width="21%" :label="$i18n['cloudeBrainMirror']['operation']">
<el-table-column align="center" min-width="18%" :label="$i18n['cloudeBrainMirror']['operation']">
<template slot-scope="scope">
<div
style="
@@ -288,7 +288,7 @@
</el-table-column>
<el-table-column
:label="$i18n['cloudeBrainMirror']['mirror_description']"
min-width="27%"
min-width="26%"
align="left"
prop="description"
>
@@ -309,7 +309,7 @@
<el-table-column
prop="cloudbrainType"
:label="$i18n['cloudeBrainMirror']['available_clusters']"
min-width="9%"
min-width="13%"
align="center"
>
<template slot-scope="scope">
@@ -378,7 +378,7 @@
{{ scope.row.updatedUnix | transformTimestamp }}
</template>
</el-table-column>
<el-table-column align="center" min-width="21%" :label="$i18n['cloudeBrainMirror']['operation']">
<el-table-column align="center" min-width="18%" :label="$i18n['cloudeBrainMirror']['operation']">
<template slot-scope="scope">
<div
style="
@@ -541,7 +541,7 @@
</el-table-column>
<el-table-column
:label="$i18n['cloudeBrainMirror']['mirror_description']"
min-width="28%"
min-width="26%"
align="left"
prop="description"
>
@@ -562,7 +562,7 @@
<el-table-column
prop="cloudbrainType"
:label="$i18n['cloudeBrainMirror']['available_clusters']"
min-width="10%"
min-width="14%"
align="center"
>
<template slot-scope="scope">
@@ -604,7 +604,7 @@
{{ scope.row.updatedUnix | transformTimestamp }}
</template>
</el-table-column>
<el-table-column align="center" min-width="21%" :label="$i18n['cloudeBrainMirror']['operation']">
<el-table-column align="center" min-width="18%" :label="$i18n['cloudeBrainMirror']['operation']">
<template slot-scope="scope">
<div
style="
@@ -950,9 +950,9 @@ export default {
filters: {
transformType(val,vm) {
if (val == 0) {
return `${vm.$i18n['cloudeBrainMirror']['openi']}/GPU`;
return `${vm.$i18n['cloudeBrainMirror']['openi']} GPU`;
}else{
return `${vm.$i18n['cloudeBrainMirror']['c2net']}/GPU`;
return `${vm.$i18n['cloudeBrainMirror']['c2net']} GPU`;
}



+ 3
- 3
web_src/js/components/images/adminImages.vue View File

@@ -53,7 +53,7 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$i18n['cloudeBrainMirror']['mirror_description']" min-width="28%" align="left" prop="description">
<el-table-column :label="$i18n['cloudeBrainMirror']['mirror_description']" min-width="26%" align="left" prop="description">
<template slot-scope="scope">
<div class="image_desc" :title="scope.row.description">{{ scope.row.description}}
</div>
@@ -64,7 +64,7 @@

</template>
</el-table-column>
<el-table-column prop="cloudbrainType" :label="$i18n['cloudeBrainMirror']['available_clusters']" min-width="10%" align="center">
<el-table-column prop="cloudbrainType" :label="$i18n['cloudeBrainMirror']['available_clusters']" min-width="15%" align="center">
<template slot-scope="scope">
{{scope.row.cloudbrainType | transformType(vm)}}
</template>
@@ -91,7 +91,7 @@
{{scope.row.updatedUnix | transformTimestamp}}
</template>
</el-table-column>
<el-table-column align="center" min-width="23%" :label="$i18n['cloudeBrainMirror']['operation']">
<el-table-column align="center" min-width="20%" :label="$i18n['cloudeBrainMirror']['operation']">
<template slot-scope="scope">
<div style="display: flex;justify-content: flex-end;align-items: center;">
<div


+ 4
- 4
web_src/js/features/i18nVue.js View File

@@ -111,7 +111,7 @@ export const i18nVue = {
search:'搜索',
mirror_tag:'镜像Tag',
mirror_description:'镜像描述',
available_clusters: '可用集群',
available_clusters: '集群/计算资源',
creator: '创建者',
creation_time: '创建时间',
operation: '操作',
@@ -132,7 +132,7 @@ export const i18nVue = {
set_as_recommended: '设为推荐',
create_cloud_brain_mirror: '创建云脑镜像',
openi: '启智',
c2net: '智算',
c2net: '智算网络',
},
},
US: {
@@ -251,7 +251,7 @@ export const i18nVue = {
search:'Search',
mirror_tag:'Mirror Tag',
mirror_description:'mirror_description ',
available_clusters: 'Available clusters',
available_clusters: 'Cluster/Compute Resources',
creator: 'Creator',
creation_time: 'Creation time',
operation: 'Operation',
@@ -272,7 +272,7 @@ export const i18nVue = {
set_as_recommended: 'Set as recommended',
create_cloud_brain_mirror: 'Create cloud brain mirror',
openi: 'OpenI',
c2net: 'C2Net',
c2net: 'C²NET',
},
},
};

Loading…
Cancel
Save