diff --git a/sysom_web/src/locales/en-US/pages.js b/sysom_web/src/locales/en-US/pages.js index 14f0a3050cb867112a54690a98be3f8db6b56c38..887012ab00ed125badd9b3b678f12e707dbbfbe8 100644 --- a/sysom_web/src/locales/en-US/pages.js +++ b/sysom_web/src/locales/en-US/pages.js @@ -30,7 +30,7 @@ export default { // 'pages.admin.subPage.title': 'This page can only be viewed by Admin', // 'pages.admin.subPage.alertMessage': 'Umi ui is now released, welcome to use npm run ui to start the experience.', - 'pages.language': '中文', + 'pages.language': 'Chinese', 'pages.layouts.userLayout.title': 'System Operation&Maintenance', 'pages.login.accountLogin.tab': 'Account Login', 'pages.login.passwordLogin.tab': 'Change Password', @@ -254,8 +254,8 @@ export default { 'pages.migrate.ok': 'OK', 'pages.migrate.cancel': 'Cancel', 'pages.migrate.nomachinegroup': 'No machine group currently', - 'pages.migrate.machinestotal': 'Total number of machines:', - 'pages.migrate.migratemachines': 'Number of machines to be migrated:', + 'pages.migrate.machinestotal': 'Machine population:', + 'pages.migrate.migratemachines': 'Machine to be migrated:', 'pages.migrate.implementation': 'Batch implementation', 'pages.migrate.configuration': 'Migration configuration', 'pages.migrate.acquisition': 'Failed to update data acquisition, error message:', @@ -270,6 +270,26 @@ export default { 'pages.migrate.nfsbackupipadress_please': 'Enter the IP address of the NFS service', 'pages.migrate.backunfs_please': 'Please enter the directory where the backup is stored in the NFS', 'pages.migrate.notneedbackup_please': 'Enter a directory that does not need to be backed up', + + 'pages.migrate.machine_IP': 'Machine IP (System version)', + 'pages.migrate.migration_state': 'Migration state', + 'pages.migrate.not_migrated': 'Not migrated', + 'pages.migrate.in_operation': 'In operation', + 'pages.migrate.in_readiness': 'In readiness', + 'pages.migrate.successful': 'Successful', + 'pages.migrate.lose': 'Lose', + 'pages.migrate.nonsupport': 'Nonsupport', + 'pages.migrate.schedule': 'Schedule', + 'pages.migrate.controls': 'Controls', + 'pages.migrate.migration_conf': 'Migration configuration', + 'pages.migrate.system_backup': 'System backup', + 'pages.migrate.environmental_pre': 'Environmental preparation', + 'pages.migrate.risk_assessment': 'Risk assessment', + 'pages.migrate.migration_imp': 'Migration implementation', + 'pages.migrate.restart_machine': 'Restart machine', + 'pages.migrate.system_res': 'System restoration', + 'pages.migrate.reset_status': 'Reset status', + 'pages.vmcore.list': 'Outage list', 'pages.vmcore.coreindex': 'Core index', 'pages.vmcore.totalnumberlast30days': 'Total number of outages in the last 30 days', @@ -330,4 +350,52 @@ export default { 'pages.diagnose.dispatchingflamediagram': 'Dispatching flame diagram', 'pages.diagnose.importdiagnosisresultsoffline': 'Import diagnosis results offline', 'pages.diagnose.carddeckexpansion': 'Card deck expansion', + 'pages.home.host_center': 'Host center', + 'pages.home.host_overview': 'Host overview', + 'pages.home.clusters_num': 'Clusters', + 'pages.home.machine_num': 'Main machine', + 'pages.home.online_machines': 'On-line machines', + 'pages.home.offline_machines': 'Off-line machines', + 'pages.home.abnormal_machines': 'Abnormal machines', + 'pages.home.physical_machine': 'Physical machine', + 'pages.home.three_months': 'Three months', + 'pages.home.kernel_version': 'Kernel version distribution', + 'pages.home.log_center': 'Log center', + 'pages.home.log_overview': 'Log overview', + 'pages.home.journal_center': 'The Journal center records user login and logout operations and helps you audit user behaviors', + 'pages.home.diary_entries': 'Diary entries', + 'pages.home.users_number': 'Number of users', + 'pages.home.abnormal_diary': 'Abnormal diary', + 'pages.home.user_chart': 'User data chart', + 'pages.home.diary_chart': 'Diary entries chart', + 'pages.home.resource_center': 'Resource center', + 'pages.home.resource_overview': 'Resource overview', + 'pages.home.total_CPU': 'Total CPU', + 'pages.home.total_memory': 'Total memory', + 'pages.home.disk_size': 'Total disk size', + 'pages.home.NIC_bandwidth': 'Total NIC bandwidth', + 'pages.home.resource_utilization': 'Resource utilization', + 'pages.home.CPU_utilization': 'CPU utilization', + 'pages.home.memory_utilization': 'Memory utilization', + 'pages.home.disk_utilization': 'Disk utilization', + 'pages.home.network_utilization': 'Network utilization', + 'pages.home.CPU_memory': 'CPU/Memory usage', + 'pages.home.safety_center': 'Safety center', + 'pages.home.safety_overview': 'Security overview', + 'pages.home.safety_score': 'Safety score', + 'pages.home.exigency': 'Exigency', + 'pages.home.high_risk': 'High risk', + 'pages.home.risk_in': 'Risk in', + 'pages.home.low_risk': 'Low-risk', + 'pages.home.vulnerability_fixed': 'Vulnerability to be fixed', + 'pages.home.vulnerability_historical': 'Historical fix vulnerability', + 'pages.home.security_operation': 'Security operation trend', + 'pages.home.outage_center': 'Outage center', + 'pages.home.outage_overview': 'Outage overview', + 'pages.home.core_index': 'Core index', + 'pages.home.downtime_30day': '30days downtime', + 'pages.home.downtime_7day': '7days downtime', + 'pages.home.monthly_failure': 'Monthly Downtime', + 'pages.home.daily_downtime': 'Daily downtime', + 'pages.home.downtime_trend': 'Downtime trend', }; \ No newline at end of file diff --git a/sysom_web/src/locales/zh-CN/pages.js b/sysom_web/src/locales/zh-CN/pages.js index 8baecf58eaeb4494935244bacb653d7a4f6da78b..9f3945658d43f340553a12aed5c5bd44a23a9f6c 100644 --- a/sysom_web/src/locales/zh-CN/pages.js +++ b/sysom_web/src/locales/zh-CN/pages.js @@ -1,5 +1,5 @@ export default { - 'pages.language': 'English', + 'pages.language': '英文', 'pages.layouts.userLayout.title': '系统运维平台', 'pages.login.accountLogin.tab': '账户密码登录', 'pages.login.passwordLogin.tab': '账户密码修改', @@ -278,7 +278,7 @@ export default { 'pages.migrate.ok': '确定', 'pages.migrate.cancel': '取消', 'pages.migrate.nomachinegroup': '暂无机器组', - 'pages.migrate.machinestotal': '机器总数', + 'pages.migrate.machinestotal': '机器总数:', 'pages.migrate.migratemachines': '待迁移机器数:', 'pages.migrate.implementation': '批量实施', 'pages.migrate.configuration': '迁移配置', @@ -294,6 +294,26 @@ export default { 'pages.migrate.nfsbackupipadress_please': '请输入NFS服务的IP地址', 'pages.migrate.backunfs_please': '请输入备份存放在NFS的目录', 'pages.migrate.notneedbackup_please': '请输入本机无需备份的目录', + + 'pages.migrate.machine_IP': '机器 IP(系统版本)', + 'pages.migrate.migration_state': '迁移状态', + 'pages.migrate.not_migrated': '未迁移', + 'pages.migrate.in_operation': '运行中', + 'pages.migrate.in_readiness': '就绪中', + 'pages.migrate.successful': '成功', + 'pages.migrate.lose': '失败', + 'pages.migrate.nonsupport': '不支持', + 'pages.migrate.schedule': '进度', + 'pages.migrate.controls': '操作', + 'pages.migrate.migration_conf': '迁移配置', + 'pages.migrate.system_backup': '系统备份', + 'pages.migrate.environmental_pre': '环境准备', + 'pages.migrate.risk_assessment': '风险评估', + 'pages.migrate.migration_imp': '迁移实施', + 'pages.migrate.restart_machine': '重启机器', + 'pages.migrate.system_res': '系统还原', + 'pages.migrate.reset_status': '重置状态', + 'pages.vmcore.list': '宕机列表', 'pages.vmcore.coreindex': '核心指标', 'pages.vmcore.totalnumberlast30days': '最近30天宕机总数', @@ -366,4 +386,52 @@ export default { 'pages.diagnose.DStatuslevel': 'D状态负载影响度', 'pages.diagnose.systemhealthy': '系统目前健康,无D状态进程', 'pages.diagnose.RStatuslevel': 'R状态负载影响度', + 'pages.home.host_center': '主机中心', + 'pages.home.host_overview': '主机概述', + 'pages.home.clusters_num': '集群数', + 'pages.home.machine_num': '主机数', + 'pages.home.online_machines': '在线机器数', + 'pages.home.offline_machines': '离线机器数', + 'pages.home.abnormal_machines': '异常机器数', + 'pages.home.physical_machine': '物理机数', + 'pages.home.three_months': '近三个月', + 'pages.home.kernel_version': '内核版本分布', + 'pages.home.log_center': '日志中心', + 'pages.home.log_overview': '日志概述', + 'pages.home.journal_center': '日记中心用于记录用户登录登出等操作,可协助您完成用户行为审计', + 'pages.home.diary_entries': '日记条数', + 'pages.home.users_number': '用户总数', + 'pages.home.abnormal_diary': '异常日记', + 'pages.home.user_chart': '用户数据趋势图', + 'pages.home.diary_chart': '日记条数趋势图', + 'pages.home.resource_center': '资源中心', + 'pages.home.resource_overview': '资源概述', + 'pages.home.total_CPU': 'CPU总数', + 'pages.home.total_memory': '内存总数', + 'pages.home.disk_size': '磁盘总大小', + 'pages.home.NIC_bandwidth': '网卡总带宽', + 'pages.home.resource_utilization': '资源利用率', + 'pages.home.CPU_utilization': 'CPU利用率', + 'pages.home.memory_utilization': '内存利用率', + 'pages.home.disk_utilization': '磁盘利用率', + 'pages.home.network_utilization': '网络利用率', + 'pages.home.CPU_memory': 'CPU/内存利用率', + 'pages.home.safety_center': '安全中心', + 'pages.home.safety_overview': '安全概述', + 'pages.home.safety_score': '安全评分', + 'pages.home.exigency': '紧急', + 'pages.home.high_risk': '高危', + 'pages.home.risk_in': '中危', + 'pages.home.low_risk': '低危', + 'pages.home.vulnerability_fixed': '待修复漏洞', + 'pages.home.vulnerability_historical': '历史修复漏洞', + 'pages.home.security_operation': '安全运营趋势', + 'pages.home.outage_center': '宕机中心', + 'pages.home.outage_overview': '宕机概述', + 'pages.home.core_index': '核心指标', + 'pages.home.downtime_30day': '近30天宕机数', + 'pages.home.downtime_7day': '近7天宕机数', + 'pages.home.monthly_failure': '月宕机率', + 'pages.home.daily_downtime': '日宕机率', + 'pages.home.downtime_trend': '宕机趋势', }; \ No newline at end of file diff --git a/sysom_web/src/pages/home/ArcLable.jsx b/sysom_web/src/pages/home/ArcLable.jsx index 7d4951ae566c518d1858e1ff64a456f40832f7af..c228789af41a2bf7cc111f81e126f86df5ed5629 100644 --- a/sysom_web/src/pages/home/ArcLable.jsx +++ b/sysom_web/src/pages/home/ArcLable.jsx @@ -74,7 +74,7 @@ const ArcLable = withSize({ monitorHeight: true })(props => { : {value} } - {title} + {title} ) }) diff --git a/sysom_web/src/pages/home/CveLable.jsx b/sysom_web/src/pages/home/CveLable.jsx index 3b017ab7da2d4b8dc83a395bb470c9306ab9d061..c001026efa4cdae2c57da61483c2a50018acf260 100644 --- a/sysom_web/src/pages/home/CveLable.jsx +++ b/sysom_web/src/pages/home/CveLable.jsx @@ -1,4 +1,5 @@ import { withSize } from 'react-sizeme'; +import { FormattedMessage } from 'umi'; const CveLable = withSize({ monitorHeight: true })(props => { const { arcs, value, subValue, title, size, subArcColor, warning, line, textColor } = props; @@ -28,7 +29,7 @@ const CveLable = withSize({ monitorHeight: true })(props => { - 紧急 + ) }) diff --git a/sysom_web/src/pages/home/index.jsx b/sysom_web/src/pages/home/index.jsx index daf8d93149ed7bcbb1c028fb061f7dfa94db9bb1..868205bd8b63a06b1ecd33b721e1bed3f73b4917 100644 --- a/sysom_web/src/pages/home/index.jsx +++ b/sysom_web/src/pages/home/index.jsx @@ -7,10 +7,12 @@ import { getHomeData } from "./service" import ArcLable from './ArcLable'; import DashLable from './DashLable'; import CveLable from './CveLable'; +import { useIntl, FormattedMessage } from 'umi'; const Home = (props) => { const { data, error, loading } = useRequest(getHomeData); + const intl = useIntl(); if (loading) return @@ -91,23 +93,45 @@ const Home = (props) => { <> - + {/*饼图*/}
- +
- +
- +
- +
- +
@@ -119,31 +143,38 @@ const Home = (props) => {
-
物理机数
-
近三个月
+
+
-
内核版本分布
+
- -
日记中心用于记录用户登录登出等操作,可协助您完成用户行为审计
+ +
-
日记条数
+
-
用户总数
+
-
异常日记
+
@@ -155,34 +186,54 @@ const Home = (props) => {
-
用户数据趋势图
-
近三个月
+
+
-
日记条数趋势图
-
近三个月
+
+
- + +
- +
- +
- +
- +
@@ -190,24 +241,36 @@ const Home = (props) => {
{/*仪表盘*/} -
资源利用率
+
- +
- +
- +
- +
-
CPU/内存利用率
-
近三个月
+
+
@@ -215,15 +278,15 @@ const Home = (props) => {
-
网络利用率
-
近三个月
+
+
-
磁盘利用率
-
近三个月
+
+
@@ -231,11 +294,21 @@ const Home = (props) => { - +
+ subValue={data.CVEOverview.safetyRating.type} title={intl.formatMessage({ + id: 'pages.home.safety_score', + defaultMessage: 'Safety score', + })} />
@@ -243,7 +316,7 @@ const Home = (props) => {
- 紧急 +
{data.CVEOverview.CVETobeFixed.Critical} @@ -251,7 +324,7 @@ const Home = (props) => {
- 高危 +
{data.CVEOverview.CVETobeFixed.Important} @@ -259,7 +332,7 @@ const Home = (props) => {
- 中危 +
{data.CVEOverview.CVETobeFixed.Moderate} @@ -267,21 +340,21 @@ const Home = (props) => {
- 低危 +
{data.CVEOverview.CVETobeFixed.Low}
- 待修复漏洞 +
- 紧急 +
{data.CVEOverview.CVETobeFixed.Critical} @@ -289,7 +362,7 @@ const Home = (props) => {
- 高危 +
{data.CVEOverview.CVETobeFixed.Important} @@ -297,7 +370,7 @@ const Home = (props) => {
- 中危 +
{data.CVEOverview.CVETobeFixed.Moderate} @@ -305,44 +378,63 @@ const Home = (props) => {
- 低危 +
{data.CVEOverview.CVETobeFixed.Low}
- 历史修复漏洞 +
-
安全运营趋势
-
近三个月
+
+
- +
-
核心指标
+
- +
- +
- +
- +
-
宕机趋势
-
近三个月
+
+
diff --git a/sysom_web/src/pages/migrate/implement/components/Banner/index.jsx b/sysom_web/src/pages/migrate/implement/components/Banner/index.jsx index b082f32cf265e74365bcba8a2f92379aec9cbb5d..d01428215904c9e235e125cf1041b5a32352ccf0 100644 --- a/sysom_web/src/pages/migrate/implement/components/Banner/index.jsx +++ b/sysom_web/src/pages/migrate/implement/components/Banner/index.jsx @@ -250,7 +250,7 @@ const machineGroup = (props) => { { - 机器列表 - ( {nodeTotal}台 ) + 机器列表 + ( {nodeTotal} 台 ) } extra={