From 751a9c15ce8e3f340e098ef6499de0bf78b577ef Mon Sep 17 00:00:00 2001 From: ann Date: Fri, 1 Mar 2024 17:08:20 +0800 Subject: [PATCH 1/2] add bilangual text --- public/locales/en.json | 37 ++++++++++++++++--- public/locales/zh.json | 36 ++++++++++++++++-- src/api/task/task.js | 4 +- src/components/Actions/baseInfoForm.vue | 2 +- src/components/Actions/editSetting.vue | 2 +- src/components/Edge/createDevice.vue | 2 +- .../workloadsManagement/createWorkload.vue | 2 +- src/router/modules/hpc.js | 6 +-- .../components/CreateAdapter.vue | 4 +- .../components/CreateCluster.vue | 4 +- src/views/cluster/index.vue | 34 ++++++++++------- src/views/edgenodeManagement/detail.vue | 8 ++-- src/views/edgenodeManagement/deviceList.vue | 4 +- src/views/hpcOverview/index.vue | 8 ++-- .../clusterCreate/components/Create.vue | 2 +- .../clusterDiscovery/components/Create.vue | 4 +- .../domainManagement/components/Create.vue | 4 +- .../components/CreateRelate.vue | 4 +- .../components/CreateType.vue | 4 +- .../schedulingInstance/components/Create.vue | 6 +-- .../schedulingInstance/components/Search.vue | 2 +- .../components/createNamespace.vue | 4 +- .../components/Create.vue | 4 +- src/views/modelarts/autoStudy/index.vue | 4 +- src/views/monitorManagement/warnSet/index.vue | 4 +- src/views/monitorSelect/index.vue | 36 +++++++++--------- src/views/nodeManagement/detail.vue | 8 ++-- src/views/permissionManagement/menuList.vue | 4 +- .../resourceCategoryList.vue | 4 +- .../permissionManagement/resourceList.vue | 4 +- src/views/permissionManagement/roleList.vue | 4 +- src/views/permissionManagement/userList.vue | 8 ++-- .../components/CreateProject.vue | 4 +- .../imageManagement/list.vue | 4 +- .../components/serviceCreate.vue | 4 +- .../components/CreateStorage.vue | 4 +- .../schedulingStrategy/list.vue | 4 +- src/views/virtualMachine/datavolume/list.vue | 4 +- src/views/virtualMachine/host/list.vue | 4 +- src/views/virtualMachine/image/list.vue | 4 +- .../virtualMachine/virtualMachine/detail.vue | 6 +-- .../virtualMachine/virtualMachine/list.vue | 6 +-- .../virtualMachine/virtualMachineConfig.vue | 2 +- src/views/workloadsManagement/detail.vue | 8 ++-- 44 files changed, 190 insertions(+), 127 deletions(-) diff --git a/public/locales/en.json b/public/locales/en.json index 51c78d3..603a1df 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -14,16 +14,26 @@ "reset": "Reset", "count": "Count:", "create": "Create", - "name": "Name" + "name": "Name", + "confirm": "确定" }, "menu": { "taskManagement": "Task Management", "taskList": "Task List", + "jobTask": "作业任务", "strategyManagement": "策略管理r", "schedulingStrategy": "调度策略r", "warnStrategy": "告警策略r", "adapterManagement": "驱动器管理r", - "adapterList": "驱动器列表r" + "adapterList": "驱动器列表r", + "clusterManagement": "集群管理r", + "resourceUsageTop": "资源中心使用TOP3r", + "resourceCenter": "资源中心r", + "scheduleStatus": "调度情况r", + "messageList": "消息列表r", + "alertNotification": "告警通知r", + "hpcManagement": "超算管理", + "hpcOverview": "超算概览" }, "check": { "input": "请输入", @@ -47,7 +57,7 @@ "cluster": "Cluster", "startTime": "Start Time", "more": "More", - "participantName": "Participant名称", + "participantName": "Participant Name", "calculationType":"计算类型", "stackName":"技术栈名称", "stackVersion":"技术栈版本号", @@ -58,7 +68,7 @@ "zhi":"智算", "chao":"云算", "associatedCluster":"已关联集群", - "description":"描述", + "description":"description", "edit":"编辑", "total":"总条数", "addAdapter":"新增驱动器", @@ -66,12 +76,29 @@ "clusterAssociation":"集群关联", "adapterSetting":"驱动器设置", "adapterDesc":"支持用户上传新的PCM适配技术栈，并通过当前功能，进行适配绑定", + "clusterDesc": "对多集群以及每个集群的基础资源, 服务组件和应用资源等的统一管理", "deleteWarn":"您确定要删除吗", "deleteSuccess":"删除成功", "viewDetail": "View Detail", "cpType": "计算类型r", "taskType": "任务类型r", "createApplication": "创建容器应用r", - "createJob": "创建容器定时任务r" + "createJob": "创建容器定时任务r", + "memory": "内存", + "storage": "存储", + "distributedTask": "已下发任务", + "reservedTask": "已保留任务", + "errorTask": "错误任务", + "reason": "原因", + "eventDetail": "事件详情", + "updateDate": "更新时间", + "clusterName": "集群名", + "kbVersion": "kubernetes版本", + "createTime": "创建时间", + "classification": "分类r", + "vmCluster": "虚拟机集群", + "containerCluster": "容器集群", + "hpcDomain": "超算域", + "job": "作业" } } \ No newline at end of file diff --git a/public/locales/zh.json b/public/locales/zh.json index 0c7e8c3..7b54683 100644 --- a/public/locales/zh.json +++ b/public/locales/zh.json @@ -14,16 +14,26 @@ "reset": "重置", "count": "总条数：", "create": "创建", - "name": "名称" + "name": "名称", + "confirm": "确定" }, "menu": { "taskManagement": "任务管理", "taskList": "任务列表", + "jobTask": "作业任务", "strategyManagement": "策略管理", "schedulingStrategy": "调度策略", "warnStrategy": "告警策略", "adapterManagement": "驱动器管理", - "adapterList": "驱动器列表" + "adapterList": "驱动器列表", + "clusterManagement": "集群管理", + "resourceUsageTop": "资源中心使用TOP3", + "resourceCenter": "资源中心", + "scheduleStatus": "调度情况", + "messageList": "消息列表", + "alertNotification": "告警通知", + "hpcManagement": "超算管理", + "hpcOverview": "超算概览" }, "check": { "input": "请输入", @@ -47,8 +57,8 @@ "cluster": "集群", "startTime": "作业开始时间", "more": "更多操作", - "viewDetail": "查看详情", "participantName": "Participant名称", + "calculationType":"计算类型", "stackName":"技术栈名称", "stackVersion":"技术栈版本号", "address":"地址", @@ -66,11 +76,29 @@ "clusterAssociation":"集群关联", "adapterSetting":"驱动器设置", "adapterDesc":"支持用户上传新的PCM适配技术栈，并通过当前功能，进行适配绑定", + "clusterDesc": "对多集群以及每个集群的基础资源, 服务组件和应用资源等的统一管理", "deleteWarn":"您确定要删除吗", "deleteSuccess":"删除成功", + "viewDetail": "View Detail", "cpType": "计算类型", "taskType": "任务类型", "createApplication": "创建容器应用", - "createJob": "创建容器定时任务" + "createJob": "创建容器定时任务", + "memory": "内存", + "storage": "存储", + "distributedTask": "已下发任务", + "reservedTask": "已保留任务", + "errorTask": "错误任务", + "reason": "原因", + "eventDetail": "事件详情", + "updateDate": "更新时间", + "clusterName": "集群名", + "kbVersion": "kubernetes版本", + "createTime": "创建时间", + "classification": "分类", + "vmCluster": "虚拟机集群", + "containerCluster": "容器集群", + "hpcDomain": "超算域", + "job": "作业" } } \ No newline at end of file diff --git a/src/api/task/task.js b/src/api/task/task.js index ad1b2b8..9a28ff1 100644 --- a/src/api/task/task.js +++ b/src/api/task/task.js @@ -6,8 +6,8 @@ export const getAppList = (params) => { export const getAppPodsByAppName = (name, params) => { return request({ url: '/pcm/v1/apps/pods/' + name, method: 'get', params }) } -export const addApp = (params) => { - return request({ url: '/pcm/v1/core/task/create', method: 'post', params }) +export const addApp = (data) => { + return request({ url: '/pcm/v1/core/task/create', method: 'post', data }) } export const addNewApp = (params) => { return request({ url: '/pcm/v1/core/commitTask', method: 'post', params }) diff --git a/src/components/Actions/baseInfoForm.vue b/src/components/Actions/baseInfoForm.vue index dcdae59..172f282 100644 --- a/src/components/Actions/baseInfoForm.vue +++ b/src/components/Actions/baseInfoForm.vue @@ -24,7 +24,7 @@
- 取 消 + {{ $t("message.cancel") }} 更 新
diff --git a/src/components/Actions/editSetting.vue b/src/components/Actions/editSetting.vue index 84f4c5c..b4a9f38 100644 --- a/src/components/Actions/editSetting.vue +++ b/src/components/Actions/editSetting.vue @@ -3,7 +3,7 @@
- 取 消 + {{ $t("message.cancel") }} 更 新
diff --git a/src/components/Edge/createDevice.vue b/src/components/Edge/createDevice.vue index 8caba6c..5983dc1 100644 --- a/src/components/Edge/createDevice.vue +++ b/src/components/Edge/createDevice.vue @@ -63,7 +63,7 @@
- 取 消 + {{ $t("message.cancel") }} 上一步 下一步 创建 diff --git a/src/components/workloadsManagement/createWorkload.vue b/src/components/workloadsManagement/createWorkload.vue index 152c17c..38c98d5 100644 --- a/src/components/workloadsManagement/createWorkload.vue +++ b/src/components/workloadsManagement/createWorkload.vue @@ -11,7 +11,7 @@
- 取 消 + {{ $t("message.cancel") }} 上一步 下一步 创建 diff --git a/src/router/modules/hpc.js b/src/router/modules/hpc.js index 6848542..8c59334 100644 --- a/src/router/modules/hpc.js +++ b/src/router/modules/hpc.js @@ -3,9 +3,9 @@ import emptyLayout from '@/layout/emptyLayout' const functionsRouter = { path: '/hpc', component: Layout, - name: '超算管理', + name: 'hpcManagement', meta: { - title: '超算管理', + title: 'hpcManagement', icon: 'el-icon-s-operation' }, children: [ @@ -18,7 +18,7 @@ const functionsRouter = { path: '', component: () => import('@/views/hpcOverview/index'), name: 'hpcOverview', - meta: { title: '超算概览', icon: 'gailan', affix: true }, + meta: { title: 'hpcOverview', icon: 'gailan', affix: true }, hidden: false } diff --git a/src/views/adapterManagement/components/CreateAdapter.vue b/src/views/adapterManagement/components/CreateAdapter.vue index e270829..107ac3e 100644 --- a/src/views/adapterManagement/components/CreateAdapter.vue +++ b/src/views/adapterManagement/components/CreateAdapter.vue @@ -41,8 +41,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/adapterManagement/components/CreateCluster.vue b/src/views/adapterManagement/components/CreateCluster.vue index fddcd7f..c1f989f 100644 --- a/src/views/adapterManagement/components/CreateCluster.vue +++ b/src/views/adapterManagement/components/CreateCluster.vue @@ -101,8 +101,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/cluster/index.vue b/src/views/cluster/index.vue index c989714..90a2afd 100644 --- a/src/views/cluster/index.vue +++ b/src/views/cluster/index.vue @@ -2,15 +2,16 @@
- -

集群管理

+ +

{{ $t('menu.clusterManagement') }}

- 对多集群以及每个集群的基础资源, 服务组件和应用资源等的统一管理 + {{ $t('page.clusterDesc') }} { return this.selectCluster(row)}>{row.name} } }, - { prop: 'label', label: '分类', formatter: (row) => { return row.label === 'openstack' ? '虚拟机集群' : '容器集群' } }, - { prop: 'description', label: '描述' }, - // { prop: 'group', label: '演示环境' }, - // { prop: 'node_num', label: '节点数' }, - { prop: 'version', label: 'kubernetes版本' }, - { prop: 'createTime', label: '创建时间', formatter: (row) => { return row.createTime } } - ] + clusterNum: 0 + } + }, + computed: { + columns() { + return this.setColumn() } }, created() {}, methods: { + setColumn() { + return [ + { prop: 'name', label: this.$t('page.clusterName'), formatter: (row) => { return this.selectCluster(row)}>{row.name} } }, + { prop: 'label', label: this.$t('page.classification'), formatter: (row) => { return row.label === 'openstack' ? this.$t('page.vmCluster') : this.$t('page.containerCluster') } }, + { prop: 'description', label: this.$t('page.description') }, + // { prop: 'group', label: '演示环境' }, + // { prop: 'node_num', label: '节点数' }, + { prop: 'version', label: this.$t('page.kbVersion') }, + { prop: 'createTime', label: this.$t('page.createTime'), formatter: (row) => { return row.createTime } } + ] + }, selectCluster(row) { // set cluster // 设置左侧菜单 diff --git a/src/views/edgenodeManagement/detail.vue b/src/views/edgenodeManagement/detail.vue index 148ed30..3cadf4f 100644 --- a/src/views/edgenodeManagement/detail.vue +++ b/src/views/edgenodeManagement/detail.vue @@ -32,8 +32,8 @@ 添加标签
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
@@ -68,8 +68,8 @@ 添加污点
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/edgenodeManagement/deviceList.vue b/src/views/edgenodeManagement/deviceList.vue index f54f8d2..7b6e613 100644 --- a/src/views/edgenodeManagement/deviceList.vue +++ b/src/views/edgenodeManagement/deviceList.vue @@ -91,7 +91,7 @@ 没有相关命令 - 确 定 + {{ $t("message.confirm") }}

无相关自动采集

- 确 定 + {{ $t("message.confirm") }}
diff --git a/src/views/hpcOverview/index.vue b/src/views/hpcOverview/index.vue index 2b1231e..4c3f7ca 100644 --- a/src/views/hpcOverview/index.vue +++ b/src/views/hpcOverview/index.vue @@ -12,7 +12,7 @@
- 超算域 + {{ $t('page.hpcDomain') }}
- 作业 + {{ $t('page.job') }}
单个文件支持最大上传2G8
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/jccSchedule/clusterSetting/clusterCreate/components/Create.vue b/src/views/jccSchedule/clusterSetting/clusterCreate/components/Create.vue index c3ac6da..7b345c6 100644 --- a/src/views/jccSchedule/clusterSetting/clusterCreate/components/Create.vue +++ b/src/views/jccSchedule/clusterSetting/clusterCreate/components/Create.vue @@ -22,7 +22,7 @@
- 取 消 + {{ $t("message.cancel") }} 上一步 下一步 创建 diff --git a/src/views/jccSchedule/clusterSetting/clusterDiscovery/components/Create.vue b/src/views/jccSchedule/clusterSetting/clusterDiscovery/components/Create.vue index 99d1be3..dffe3a3 100644 --- a/src/views/jccSchedule/clusterSetting/clusterDiscovery/components/Create.vue +++ b/src/views/jccSchedule/clusterSetting/clusterDiscovery/components/Create.vue @@ -64,8 +64,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/jccSchedule/clusterSetting/domainManagement/components/Create.vue b/src/views/jccSchedule/clusterSetting/domainManagement/components/Create.vue index 39886b4..b0231ed 100644 --- a/src/views/jccSchedule/clusterSetting/domainManagement/components/Create.vue +++ b/src/views/jccSchedule/clusterSetting/domainManagement/components/Create.vue @@ -23,8 +23,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/jccSchedule/clusterSetting/domainManagement/components/CreateRelate.vue b/src/views/jccSchedule/clusterSetting/domainManagement/components/CreateRelate.vue index d4c7a19..d071348 100644 --- a/src/views/jccSchedule/clusterSetting/domainManagement/components/CreateRelate.vue +++ b/src/views/jccSchedule/clusterSetting/domainManagement/components/CreateRelate.vue @@ -64,8 +64,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/jccSchedule/clusterSetting/domainManagement/components/CreateType.vue b/src/views/jccSchedule/clusterSetting/domainManagement/components/CreateType.vue index 4a71e25..b8a4e36 100644 --- a/src/views/jccSchedule/clusterSetting/domainManagement/components/CreateType.vue +++ b/src/views/jccSchedule/clusterSetting/domainManagement/components/CreateType.vue @@ -10,8 +10,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/jccSchedule/schedulingInstance/components/Create.vue b/src/views/jccSchedule/schedulingInstance/components/Create.vue index 7b1c3c9..bc2eb63 100644 --- a/src/views/jccSchedule/schedulingInstance/components/Create.vue +++ b/src/views/jccSchedule/schedulingInstance/components/Create.vue @@ -130,11 +130,11 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} + {{ $t("message.confirm") }} -->
diff --git a/src/views/jccSchedule/schedulingInstance/components/Search.vue b/src/views/jccSchedule/schedulingInstance/components/Search.vue index 2652fa9..3fe7cec 100644 --- a/src/views/jccSchedule/schedulingInstance/components/Search.vue +++ b/src/views/jccSchedule/schedulingInstance/components/Search.vue @@ -13,7 +13,7 @@ />
- 确 定 + {{ $t("message.confirm") }}
diff --git a/src/views/jccSchedule/schedulingInstance/components/createNamespace.vue b/src/views/jccSchedule/schedulingInstance/components/createNamespace.vue index d317907..42890ea 100644 --- a/src/views/jccSchedule/schedulingInstance/components/createNamespace.vue +++ b/src/views/jccSchedule/schedulingInstance/components/createNamespace.vue @@ -42,8 +42,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/jccSchedule/schedulingManagement/components/Create.vue b/src/views/jccSchedule/schedulingManagement/components/Create.vue index d92c7a0..ac8a86f 100644 --- a/src/views/jccSchedule/schedulingManagement/components/Create.vue +++ b/src/views/jccSchedule/schedulingManagement/components/Create.vue @@ -88,8 +88,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/modelarts/autoStudy/index.vue b/src/views/modelarts/autoStudy/index.vue index a9500ce..a4f643b 100644 --- a/src/views/modelarts/autoStudy/index.vue +++ b/src/views/modelarts/autoStudy/index.vue @@ -81,8 +81,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/monitorManagement/warnSet/index.vue b/src/views/monitorManagement/warnSet/index.vue index 09cc7c3..53aa933 100644 --- a/src/views/monitorManagement/warnSet/index.vue +++ b/src/views/monitorManagement/warnSet/index.vue @@ -88,8 +88,8 @@ --> - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} diff --git a/src/views/monitorSelect/index.vue b/src/views/monitorSelect/index.vue index 04464ed..e6f1e11 100644 --- a/src/views/monitorSelect/index.vue +++ b/src/views/monitorSelect/index.vue @@ -12,9 +12,9 @@ -

资源中心使用TOP3

+

{{ $t('menu.resourceUsageTop') }}

- 资源中心 + {{ $t('menu.resourceCenter') }}
@@ -25,7 +25,7 @@
- cpu + CPU @@ -33,7 +33,7 @@
- 内存 + {{ $t('page.memory') }} @@ -41,10 +41,10 @@
- 存储 + {{ $t('page.storage') }} - +
@@ -54,23 +54,23 @@ -

作业任务

+

{{ $t('menu.jobTask') }}

- 任务管理 + {{ $t('menu.taskManagement') }}
- 已下发任务 + {{ $t('page.distributedTask') }} 20
- 已保留任务 + {{ $t('page.reservedTask') }} 30
- 错误任务 + {{ $t('page.errorTask') }} 7
@@ -79,16 +79,16 @@ -

调度情况

+

{{ $t('menu.scheduleStatus') }}

- 策略管理 + {{ $t('menu.strategyManagement') }}
-

消息列表

+

{{ $t('menu.messageList') }}

-

告警通知

+

{{ $t('menu.alertNotification') }}

{ + { prop: 'reason', label: this.$t('page.reason'), width: '150' }, + { prop: 'info', label: this.$t('page.eventDetail'), formatter: (row) => { return
{row.involvedObject.kind + ' ' + row.involvedObject.name}
{row.message}
} }, - { prop: 'lastTimestamp', label: '更新时间', width: '160', formatter: (row) => { + { prop: 'lastTimestamp', label: this.$t('page.updateDate'), width: '160', formatter: (row) => { return
{this.formatDate(row.lastTimestamp)}
} } ], diff --git a/src/views/nodeManagement/detail.vue b/src/views/nodeManagement/detail.vue index 0814549..181bcae 100644 --- a/src/views/nodeManagement/detail.vue +++ b/src/views/nodeManagement/detail.vue @@ -32,8 +32,8 @@ 添加标签
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
@@ -68,8 +68,8 @@ 添加污点
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/permissionManagement/menuList.vue b/src/views/permissionManagement/menuList.vue index f162ad2..b82b3e8 100644 --- a/src/views/permissionManagement/menuList.vue +++ b/src/views/permissionManagement/menuList.vue @@ -57,8 +57,8 @@ - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/permissionManagement/resourceCategoryList.vue b/src/views/permissionManagement/resourceCategoryList.vue index a881f35..5a18351 100644 --- a/src/views/permissionManagement/resourceCategoryList.vue +++ b/src/views/permissionManagement/resourceCategoryList.vue @@ -32,8 +32,8 @@ - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/permissionManagement/resourceList.vue b/src/views/permissionManagement/resourceList.vue index 747eb26..a42793d 100644 --- a/src/views/permissionManagement/resourceList.vue +++ b/src/views/permissionManagement/resourceList.vue @@ -55,8 +55,8 @@ - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} diff --git a/src/views/projectManagement/components/CreateProject.vue b/src/views/projectManagement/components/CreateProject.vue index e9a32e8..d09c433 100644 --- a/src/views/projectManagement/components/CreateProject.vue +++ b/src/views/projectManagement/components/CreateProject.vue @@ -24,8 +24,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
diff --git a/src/views/resourceManagement/imageManagement/list.vue b/src/views/resourceManagement/imageManagement/list.vue index d7d5504..5a5a9b2 100644 --- a/src/views/resourceManagement/imageManagement/list.vue +++ b/src/views/resourceManagement/imageManagement/list.vue @@ -41,8 +41,8 @@
上传进度: {{ percent.toFixed()+ '%' }}
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} diff --git a/src/views/serviceManagement/components/serviceCreate.vue b/src/views/serviceManagement/components/serviceCreate.vue index 646fa4b..d460297 100644 --- a/src/views/serviceManagement/components/serviceCreate.vue +++ b/src/views/serviceManagement/components/serviceCreate.vue @@ -168,10 +168,10 @@
- 取 消 + {{ $t("message.cancel") }} 上一步 下一步 - 确 定 + {{ $t("message.confirm") }}
diff --git a/src/views/storageManagement/components/CreateStorage.vue b/src/views/storageManagement/components/CreateStorage.vue index 45c006f..55bbd16 100644 --- a/src/views/storageManagement/components/CreateStorage.vue +++ b/src/views/storageManagement/components/CreateStorage.vue @@ -158,10 +158,10 @@ - 取 消 + {{ $t("message.cancel") }} 上一步 下一步 - 确 定 + {{ $t("message.confirm") }} diff --git a/src/views/strategyManagement/schedulingStrategy/list.vue b/src/views/strategyManagement/schedulingStrategy/list.vue index 189bfe9..16ec024 100644 --- a/src/views/strategyManagement/schedulingStrategy/list.vue +++ b/src/views/strategyManagement/schedulingStrategy/list.vue @@ -88,8 +88,8 @@ --> - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} diff --git a/src/views/virtualMachine/datavolume/list.vue b/src/views/virtualMachine/datavolume/list.vue index dae131a..86c1782 100644 --- a/src/views/virtualMachine/datavolume/list.vue +++ b/src/views/virtualMachine/datavolume/list.vue @@ -23,8 +23,8 @@ > 您试图删除卷{{ clickrow.name }} - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} diff --git a/src/views/virtualMachine/host/list.vue b/src/views/virtualMachine/host/list.vue index 3405037..173f07d 100644 --- a/src/views/virtualMachine/host/list.vue +++ b/src/views/virtualMachine/host/list.vue @@ -18,8 +18,8 @@ >

注意!此操作会迁移当前节点上的所有虚拟机!

- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} diff --git a/src/views/virtualMachine/image/list.vue b/src/views/virtualMachine/image/list.vue index 4fb2a4a..a381e88 100644 --- a/src/views/virtualMachine/image/list.vue +++ b/src/views/virtualMachine/image/list.vue @@ -23,8 +23,8 @@ > 您试图删除 镜像 {{ clickrow.name }} - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} diff --git a/src/views/virtualMachine/virtualMachine/detail.vue b/src/views/virtualMachine/virtualMachine/detail.vue index 6ecf747..26d5c6b 100644 --- a/src/views/virtualMachine/virtualMachine/detail.vue +++ b/src/views/virtualMachine/virtualMachine/detail.vue @@ -100,8 +100,8 @@ - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} - 取 消 + {{ $t("message.cancel") }} 应 用 diff --git a/src/views/virtualMachine/virtualMachine/list.vue b/src/views/virtualMachine/virtualMachine/list.vue index f1508bc..245f6d2 100644 --- a/src/views/virtualMachine/virtualMachine/list.vue +++ b/src/views/virtualMachine/virtualMachine/list.vue @@ -34,8 +34,8 @@ - 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }} - 取 消 + {{ $t("message.cancel") }} 应 用 diff --git a/src/views/virtualMachine/virtualMachineConfig.vue b/src/views/virtualMachine/virtualMachineConfig.vue index bc501a5..225b623 100644 --- a/src/views/virtualMachine/virtualMachineConfig.vue +++ b/src/views/virtualMachine/virtualMachineConfig.vue @@ -136,7 +136,7 @@
- 取 消 + {{ $t("message.cancel") }} 保 存
diff --git a/src/views/workloadsManagement/detail.vue b/src/views/workloadsManagement/detail.vue index ccb43e0..3e83d1f 100644 --- a/src/views/workloadsManagement/detail.vue +++ b/src/views/workloadsManagement/detail.vue @@ -51,8 +51,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
@@ -99,8 +99,8 @@
- 取 消 - 确 定 + {{ $t("message.cancel") }} + {{ $t("message.confirm") }}
From 2e04b8aee1bfec35a5f1c1c7a03793c5ec05c61d Mon Sep 17 00:00:00 2001 From: ann Date: Fri, 1 Mar 2024 17:17:15 +0800 Subject: [PATCH 2/2] add bilangual text --- public/locales/en.json | 7 +- public/locales/zh.json | 7 +- src/router/modules/modelarts.js | 218 +++++++++--------- src/router/modules/monitorManagement.js | 8 +- .../monitorManagement/warnList/index.vue | 2 +- 5 files changed, 126 insertions(+), 116 deletions(-) diff --git a/public/locales/en.json b/public/locales/en.json index 603a1df..37e0195 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -33,7 +33,12 @@ "messageList": "消息列表r", "alertNotification": "告警通知r", "hpcManagement": "超算管理", - "hpcOverview": "超算概览" + "hpcOverview": "超算概览", + "aiManagement": "智算管理", + "autoStudy": "自动学习", + "warnCenter": "告警中心", + "warnList": "告警列表", + "warnSet": "告警设置" }, "check": { "input": "请输入", diff --git a/public/locales/zh.json b/public/locales/zh.json index 7b54683..3e5dc50 100644 --- a/public/locales/zh.json +++ b/public/locales/zh.json @@ -33,7 +33,12 @@ "messageList": "消息列表", "alertNotification": "告警通知", "hpcManagement": "超算管理", - "hpcOverview": "超算概览" + "hpcOverview": "超算概览", + "aiManagement": "智算管理", + "autoStudy": "自动学习", + "warnCenter": "告警中心", + "warnList": "告警列表", + "warnSet": "告警设置" }, "check": { "input": "请输入", diff --git a/src/router/modules/modelarts.js b/src/router/modules/modelarts.js index 9cea7ad..98d7514 100644 --- a/src/router/modules/modelarts.js +++ b/src/router/modules/modelarts.js @@ -3,9 +3,9 @@ import emptyLayout from '@/layout/emptyLayout' const functionsRouter = { path: '/modelarts', component: Layout, - name: '智算管理', + name: 'aiManagement', meta: { - title: '智算管理', + title: 'aiManagement', icon: 'el-icon-s-operation' }, children: [ @@ -24,7 +24,7 @@ const functionsRouter = { path: '', component: () => import('@/views/modelarts/autoStudy/index'), name: 'autoStudy', - meta: { title: '自动学习', icon: 'jiqunjiedian', affix: true }, + meta: { title: 'autoStudy', icon: 'jiqunjiedian', affix: true }, hidden: false }, { @@ -35,113 +35,113 @@ const functionsRouter = { hidden: true } ] - }, - { - path: 'dataManager', - component: emptyLayout, - redirect: 'dataSet', - children: [ - { - path: '', - component: () => import('@/views/modelarts/dataSet/index'), - name: 'dataSet', - meta: { title: '数据集', icon: 'rongqizu', affix: true }, - hidden: false - }, - { - path: 'create', - component: () => import('@/views/modelarts/dataSet/create'), - name: 'dataSetCreate', - meta: { activeMenu: '/modelarts/dataSet', keepAlive: true }, - hidden: true - }, - { - path: 'detail', - component: () => import('@/views/modelarts/dataSet/detail'), - name: 'dataSetDetail', - meta: { activeMenu: '/modelarts/dataSet', keepAlive: true }, - hidden: true - } - ] - }, - { - path: 'algorithmManagement', - component: emptyLayout, - redirect: 'algorithmManagement', - children: [ - { - path: '', - component: () => import('@/views/modelarts/algorithmManagement/index'), - name: 'algorithmManagement', - meta: { title: '算法管理', icon: 'fuwu', affix: true }, - hidden: false - }, - { - path: 'create', - component: () => import('@/views/modelarts/algorithmManagement/create'), - name: 'algorithmCreate', - meta: { activeMenu: '/modelarts/algorithmManagement', keepAlive: true }, - hidden: true - }, - { - path: 'detail', - component: () => import('@/views/modelarts/algorithmManagement/detail'), - name: 'algorithmDetail', - meta: { activeMenu: '/modelarts/algorithmManagement', keepAlive: true }, - hidden: true - } - ] - }, - { - path: 'trainingManager', - component: emptyLayout, - redirect: 'trainingWork', - children: [ - { - path: '', - component: () => import('@/views/modelarts/trainingManager/index'), - name: 'trainingWork', - meta: { title: '训练作业', icon: 'celvetiaoduguanli', affix: true }, - hidden: false - }, - { - path: 'create', - component: () => import('@/views/modelarts/trainingManager/create'), - name: 'trainingWorkCreate', - meta: { activeMenu: '/modelarts/trainingManager', keepAlive: true }, - hidden: true - }, - { - path: 'detail', - component: () => import('@/views/modelarts/trainingManager/detail'), - name: 'trainingWorkDetail', - meta: { activeMenu: '/modelarts/trainingManager', keepAlive: true }, - hidden: true - } - ] - }, - { - path: 'onlineService', - component: emptyLayout, - redirect: 'onlineService', - children: [ - { - path: '', - component: () => import('@/views/modelarts/onlineService/index'), - name: 'onlineService', - meta: { title: '在线服务', icon: 'xiangmuguanli', affix: true }, - hidden: false - }, - { - path: 'detail', - component: () => import('@/views/modelarts/onlineService/detail'), - name: 'onlineServiceDetail', - meta: { activeMenu: '/modelarts/onlineService', keepAlive: true }, - hidden: true - } - - ] } + // { + // path: 'dataManager', + // component: emptyLayout, + // redirect: 'dataSet', + // children: [ + // { + // path: '', + // component: () => import('@/views/modelarts/dataSet/index'), + // name: 'dataSet', + // meta: { title: '数据集', icon: 'rongqizu', affix: true }, + // hidden: false + // }, + // { + // path: 'create', + // component: () => import('@/views/modelarts/dataSet/create'), + // name: 'dataSetCreate', + // meta: { activeMenu: '/modelarts/dataSet', keepAlive: true }, + // hidden: true + // }, + // { + // path: 'detail', + // component: () => import('@/views/modelarts/dataSet/detail'), + // name: 'dataSetDetail', + // meta: { activeMenu: '/modelarts/dataSet', keepAlive: true }, + // hidden: true + // } + // ] + // }, + // { + // path: 'algorithmManagement', + // component: emptyLayout, + // redirect: 'algorithmManagement', + // children: [ + // { + // path: '', + // component: () => import('@/views/modelarts/algorithmManagement/index'), + // name: 'algorithmManagement', + // meta: { title: '算法管理', icon: 'fuwu', affix: true }, + // hidden: false + // }, + // { + // path: 'create', + // component: () => import('@/views/modelarts/algorithmManagement/create'), + // name: 'algorithmCreate', + // meta: { activeMenu: '/modelarts/algorithmManagement', keepAlive: true }, + // hidden: true + // }, + // { + // path: 'detail', + // component: () => import('@/views/modelarts/algorithmManagement/detail'), + // name: 'algorithmDetail', + // meta: { activeMenu: '/modelarts/algorithmManagement', keepAlive: true }, + // hidden: true + // } + // ] + // }, + // { + // path: 'trainingManager', + // component: emptyLayout, + // redirect: 'trainingWork', + // children: [ + // { + // path: '', + // component: () => import('@/views/modelarts/trainingManager/index'), + // name: 'trainingWork', + // meta: { title: '训练作业', icon: 'celvetiaoduguanli', affix: true }, + // hidden: false + // }, + // { + // path: 'create', + // component: () => import('@/views/modelarts/trainingManager/create'), + // name: 'trainingWorkCreate', + // meta: { activeMenu: '/modelarts/trainingManager', keepAlive: true }, + // hidden: true + // }, + // { + // path: 'detail', + // component: () => import('@/views/modelarts/trainingManager/detail'), + // name: 'trainingWorkDetail', + // meta: { activeMenu: '/modelarts/trainingManager', keepAlive: true }, + // hidden: true + // } + // ] + // }, + // { + // path: 'onlineService', + // component: emptyLayout, + // redirect: 'onlineService', + // children: [ + // { + // path: '', + // component: () => import('@/views/modelarts/onlineService/index'), + // name: 'onlineService', + // meta: { title: '在线服务', icon: 'xiangmuguanli', affix: true }, + // hidden: false + // }, + // { + // path: 'detail', + // component: () => import('@/views/modelarts/onlineService/detail'), + // name: 'onlineServiceDetail', + // meta: { activeMenu: '/modelarts/onlineService', keepAlive: true }, + // hidden: true + // } + + // ] + // } ] } export default functionsRouter diff --git a/src/router/modules/monitorManagement.js b/src/router/modules/monitorManagement.js index 2159134..f32bf2e 100644 --- a/src/router/modules/monitorManagement.js +++ b/src/router/modules/monitorManagement.js @@ -3,9 +3,9 @@ import emptyLayout from '@/layout/emptyLayout' const permissionRouter = { path: '/monitorManagement', component: Layout, - name: '告警中心', + name: 'warnCenter', meta: { - title: '告警中心', + title: 'warnCenter', icon: 'yunweijiankongmokuai' }, children: [ @@ -19,7 +19,7 @@ const permissionRouter = { component: () => import('@/views/monitorManagement/warnList/index'), name: 'warnList', // redirect: 'podWarn', - meta: { title: '告警列表', icon: 'xunijiguanli-zhuji', affix: true }, + meta: { title: 'warnList', icon: 'xunijiguanli-zhuji', affix: true }, hidden: false } ] @@ -33,7 +33,7 @@ const permissionRouter = { path: '', component: () => import('@/views/monitorManagement/warnSet/index'), name: 'warnSet', - meta: { title: '告警设置', icon: 'xunijiguanli-zhuji', affix: true }, + meta: { title: 'warnSet', icon: 'xunijiguanli-zhuji', affix: true }, hidden: false } ] diff --git a/src/views/monitorManagement/warnList/index.vue b/src/views/monitorManagement/warnList/index.vue index dee2f32..e999cf9 100644 --- a/src/views/monitorManagement/warnList/index.vue +++ b/src/views/monitorManagement/warnList/index.vue @@ -3,7 +3,7 @@ -

告警列表

+

{{ $t('menu.warnList') }}

将根据项目资源进行分组, 可以按项目对资源进行查看管理