annzee
/
JCC-RIP
forked from JointCloud/JCC-RIP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'multiple language' (#28) from jhnine/JCC-RIP:master into master

This commit is contained in:
jhnine 2024-03-11 17:50:22 +08:00
parent e6a19b7d4b 3e70dfe629
commit 8acf70601a
7 changed files with 121 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/locales/en.json
View File

@ -37,12 +37,26 @@
"messageList": "消息列表r",
"alertNotification": "告警通知r",
"hpcManagement": "超算管理",
"hpcOverview": "超算概览",
"hpcOverview": "超算概览r",
"aiManagement": "智算管理",
"autoStudy": "自动学习",
"warnCenter": "告警中心",
"warnList": "告警列表",
"warnSet": "告警设置"
"warnSet": "告警设置",
"overview": "概览",
"clusterNodes": "集群节点",
"project": "项目",
"storage": "存储",
"workload": "工作负载",
"containerNodes": "容器节点",
"services": "服务",
"containerManagement": "容器管理",
"mainEngine": "主机",
"virtualMachine": "虚拟机",
"volume": "卷",
"image": "镜像",
"namespace": "命名空间",
"virtualMachineMana": "虚拟机管理"
},
"check": {
"input": "请输入",

18
public/locales/zh.json
View File

@ -42,7 +42,21 @@
"autoStudy": "自动学习",
"warnCenter": "告警中心",
"warnList": "告警列表",
"warnSet": "告警设置"
"warnSet": "告警设置",
"overview": "概览",
"clusterNodes": "集群节点",
"project": "项目",
"storage": "存储",
"workload": "工作负载",
"containerNodes": "容器节点",
"services": "服务",
"containerManagement": "容器管理",
"mainEngine": "主机",
"virtualMachine": "虚拟机",
"volume": "卷",
"image": "镜像",
"namespace": "命名空间",
"virtualMachineMana": "虚拟机管理"
},
"check": {
"input": "请输入",
@ -54,7 +68,7 @@
"cloud": "数算",
"hpc": "超算",
"ai": "智算",
"title": "云际计算开源社区",
"title": "云际计算开源社区11",
"JointDomainresourceflux": " 云际全域资源态势感知 ",
"task": "任务",
"taskDescription": "支持创建不同计算环境或不同硬件平台之间的任务进行互联互通互操作，确保每个任务在不同的计算环境或硬件平台上都可以独立地运行。 ",

132
src/router/modules/pod.js
View File

@ -6,7 +6,7 @@ const podRouter = {
component: Layout,
name: '容器管理',
meta: {
title: '容器管理',
title: 'containerManagement',
icon: 'rongqiguanli'
},
children: [
@ -14,7 +14,7 @@ const podRouter = {
path: 'podOverview',
component: () => import('@/views/overview/index'),
name: 'clusterOverview',
meta: { title: '概览', icon: 'gailan', affix: true }
meta: { title: 'overview', icon: 'gailan', affix: true }
},
{
path: 'nodeManagement',
@ -25,7 +25,7 @@ const podRouter = {
{
path: '',
component: () => import('@/views/nodeManagement/index'),
meta: { title: '集群节点', icon: 'jiqunjiedian', affix: true }
meta: { title: 'clusterNodes', icon: 'jiqunjiedian', affix: true }
}
]
},
@ -58,64 +58,64 @@ const podRouter = {
}
]
},
{
path: 'edgenodeManagement',
component: emptyLayout,
name: 'EdgenodeManagement',
redirect: 'edgenodeManagement',
children: [
{
path: '',
component: () => import('@/views/edgenodeManagement/index'),
meta: { title: '边缘节点', icon: 'bianyuanjiedian', affix: true }
},
{
path: 'deviceList',
component: () => import('@/views/edgenodeManagement/deviceList'),
name: 'EdgenodeDeviceList',
meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement' },
hidden: true
},
{
path: 'edgeDeviceOnline',
component: () => import('@/views/edgenodeManagement/onlineVideo'),
name: 'EdgeDeviceOnline',
meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement' },
hidden: true
},
{
path: 'edgeDetail',
component: () => import('@/views/edgenodeManagement/edgeDetail'),
name: 'EdgeDetail',
meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement' },
hidden: true
}
]
},
{
path: 'edgenodeManagement/:name',
component: emptyLayout,
children: [
{
path: '',
component: () => import('@/views/edgenodeManagement/detail'),
hidden: true,
children: [
{
path: 'status',
name: 'EdgeNodeManagementDetail',
component: () => import('@/views/edgenodeManagement/status'),
meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement', keepAlive: true }
},
{
path: 'pods',
component: () => import('@/views/edgenodeManagement/pods'),
meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement', keepAlive: true }
}
]
}
]
},
// {
// path: 'edgenodeManagement',
// component: emptyLayout,
// name: 'EdgenodeManagement',
// redirect: 'edgenodeManagement',
// children: [
// {
// path: '',
// component: () => import('@/views/edgenodeManagement/index'),
// meta: { title: '边缘节点', icon: 'bianyuanjiedian', affix: true }
// },
// {
// path: 'deviceList',
// component: () => import('@/views/edgenodeManagement/deviceList'),
// name: 'EdgenodeDeviceList',
// meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement' },
// hidden: true
// },
// {
// path: 'edgeDeviceOnline',
// component: () => import('@/views/edgenodeManagement/onlineVideo'),
// name: 'EdgeDeviceOnline',
// meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement' },
// hidden: true
// },
// {
// path: 'edgeDetail',
// component: () => import('@/views/edgenodeManagement/edgeDetail'),
// name: 'EdgeDetail',
// meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement' },
// hidden: true
// }
// ]
// },
// {
// path: 'edgenodeManagement/:name',
// component: emptyLayout,
// children: [
// {
// path: '',
// component: () => import('@/views/edgenodeManagement/detail'),
// hidden: true,
// children: [
// {
// path: 'status',
// name: 'EdgeNodeManagementDetail',
// component: () => import('@/views/edgenodeManagement/status'),
// meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement', keepAlive: true }
// },
// {
// path: 'pods',
// component: () => import('@/views/edgenodeManagement/pods'),
// meta: { activeMenu: '/cluster/:clusterName/edgenodeManagement', keepAlive: true }
// }
// ]
// }
// ]
// },
{
path: 'projectManagement',
component: emptyLayout,
@ -126,7 +126,7 @@ const podRouter = {
component: () => import('@/views/projectManagement/index'),
name: 'ProjectManagement',
redirect: 'userProject',
meta: { title: '项目', icon: 'xiangmuguanli', affix: true }
meta: { title: 'project', icon: 'xiangmuguanli', affix: true }
},
{
path: 'userProject',
@ -191,7 +191,7 @@ const podRouter = {
{
path: '',
component: () => import('@/views/storageManagement/index'),
meta: { title: '存储', icon: 'cunchujuanxinxi', affix: true }
meta: { title: 'storage', icon: 'cunchujuanxinxi', affix: true }
}
]
},
@ -205,7 +205,7 @@ const podRouter = {
component: () => import('@/views/workloadsManagement/index'),
name: 'workloadsManagement',
redirect: 'deployments',
meta: { title: '工作负载', icon: 'gongzuofuzai', affix: true }
meta: { title: 'workload', icon: 'gongzuofuzai', affix: true }
},
{
path: 'deployments',
@ -311,7 +311,7 @@ const podRouter = {
{
path: '',
component: () => import('@/views/podManagement/index'),
meta: { title: '容器节点', icon: 'rongqizu', affix: true }
meta: { title: 'containerNodes', icon: 'rongqizu', affix: true }
}
]
},
@ -354,7 +354,7 @@ const podRouter = {
{
path: '',
component: () => import('@/views/serviceManagement/index'),
meta: { title: '服务', icon: 'fuwu', affix: true }
meta: { title: 'services', icon: 'fuwu', affix: true }
}
]
},

16
src/router/modules/virtualMachine.js
View File

@ -3,9 +3,9 @@ import emptyLayout from '@/layout/emptyLayout'
const virtualMachineRouter = {
path: '/virtual/:clusterName',
component: Layout,
name: '虚拟机管理',
name: 'virtualMachineMana',
meta: {
title: '虚拟机管理',
title: 'virtualMachineMana',
icon: 'xunijiguanli-juan'
},
children: [
@ -13,7 +13,7 @@ const virtualMachineRouter = {
path: 'overview',
component: () => import('@/views/overview/virtualMachine'),
name: 'virtualOverview',
meta: { title: '概览', icon: 'gailan', affix: true }
meta: { title: 'overview', icon: 'gailan', affix: true }
},
{
path: 'host',
@ -24,7 +24,7 @@ const virtualMachineRouter = {
path: '',
component: () => import('@/views/virtualMachine/host/list'),
name: 'host',
meta: { title: '主机', icon: 'xunijiguanli-zhuji', affix: true },
meta: { title: 'mainEngine', icon: 'xunijiguanli-zhuji', affix: true },
hidden: false
},
{
@ -50,7 +50,7 @@ const virtualMachineRouter = {
path: '',
component: () => import('@/views/virtualMachine/virtualMachine/list.vue'),
name: 'virtual-machine',
meta: { title: '虚拟机', icon: 'xunijiguanli-xuniji', affix: true },
meta: { title: 'virtualMachine', icon: 'xunijiguanli-xuniji', affix: true },
hidden: false
},
{
@ -85,7 +85,7 @@ const virtualMachineRouter = {
path: '',
component: () => import('@/views/virtualMachine/datavolume/list.vue'),
name: 'dataVolume',
meta: { title: '卷', icon: 'xunijiguanli-juan', affix: true },
meta: { title: 'volume', icon: 'xunijiguanli-juan', affix: true },
hidden: false
},
{
@ -142,7 +142,7 @@ const virtualMachineRouter = {
path: '',
component: () => import('@/views/virtualMachine/image/list.vue'),
name: 'images',
meta: { title: '镜像', icon: 'xunijiguanli-jingxiang', affix: true },
meta: { title: 'image', icon: 'xunijiguanli-jingxiang', affix: true },
hidden: false
},
{
@ -176,7 +176,7 @@ const virtualMachineRouter = {
path: '',
component: () => import('@/views/virtualMachine/namespace/list.vue'),
name: 'namespace',
meta: { title: '命名空间', icon: 'mingmingkongjian', affix: true },
meta: { title: 'namespace', icon: 'mingmingkongjian', affix: true },
hidden: false
},
{

24
src/utils/request.js
View File

@ -1,5 +1,7 @@
import axios from 'axios'
import { Message, MessageBox } from 'element-ui'
import {
// Message,
MessageBox } from 'element-ui'
import store from '@/store'
import { getToken } from '@/utils/auth'
// import Cookies from 'js-cookie'
@ -72,22 +74,22 @@ service.interceptors.response.use(
}
// if the custom code is not 20000, it is judged as an error.
if (res.code && res.code !== 200 && (res.code !== 201) && (res.code !== 204)) {
Message({
message: res.message || 'Error',
type: 'error',
duration: 5 * 1000
})
// Message({
// message: res.message || 'Error',
// type: 'error',
// duration: 5 * 1000
// })
return Promise.reject(new Error(res || 'Error'))
} else {
return res
}
},
error => {
Message({
message: error?.response?.data?.message || error?.response?.data?.msg || 'Error',
type: 'error',
duration: 5 * 1000
})
// Message({
// message: error?.response?.data?.message || error?.response?.data?.msg || 'Error',
// type: 'error',
// duration: 5 * 1000
// })
if (error?.response?.status === 401) {
MessageBox.confirm('您的登录已过期或者当前账号没有权限，是否重新登录？', '无权限', {
confirmButtonText: '重新登录',

2
src/views/costStatistics/containerCost.vue
View File

@ -87,7 +87,7 @@
<img :src="item.imgSrc" style="width: 52px">
<div>
<div class="name"> {{ item.name }}</div>
<div class="node">集群节点</div>
<div class="node">{{ $t('menu.clusterNodes') }}</div>
</div>
</div>
<div>{{ item.value }} Core </div>

2
src/views/nodeManagement/index.vue
View File

@ -2,7 +2,7 @@
<div>
<el-card class="basicInfo">
<img src="@/assets/images/node.png" class="sidebar-logo" alt="集群节点">
<h4>集群节点</h4>
<h4>{{ $t('menu.clusterNodes') }}</h4>
<span class="tips title-tips">
集群节点提供了当前集群下节点的运行状态，以及可以编辑删除节点</span>
</el-card>