Browse Source

Merge pull request '云脑任务界面的国际化修改。#2737' (#2756) from zouap into V20220830

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2756
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>
tags/v1.22.8.2^2
zhoupzh 3 years ago
parent
commit
4e1bb917ce
5 changed files with 51 additions and 21 deletions
  1. +3
    -3
      templates/repo/cloudbrain/inference/new.tmpl
  2. +3
    -3
      templates/repo/cloudbrain/trainjob/new.tmpl
  3. +1
    -1
      templates/repo/modelarts/inferencejob/show.tmpl
  4. +20
    -14
      web_src/js/components/Model.vue
  5. +24
    -0
      web_src/js/features/i18nVue.js

+ 3
- 3
templates/repo/cloudbrain/inference/new.tmpl View File

@@ -229,18 +229,18 @@
{{if .resource_spec_id}} {{if .resource_spec_id}}
{{range .inference_resource_specs}} {{range .inference_resource_specs}}
{{if eq $.resource_spec_id .Id}} {{if eq $.resource_spec_id .Id}}
<option value="{{.Id}}">GPU数:{{.GpuNum}},CPU数:{{.CpuNum}},内存(MB):{{.MemMiB}},共享内存(MB):{{.ShareMemMiB}}</option>
<option value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{.ShareMemMiB}}</option>
{{end}} {{end}}
{{end}} {{end}}
{{range .inference_resource_specs}} {{range .inference_resource_specs}}
{{if ne $.resource_spec_id .Id}} {{if ne $.resource_spec_id .Id}}
<option value="{{.Id}}">GPU数:{{.GpuNum}},CPU数:{{.CpuNum}},内存(MB):{{.MemMiB}},共享内存(MB):{{.ShareMemMiB}}</option>
<option value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{.ShareMemMiB}}</option>
{{end}} {{end}}
{{end}} {{end}}
{{else}} {{else}}
{{range .inference_resource_specs}} {{range .inference_resource_specs}}
<option name="resource_spec_id" value="{{.Id}}"> <option name="resource_spec_id" value="{{.Id}}">
GPU数:{{.GpuNum}},CPU数:{{.CpuNum}},内存(MB):{{.MemMiB}},共享内存(MB):{{.ShareMemMiB}}</option>
{{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{.ShareMemMiB}}</option>
{{end}} {{end}}
{{end}} {{end}}
</select> </select>


+ 3
- 3
templates/repo/cloudbrain/trainjob/new.tmpl View File

@@ -234,18 +234,18 @@
{{if .resource_spec_id}} {{if .resource_spec_id}}
{{range .train_resource_specs}} {{range .train_resource_specs}}
{{if eq $.resource_spec_id .Id}} {{if eq $.resource_spec_id .Id}}
<option value="{{.Id}}">GPU数:{{.GpuNum}},CPU数:{{.CpuNum}},内存(MB):{{.MemMiB}},共享内存(MB):{{.ShareMemMiB}}</option>
<option value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{.MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{.ShareMemMiB}}</option>
{{end}} {{end}}
{{end}} {{end}}
{{range .train_resource_specs}} {{range .train_resource_specs}}
{{if ne $.resource_spec_id .Id}} {{if ne $.resource_spec_id .Id}}
<option value="{{.Id}}">GPU数:{{.GpuNum}},CPU数:{{.CpuNum}},内存(MB):{{.MemMiB}},共享内存(MB):{{.ShareMemMiB}}</option>
<option value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{.MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{.ShareMemMiB}}</option>
{{end}} {{end}}
{{end}} {{end}}
{{else}} {{else}}
{{range .train_resource_specs}} {{range .train_resource_specs}}
<option name="resource_spec_id" value="{{.Id}}"> <option name="resource_spec_id" value="{{.Id}}">
GPU数:{{.GpuNum}},CPU数:{{.CpuNum}},内存(MB):{{.MemMiB}},共享内存(MB):{{.ShareMemMiB}}</option>
{{$.i18n.Tr "cloudbrain.gpu_num"}}:{{.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{.MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{.ShareMemMiB}}</option>
{{end}} {{end}}
{{end}} {{end}}
</select> </select>


+ 1
- 1
templates/repo/modelarts/inferencejob/show.tmpl View File

@@ -314,7 +314,7 @@ td, th {
</tr> </tr>
<tr class="ti-no-ng-animate"> <tr class="ti-no-ng-animate">
<td class="ti-no-ng-animate ti-text-form-label text-width80"> <td class="ti-no-ng-animate ti-text-form-label text-width80">
创建人
{{$.i18n.Tr "repo.cloudbrain_creator"}}
</td> </td>


<td class="ti-text-form-content"> <td class="ti-text-form-content">


+ 20
- 14
web_src/js/components/Model.vue View File

@@ -14,7 +14,7 @@
> >
<el-table-column <el-table-column
prop="Name" prop="Name"
label="模型名称"
:label="i18n.model_name"
align="left" align="left"
min-width="18%" min-width="18%"
> >
@@ -28,7 +28,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="Version" prop="Version"
label="版本"
:label="i18n.model_version"
align="center" align="center"
min-width="6.5%" min-width="6.5%"
> >
@@ -39,7 +39,7 @@
<el-table-column <el-table-column
prop="VersionCount" prop="VersionCount"
label="版本数"
:label="i18n.model_version_num"
align="center" align="center"
min-width="7.5%" min-width="7.5%"
> >
@@ -50,7 +50,7 @@


<el-table-column <el-table-column
prop="Size" prop="Size"
label="模型大小"
:label="i18n.model_size"
align="center" align="center"
min-width="10.5%" min-width="10.5%"
> >
@@ -60,7 +60,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="EngineName" prop="EngineName"
label="模型框架"
:label="i18n.model_egine"
align="center" align="center"
min-width="8.5%" min-width="8.5%"
> >
@@ -70,7 +70,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ComputeResource" prop="ComputeResource"
label="计算资源"
:label="i18n.model_compute_resource"
align="center" align="center"
min-width="10.5%" min-width="10.5%"
> >
@@ -80,7 +80,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="CreatedUnix" prop="CreatedUnix"
label="创建时间"
:label="i18n.model_create_time"
align="center" align="center"
min-width="13.75%" min-width="13.75%"
> >
@@ -90,7 +90,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="UserName" prop="UserName"
label="创建者"
:label="i18n.model_creator"
align="center" align="center"
min-width="6.75%" min-width="6.75%"
> >
@@ -101,12 +101,12 @@
</template> </template>
</el-table-column> </el-table-column>


<el-table-column label="操作" min-width="18%" align="center">
<el-table-column :label="i18n.model_operation" min-width="18%" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="space-around"> <div class="space-around">
<a :style="{visibility:!scope.row.Children ? 'visible':'hidden'}" :class="{'disabled':!scope.row.IsCanOper}" @click="showcreateVue(scope.row.Name,scope.row.Version,scope.row.Label)">创建新版本</a>
<a :href="loadhref+scope.row.ID" :class="{'disabled':!scope.row.IsCanOper}">下载</a>
<a :class="{'disabled':!scope.row.IsCanDelete}" @click="deleteModel(scope.row.ID,scope.row.cName,scope.row.rowKey)">删除</a>
<a :style="{visibility:!scope.row.Children ? 'visible':'hidden'}" :class="{'disabled':!scope.row.IsCanOper}" @click="showcreateVue(scope.row.Name,scope.row.Version,scope.row.Label)">{{i18n.model_create_new_ver}}</a>
<a :href="loadhref+scope.row.ID" :class="{'disabled':!scope.row.IsCanOper}">{{i18n.model_download}}</a>
<a :class="{'disabled':!scope.row.IsCanDelete}" @click="deleteModel(scope.row.ID,scope.row.cName,scope.row.rowKey)">{{i18n.model_delete}}</a>
</div> </div>
</template> </template>
@@ -141,7 +141,7 @@ export default {
}, },
data() { data() {
return { return {
i18n: {},
currentPage:1, currentPage:1,
pageSize:10, pageSize:10,
totalNum:0, totalNum:0,
@@ -451,7 +451,13 @@ export default {
this.url_create_newVersion = this.url + 'create_model' this.url_create_newVersion = this.url + 'create_model'
this.url_create_newModel = this.url + 'create_new_model' this.url_create_newModel = this.url + 'create_new_model'
}, },

created() {
if (document.documentElement.attributes["lang"].nodeValue == "en-US") {
this.i18n = this.$locale.US;
} else {
this.i18n = this.$locale.CN;
}
},
beforeDestroy() { // 实例销毁之前对点击事件进行解绑 beforeDestroy() { // 实例销毁之前对点击事件进行解绑
this.submitId.removeEventListener('click', this.submit); this.submitId.removeEventListener('click', this.submit);
} }


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

@@ -83,6 +83,18 @@ export const i18nVue = {
dataset_ok:"确定", dataset_ok:"确定",
dataset_not_equal_file:"不能选择相同名称的数据文件", dataset_not_equal_file:"不能选择相同名称的数据文件",
dataset_most:"最多不超过五个文件", dataset_most:"最多不超过五个文件",
model_name:"模型名称",
model_version:"版本",
model_version_num:"版本数",
model_size:"模型大小",
model_egine:"模型框架",
model_compute_resource:"计算资源",
model_create_time:"创建时间",
model_creator:"创建者",
model_operation:"操作",
model_create_new_ver:"创建新版本",
model_download:"下载",
model_delete:"删除",
}, },
US: { US: {
computer_vision: "computer vision", computer_vision: "computer vision",
@@ -171,5 +183,17 @@ export const i18nVue = {
dataset_ok:"OK", dataset_ok:"OK",
dataset_not_equal_file:"Cannot select a data file with the same name.", dataset_not_equal_file:"Cannot select a data file with the same name.",
dataset_most:"Up to five files.", dataset_most:"Up to five files.",
model_name:"Model Name",
model_version:"Version",
model_version_num:"Total",
model_size:"Size",
model_egine:"Engine",
model_compute_resource:"Compute Resource",
model_create_time:"Created Time",
model_creator:"Creator",
model_operation:"Operation",
model_create_new_ver:"New Version",
model_download:"Download",
model_delete:"Delete",
}, },
}; };

Loading…
Cancel
Save