From 2e0eb0c215e95c6857cf1fc1e0e774239ccac10c Mon Sep 17 00:00:00 2001 From: wb-dxy672209 Date: Fri, 23 Dec 2022 14:40:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sysom_web/config/defaultSettings.js | 1 + .../public/resource/diagnose/v1/locales.json | 20 +- .../RightContent/AvatarDropdown.jsx | 41 ++++- sysom_web/src/locales/en-US.js | 2 +- sysom_web/src/locales/en-US/component.js | 17 ++ sysom_web/src/locales/en-US/menu.js | 131 ++++++++++++-- sysom_web/src/locales/en-US/pages.js | 171 +++++++++++++++++- sysom_web/src/locales/en-US/settings.js | 15 +- sysom_web/src/locales/zh-CN.js | 2 +- sysom_web/src/locales/zh-CN/menu.js | 30 ++- sysom_web/src/locales/zh-CN/pages.js | 4 + sysom_web/src/pages/Welcome.jsx | 102 +++++++---- sysom_web/src/pages/Welcome.less | 4 +- .../components/SystemConfig/index.js | 6 +- sysom_web/src/pages/user/Login/index.jsx | 8 +- 15 files changed, 440 insertions(+), 114 deletions(-) diff --git a/sysom_web/config/defaultSettings.js b/sysom_web/config/defaultSettings.js index 2a53825f..2f04f526 100644 --- a/sysom_web/config/defaultSettings.js +++ b/sysom_web/config/defaultSettings.js @@ -5,6 +5,7 @@ const Settings = { contentWidth: 'Fluid', fixedHeader: true, fixSiderbar: true, + // title: 'System Operation&Maintenance', title: '系统运维平台', logo: null, footerLink: { diff --git a/sysom_web/public/resource/diagnose/v1/locales.json b/sysom_web/public/resource/diagnose/v1/locales.json index 9ebaffad..26274958 100644 --- a/sysom_web/public/resource/diagnose/v1/locales.json +++ b/sysom_web/public/resource/diagnose/v1/locales.json @@ -1,25 +1,9 @@ { "version":1.0, "folder": { - "menu.diagnose.memory": "内存诊断中心", - "menu.diagnose.storage": "存储诊断中心", - "menu.diagnose.net": "网络诊断中心", - "menu.diagnose.cpu": "调度诊断中心", - "menu.diagnose.custom": "自定义诊断中心" + }, "dashboard": { - "menu.diagnose.memory.memgraph": "内存大盘", - "menu.diagnose.memory.filecache": "Cache分析", - "menu.diagnose.memory.oomcheck": "OOM诊断", - "menu.diagnose.cpu.schedmoni": "调度抖动诊断", - "menu.diagnose.cpu.loadtask": "系统负载诊断", - "menu.diagnose.storage.iolatency": "IO时延分析", - "menu.diagnose.storage.iofsstat": "IO流量分析", - "menu.diagnose.storage.iohang": "IO HANG诊断", - "menu.diagnose.custom.command": "命令诊断", - "menu.diagnose.net.packetdrop": "丢包诊断", - "menu.diagnose.net.jitter": "抖动诊断", - "menu.diagnose.net.retran": "重传诊断", - "menu.diagnose.net.pingtrace": "时延诊断" + } } diff --git a/sysom_web/src/components/RightContent/AvatarDropdown.jsx b/sysom_web/src/components/RightContent/AvatarDropdown.jsx index 7db02820..1316fb9a 100644 --- a/sysom_web/src/components/RightContent/AvatarDropdown.jsx +++ b/sysom_web/src/components/RightContent/AvatarDropdown.jsx @@ -1,7 +1,7 @@ import React, { useCallback } from 'react'; import { LogoutOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons'; -import { Avatar, Menu, Spin } from 'antd'; -import { history, useModel } from 'umi'; +import { Avatar, Menu, Spin, Button } from 'antd'; +import { history, useModel, FormattedMessage, setLocale, getLocale } from 'umi'; import { stringify } from 'querystring'; import HeaderDropdown from '../HeaderDropdown'; import styles from './index.less'; @@ -85,13 +85,38 @@ const AvatarDropdown = ({ menu }) => { ); + const changLang = () => { + const locale = getLocale(); + console.log(locale); + if (!locale || locale === 'zh-CN') { + setLocale('en-US'); + } else { + setLocale('zh-CN'); + } + }; return ( - - - - {currentUser.username} - - + <> +
+ +
+ + + + {currentUser.username} + + + ); }; diff --git a/sysom_web/src/locales/en-US.js b/sysom_web/src/locales/en-US.js index 5e39ad30..698e30bb 100644 --- a/sysom_web/src/locales/en-US.js +++ b/sysom_web/src/locales/en-US.js @@ -6,7 +6,7 @@ import pwa from './en-US/pwa'; import settingDrawer from './en-US/settingDrawer'; import settings from './en-US/settings'; export default { - 'navBar.lang': 'Languages', + 'navBar.lang': 'English', 'layout.user.link.help': 'Help', 'layout.user.link.privacy': 'Privacy', 'layout.user.link.terms': 'Terms', diff --git a/sysom_web/src/locales/en-US/component.js b/sysom_web/src/locales/en-US/component.js index 3ba7eeda..40ea1dfa 100644 --- a/sysom_web/src/locales/en-US/component.js +++ b/sysom_web/src/locales/en-US/component.js @@ -1,5 +1,22 @@ export default { + // 'component.tagSelect.expand': 'Expand', + // 'component.tagSelect.collapse': 'Collapse', + // 'component.tagSelect.all': 'All', + 'component.tagSelect.expand': 'Expand', 'component.tagSelect.collapse': 'Collapse', 'component.tagSelect.all': 'All', + 'component.ListCard.needed_to_repair': 'Needed To Repair', + 'component.ListCard.high_needed_to_repair': 'High Needed To Repair', + 'component.ListCard.hosts_with_vul': 'Hosts With Vul', + 'component.ListCard.today_repaired': 'Today Repaired', + 'component.ListCard.cumulate_repaired': 'Cumulate Repaired', + 'component.ListCard.latest_scan_time': 'Latest Scan Time', + 'component.ListCard.scan': 'Scan', + 'component.ListCard.setting': 'Setting', + 'component.ListCard.scanning': 'Scanning', + 'component.ListCard.success': 'Success', + 'component.ListCard.failed': 'Failed', + 'component.ListCard.scan_recent': 'Data was recently updated and no need to update again', + 'component.DBModal.create': 'Create' }; diff --git a/sysom_web/src/locales/en-US/menu.js b/sysom_web/src/locales/en-US/menu.js index eae3e532..25418fba 100644 --- a/sysom_web/src/locales/en-US/menu.js +++ b/sysom_web/src/locales/en-US/menu.js @@ -1,5 +1,74 @@ export default { - 'menu.welcome': 'Welcome', + // 'menu.welcome': 'Welcome', + // 'menu.more-blocks': 'More Blocks', + // 'menu.home': 'Home', + // 'menu.admin': 'Admin', + // 'menu.admin.sub-page': 'Sub-Page', + // 'menu.login': 'Login', + // 'menu.register': 'Register', + // 'menu.register-result': 'Register Result', + // 'menu.dashboard': 'Dashboard', + // 'menu.dashboard.analysis': 'Analysis', + // 'menu.dashboard.monitor': 'Monitor', + // 'menu.dashboard.workplace': 'Workplace', + // 'menu.exception.403': '403', + // 'menu.exception.404': '404', + // 'menu.exception.500': '500', + // 'menu.form': 'Form', + // 'menu.form.basic-form': 'Basic Form', + // 'menu.form.step-form': 'Step Form', + // 'menu.form.step-form.info': 'Step Form(write transfer information)', + // 'menu.form.step-form.confirm': 'Step Form(confirm transfer information)', + // 'menu.form.step-form.result': 'Step Form(finished)', + // 'menu.form.advanced-form': 'Advanced Form', + // 'menu.list': 'List', + // 'menu.list.table-list': 'Search Table', + // 'menu.list.basic-list': 'Basic List', + // 'menu.list.card-list': 'Card List', + // 'menu.list.search-list': 'Search List', + // 'menu.list.search-list.articles': 'Search List(articles)', + // 'menu.list.search-list.projects': 'Search List(projects)', + // 'menu.list.search-list.applications': 'Search List(applications)', + // 'menu.profile': 'Profile', + // 'menu.profile.basic': 'Basic Profile', + // 'menu.profile.advanced': 'Advanced Profile', + // 'menu.result': 'Result', + // 'menu.result.success': 'Success', + // 'menu.result.fail': 'Fail', + // 'menu.exception': 'Exception', + // 'menu.exception.not-permission': '403', + // 'menu.exception.not-find': '404', + // 'menu.exception.server-error': '500', + // 'menu.exception.trigger': 'Trigger', + // 'menu.account': 'Account', + // 'menu.account.center': 'Account Center', + // 'menu.account.settings': 'Account Settings', + // 'menu.account.trigger': 'Trigger Error', + // 'menu.account.logout': 'Logout', + // 'menu.editor': 'Graphic Editor', + // 'menu.editor.flow': 'Flow Editor', + // 'menu.editor.mind': 'Mind Editor', + // 'menu.editor.koni': 'Koni Editor', + + 'menu.welcome': 'Home', + 'menu.host': 'Host', + 'menu.host.list': 'List', + 'menu.host.cluster': 'Cluster', + 'menu.host.terminal': 'Terminal', + 'menu.migrate': 'Migrate', + 'menu.migrate.implement': 'Implement', + 'menu.migrate.assess': 'Assess', + 'menu.monitor': 'Monitor', + 'menu.monitor.dashboard': 'Dashboard', + 'menu.monitor.migration': 'Migration', + 'menu.monitor.netinfo': 'Netinfo', + 'menu.vmcore': 'Vmcore', + 'menu.vmcore.list': 'List', + 'menu.vmcore.search': 'Search', + 'menu.vmcore.match': 'Match', + 'menu.vmcore.config': 'Config', + 'menu.newpage': 'Newpage', + 'menu.newpage.newPage': 'Newpage', 'menu.more-blocks': 'More Blocks', 'menu.home': 'Home', 'menu.admin': 'Admin', @@ -17,21 +86,21 @@ export default { 'menu.form': 'Form', 'menu.form.basic-form': 'Basic Form', 'menu.form.step-form': 'Step Form', - 'menu.form.step-form.info': 'Step Form(write transfer information)', - 'menu.form.step-form.confirm': 'Step Form(confirm transfer information)', - 'menu.form.step-form.result': 'Step Form(finished)', + 'menu.form.step-form.info': 'Info', + 'menu.form.step-form.confirm': 'Confirm', + 'menu.form.step-form.result': 'Result', 'menu.form.advanced-form': 'Advanced Form', 'menu.list': 'List', - 'menu.list.table-list': 'Search Table', + 'menu.list.table-list': 'Table List', 'menu.list.basic-list': 'Basic List', 'menu.list.card-list': 'Card List', 'menu.list.search-list': 'Search List', - 'menu.list.search-list.articles': 'Search List(articles)', - 'menu.list.search-list.projects': 'Search List(projects)', - 'menu.list.search-list.applications': 'Search List(applications)', + 'menu.list.search-list.articles': 'Articles', + 'menu.list.search-list.projects': 'Projects', + 'menu.list.search-list.applications': 'Applications', 'menu.profile': 'Profile', - 'menu.profile.basic': 'Basic Profile', - 'menu.profile.advanced': 'Advanced Profile', + 'menu.profile.basic': 'Basic', + 'menu.profile.advanced': 'Advanced', 'menu.result': 'Result', 'menu.result.success': 'Success', 'menu.result.fail': 'Fail', @@ -42,11 +111,41 @@ export default { 'menu.exception.trigger': 'Trigger', 'menu.account': 'Account', 'menu.account.center': 'Account Center', - 'menu.account.settings': 'Account Settings', - 'menu.account.trigger': 'Trigger Error', + 'menu.account.settings': 'Settings', + 'menu.account.trigger': 'Trigger', 'menu.account.logout': 'Logout', - 'menu.editor': 'Graphic Editor', - 'menu.editor.flow': 'Flow Editor', - 'menu.editor.mind': 'Mind Editor', - 'menu.editor.koni': 'Koni Editor', + 'menu.editor': 'Editor', + 'menu.editor.flow': 'Flow', + 'menu.editor.mind': 'Mind', + 'menu.editor.koni': 'Koni', + 'menu.diagnose': 'Diagnostic Center', + 'menu.diagnose.oscheck': 'System Health Check', + 'menu.diagnose.cpu': 'Dispatch Diagnostic Center', + 'menu.diagnose.cpu.loadtask': 'System Load Diagnosis', + 'menu.diagnose.cpu.schedmoni': 'Scheduling Jitter Diagnostics', + 'menu.diagnose.storage': 'Storage Diagnostic Center', + 'menu.diagnose.storage.iolatency': 'IO Latency Analysis', + 'menu.diagnose.storage.iofsstat': 'IO traffic analysis', + 'menu.diagnose.storage.iohang': 'IO HANG Diagnosis', + 'menu.diagnose.net': 'Network Diagnostic Center', + 'menu.diagnose.net.network': 'Network Delay Diagnosis', + 'menu.diagnose.net.packetdrop': 'Packet Loss Diagnosis', + 'menu.diagnose.net.jitter': 'Jitter Diagnosis', + 'menu.diagnose.net.retran': 'Retransmission Diagnosis', + 'menu.diagnose.net.pingtrace': 'Latency Diagnosis', + 'menu.diagnose.memory': 'Memory Diagnostic Center', + 'menu.diagnose.memory.memgraph': 'RAM disk', + 'menu.diagnose.memory.filecache': 'Cache Analysis', + 'menu.diagnose.memory.oomcheck': 'OOM Diagnosis', + 'menu.diagnose.custom': 'Custom Diagnostic Center', + 'menu.diagnose.custom.command': 'Command Diagnostics', + 'menu.journal': 'Log Center', + 'menu.journal.audit': 'Audit Log', + 'menu.journal.task': 'Mission Log', + 'menu.journal.alarm': 'Alarm Log', + 'menu.security': 'Security Center', + 'menu.security.list': 'Vulnerability Center', + 'menu.diagnose.storage.io': 'IO Delay Diagnosis', + 'menu.diagnose.memory.market': 'RAM disk', + 'menu.vmcore.analyse': 'Online Analysis', }; diff --git a/sysom_web/src/locales/en-US/pages.js b/sysom_web/src/locales/en-US/pages.js index a947f0b4..9c1e71de 100644 --- a/sysom_web/src/locales/en-US/pages.js +++ b/sysom_web/src/locales/en-US/pages.js @@ -1,14 +1,55 @@ export default { - 'pages.layouts.userLayout.title': - 'Ant Design is the most influential web design specification in Xihu district', + // 'pages.language': 'English', + // 'pages.layouts.userLayout.title': 'SYSOM', + // 'pages.login.accountLogin.tab': 'Account Login', + // 'pages.login.accountLogin.errorMessage': 'Incorrect username/password(admin/ant.design)', + // 'pages.login.failure': 'Login failed, please try again!', + // 'pages.login.success': 'Login successful!', + // 'pages.login.username.placeholder': 'Username: admin or user', + // 'pages.login.username.required': 'Please input your username!', + // 'pages.login.password.placeholder': 'Password: ant.design', + // 'pages.login.password.required': 'Please input your password!', + // 'pages.login.phoneLogin.tab': 'Phone Login', + // 'pages.login.phoneLogin.errorMessage': 'Verification Code Error', + // 'pages.login.phoneNumber.placeholder': 'Phone Number', + // 'pages.login.phoneNumber.required': 'Please input your phone number!', + // 'pages.login.phoneNumber.invalid': 'Phone number is invalid!', + // 'pages.login.captcha.placeholder': 'Verification Code', + // 'pages.login.captcha.required': 'Please input verification code!', + // 'pages.login.phoneLogin.getVerificationCode': 'Get Code', + // 'pages.getCaptchaSecondText': 'sec(s)', + // 'pages.login.rememberMe': 'Remember me', + // 'pages.login.forgotPassword': 'Forgot Password ?', + // 'pages.login.submit': 'Login', + // 'pages.login.loginWith': 'Login with :', + // 'pages.login.registerAccount': 'Register Account', + // 'pages.welcome.advancedComponent': 'Advanced Component', + // 'pages.welcome.link': 'Welcome', + // 'pages.welcome.advancedLayout': 'Advanced Layout', + // 'pages.welcome.alertMessage': 'Faster and stronger heavy-duty components have been released.', + // '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.layouts.userLayout.title': 'System Operation&Maintenance', 'pages.login.accountLogin.tab': 'Account Login', - 'pages.login.accountLogin.errorMessage': 'Incorrect username/password(admin/ant.design)', + 'pages.login.passwordLogin.tab': 'Change Password', + 'pages.login.accountLogin.errorMessage': 'Incorrect username/password(admin/123456)', + 'pages.login.passwordLogin.errorMessage': 'Incorrect username/password(admin/123456)', 'pages.login.failure': 'Login failed, please try again!', + 'pages.password.failure': 'Password failed, please try again!', 'pages.login.success': 'Login successful!', - 'pages.login.username.placeholder': 'Username: admin or user', - 'pages.login.username.required': 'Please input your username!', - 'pages.login.password.placeholder': 'Password: ant.design', - 'pages.login.password.required': 'Please input your password!', + 'pages.changepassword.success': 'Change password successful!', + 'pages.login.username.placeholder': 'Please input your username!', + 'pages.login.username.required': 'username is required!', + 'pages.login.password.placeholder': 'Please input your password!', + 'pages.login.row_password.placeholder': 'Please input your row password!', + 'pages.login.new_password.placeholder': 'Please input your new password!', + 'pages.login.new_password_again.placeholder': 'Please enter the new password again!', + 'pages.login.password.required': 'password is required!', + 'pages.login.row_password.required': 'row password is required!', + 'pages.login.new_password.required': 'new password is required!', + 'pages.login.new_password_again.required': 'Please enter the new password again!', 'pages.login.phoneLogin.tab': 'Phone Login', 'pages.login.phoneLogin.errorMessage': 'Verification Code Error', 'pages.login.phoneNumber.placeholder': 'Phone Number', @@ -27,7 +68,117 @@ export default { 'pages.welcome.link': 'Welcome', 'pages.welcome.advancedLayout': 'Advanced Layout', 'pages.welcome.alertMessage': 'Faster and stronger heavy-duty components have been released.', - '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.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.hostTable.title': 'Host', + 'pages.hostTable.cluster': 'Cluster', + 'pages.hostTable.hostname': 'Hostname', + 'pages.hostTable.hostname_required': 'hostname is required!', + 'pages.hostTable.username_required': 'username is required!', + 'pages.hostTable.cluster_required': 'cluster is required!', + 'pages.hostTable.cluster_name_required': 'cluster name is required!', + 'pages.hostTable.ip': 'IP', + 'pages.hostTable.ip_required': 'IP is required!', + 'pages.hostTable.newHost': 'New Host', + 'pages.hostTable.password': 'Password', + 'pages.hostTable.password_required': 'password is required!', + 'pages.hostTable.status': 'Host Status', + 'pages.hostTable.status.offline': 'Offline', + 'pages.hostTable.status.running': 'Running', + 'pages.hostTable.status.abnormal': 'Abnormal', + 'pages.hostTable.status.migrating': 'Migrating', + 'pages.hostTable.port': 'Port', + 'pages.hostTable.port_required': 'port is required!', + 'pages.hostTable.script_required': 'script is required!', + 'pages.hostTable.description': 'Description', + 'pages.hostTable.hostOption': 'Option', + 'pages.hostTable.hostUpdatedAt': 'Updated Time', + 'pages.hostTable.edit': 'Edit', + 'pages.hostTable.delete': 'Delete', + 'pages.hostTable.createForm.newHost': 'New Host', + 'pages.hostTable.host': 'host is required!', + 'pages.hostTable.createForm.editHost': 'Edit Host', + 'pages.hostTable.hostRelease': 'Host Release', + 'pages.hostTable.hostKernelVersion': 'Host Kernel Version', + 'pages.clusterTable.title': 'Cluster Management', + 'pages.clusterTable.clusterName': 'Cluster Name', + 'pages.clusterTable.clusterDescription': 'Cluster Description', + 'pages.clusterTable.clusterCreatedAt': 'Created Time', + 'pages.clusterTable.clusterOption': 'Option', + 'pages.clusterTable.delete': 'Delete', + 'pages.clusterTable.hostCount': 'Host Count', + 'pages.clusterTable.notAllowToBeDelete': 'Deletion of clusters containing hosts is not allowed', + 'pages.IssueTable.createIssue': 'New Plan', + 'pages.journal.audit.title': 'Log List', + 'pages.journal.audit.created_at': 'Time', + 'pages.journal.audit.username': 'Username', + 'pages.journal.audit.request_ip': 'Source IP', + 'pages.journal.audit.request_url': 'Request URL', + 'pages.journal.audit.request_method': 'Request Method', + 'pages.journal.audit.request_option': 'Behavior Type', + 'pages.journal.audit.login': 'Login Behavior', + 'pages.journal.audit.action': 'Operational Behavior', + 'pages.journal.audit.response_status': 'Return Status', + 'pages.journal.task.task_id': 'Task ID', + 'pages.journal.task.status': 'Status', + 'pages.journal.task.params': 'Parameter List', + 'pages.journal.task.success': 'Success', + 'pages.journal.task.fail': 'Fail', + 'pages.journal.alarm.collected_time': 'Alarm Time', + 'pages.journal.alarm.level': 'Alarm Level', + 'pages.journal.alarm.noticelcon_type': 'Type', + 'pages.journal.alarm.is_read': 'Whether Read', + 'pages.journal.alarm.true': 'Have Read', + 'pages.journal.alarm.false': 'Unread', + 'pages.journal.alarm.message': 'Alarm Content', + 'pages.security.list.index': 'Serial Number', + 'pages.security.list.cve_id': 'Serial Number', + 'pages.security.list.pub_time': 'Release Time', + 'pages.security.list.vul_level': 'Vulnerability Level', + 'pages.security.list.hosts': 'involving the host', + 'pages.security.list.operation': 'Operation', + 'pages.security.list.high': 'High risk', + 'pages.security.list.medium': 'Medium risk', + 'pages.security.list.critical': 'Serious', + 'pages.security.list.low': 'Low risk', + 'pages.security.list.repair': 'Repair', + 'pages.security.list.confirm': 'Are you sure you want to fix it?', + 'pages.security.list.re': 'under repair.', + 'pages.security.list.error': 'Fix went wrong', + 'pages.security.list.details': 'check the details', + 'pages.security.Homelist.name': 'name of software', + 'pages.security.Homelist.vul_level': 'severity', + 'pages.security.Homelist.fixed_version': 'fix version', + 'pages.security.Homelist.hostname': 'host name', + 'pages.security.Homelist.ip': 'IP address', + 'pages.security.Homelist.created_by': 'user', + 'pages.security.Homelist.created_at': 'creation time', + 'pages.security.Homelist.status': 'Host Status', + 'pages.security.Homelist.re': 'repairing', + 'pages.security.Historical.title': 'Historical repair vulnerability information', + 'pages.security.Historical.id': 'serial number', + 'pages.security.Historical.cve_id': 'cve number', + 'pages.security.Historical.fixed_time': 'repair time', + 'pages.security.Historical.fix_user': 'Restorer', + 'pages.security.Historical.vul_level': 'vulnerability level', + 'pages.security.Historical.severe_risk': 'Serious', + 'pages.security.Historical.high_risk': 'High risk', + 'pages.security.Historical.medium_risk': 'Medium risk', + 'pages.security.Historical.low_risk': 'Low risk', + 'pages.security.Historical.fix_status': 'cve repair status', + 'pages.security.Historical.details': 'check the details', + 'pages.security.Historical.back': 'return', + 'pages.security.Historical.created_at': 'creation time', + 'pages.security.Historical.success': 'success', + 'pages.security.Historical.fail': 'fail', + 'pages.security.Historical.fix_details': 'CVE fix details', + 'pages.security.Historical.fix_success': 'CVE repaired successfully', + 'pages.security.Setting.name': 'Vulnerability library name', + 'pages.security.Setting.url': 'address', + 'pages.security.Historical.fix_fail': 'CVE repair failed, failure reason:', + 'pages.security.notification.fix.success': 'System vulnerabilities have been fixed', + 'pages.security.notification.fix.success.content': 'If you are running the services involved in the vulnerability, it is recommended that you restart the relevant services to make the vulnerability fix take effect.', + 'pages.click.enter': 'click to enter', + 'pages.login': 'Login', + 'pages.changepassword': 'Change Password', }; \ No newline at end of file diff --git a/sysom_web/src/locales/en-US/settings.js b/sysom_web/src/locales/en-US/settings.js index 822dd003..dffd9948 100644 --- a/sysom_web/src/locales/en-US/settings.js +++ b/sysom_web/src/locales/en-US/settings.js @@ -29,13 +29,11 @@ export default { 'app.settings.security.phone': 'Security Phone', 'app.settings.security.phone-description': 'Bound phone', 'app.settings.security.question': 'Security Question', - 'app.settings.security.question-description': - 'The security question is not set, and the security policy can effectively protect the account security', + 'app.settings.security.question-description': 'The security question is not set, and the security policy can effectively protect the account security', 'app.settings.security.email': 'Backup Email', 'app.settings.security.email-description': 'Bound Email', 'app.settings.security.mfa': 'MFA Device', - 'app.settings.security.mfa-description': - 'Unbound MFA device, after binding, can be confirmed twice', + 'app.settings.security.mfa-description': 'Unbound MFA device, after binding, can be confirmed twice', 'app.settings.security.modify': 'Modify', 'app.settings.security.set': 'Set', 'app.settings.security.bind': 'Bind', @@ -47,14 +45,11 @@ export default { 'app.settings.binding.dingding-description': 'Currently unbound DingTalk account', 'app.settings.binding.bind': 'Bind', 'app.settings.notification.password': 'Account Password', - 'app.settings.notification.password-description': - 'Messages from other users will be notified in the form of a station letter', + 'app.settings.notification.password-description': 'Messages from other users will be notified in the form of a station letter', 'app.settings.notification.messages': 'System Messages', - 'app.settings.notification.messages-description': - 'System messages will be notified in the form of a station letter', + 'app.settings.notification.messages-description': 'System messages will be notified in the form of a station letter', 'app.settings.notification.todo': 'To-do Notification', - 'app.settings.notification.todo-description': - 'The to-do list will be notified in the form of a letter from the station', + 'app.settings.notification.todo-description': 'The to-do list will be notified in the form of a letter from the station', 'app.settings.open': 'Open', 'app.settings.close': 'Close', }; diff --git a/sysom_web/src/locales/zh-CN.js b/sysom_web/src/locales/zh-CN.js index 77bc3777..b5e50906 100644 --- a/sysom_web/src/locales/zh-CN.js +++ b/sysom_web/src/locales/zh-CN.js @@ -6,7 +6,7 @@ import settingDrawer from './zh-CN/settingDrawer'; import settings from './zh-CN/settings'; import pages from './zh-CN/pages'; export default { - 'navBar.lang': '语言', + 'navBar.lang': '中文', 'layout.user.link.help': '帮助', 'layout.user.link.privacy': '隐私', 'layout.user.link.terms': '条款', diff --git a/sysom_web/src/locales/zh-CN/menu.js b/sysom_web/src/locales/zh-CN/menu.js index 57917a44..86dc84d9 100644 --- a/sysom_web/src/locales/zh-CN/menu.js +++ b/sysom_web/src/locales/zh-CN/menu.js @@ -8,7 +8,6 @@ export default { 'menu.migrate.implement': '迁移实施', 'menu.migrate.assess': '迁移评估', 'menu.monitor': '监控中心', - 'menu.monitor.': '监控中心', 'menu.monitor.dashboard': '系统监控', 'menu.monitor.migration': '迁移监控', 'menu.monitor.netinfo': 'NetInfo', @@ -69,20 +68,33 @@ export default { 'menu.editor.mind': '脑图编辑器', 'menu.editor.koni': '拓扑编辑器', 'menu.diagnose': '诊断中心', - 'menu.diagnose.storage': '存储诊断中心', - 'menu.diagnose.storage.io': 'IO延时诊断', - 'menu.diagnose.net': '网络诊断中心', - 'menu.diagnose.net.network': '网络延时诊断', 'menu.diagnose.oscheck': '系统健康检查', 'menu.diagnose.cpu': '调度诊断中心', 'menu.diagnose.cpu.loadtask': '系统负载诊断', + 'menu.diagnose.cpu.schedmoni': '调度抖动诊断', + 'menu.diagnose.storage': '存储诊断中心', + 'menu.diagnose.storage.iolatency': 'IO时延分析', + 'menu.diagnose.storage.iofsstat': 'IO流量分析', + 'menu.diagnose.storage.iohang': 'IO HANG诊断', + 'menu.diagnose.net': '网络诊断中心', + 'menu.diagnose.net.network': '网络延时诊断', + 'menu.diagnose.net.packetdrop': '丢包诊断', + 'menu.diagnose.net.jitter': '抖动诊断', + 'menu.diagnose.net.retran': '重传诊断', + 'menu.diagnose.net.pingtrace': '时延诊断', 'menu.diagnose.memory': '内存诊断中心', - 'menu.diagnose.memory.market': '内存大盘', - 'menu.vmcore.analyse': '在线分析', + 'menu.diagnose.memory.memgraph': '内存大盘', + 'menu.diagnose.memory.filecache': 'Cache分析', + 'menu.diagnose.memory.oomcheck': 'OOM诊断', + 'menu.diagnose.custom': '自定义诊断中心', + 'menu.diagnose.custom.command': '命令诊断', 'menu.journal': '日志中心', 'menu.journal.audit': '审计日志', - 'menu.journal.alarm': '告警日志', 'menu.journal.task': '任务日志', + 'menu.journal.alarm': '告警日志', 'menu.security': '安全中心', - 'menu.security.list': '漏洞中心' + 'menu.security.list': '漏洞中心', + 'menu.diagnose.storage.io': 'IO延时诊断', + 'menu.diagnose.memory.market': '内存大盘', + 'menu.vmcore.analyse': '在线分析', }; diff --git a/sysom_web/src/locales/zh-CN/pages.js b/sysom_web/src/locales/zh-CN/pages.js index 9caf6ad2..54e31568 100644 --- a/sysom_web/src/locales/zh-CN/pages.js +++ b/sysom_web/src/locales/zh-CN/pages.js @@ -1,4 +1,5 @@ export default { + 'pages.language': 'English', 'pages.layouts.userLayout.title': '系统运维平台', 'pages.login.accountLogin.tab': '账户密码登录', 'pages.login.passwordLogin.tab': '账户密码修改', @@ -146,4 +147,7 @@ export default { 'pages.security.Historical.fix_fail': 'CVE修复失败，失败原因：', 'pages.security.notification.fix.success': '系统漏洞已修复', 'pages.security.notification.fix.success.content': '如您正在运行漏洞涉及到的服务，建议您重启相关服务使漏洞修复生效。', + 'pages.click.enter': '点击进入', + 'pages.login': '登录', + 'pages.changepassword': '修改密码', }; \ No newline at end of file diff --git a/sysom_web/src/pages/Welcome.jsx b/sysom_web/src/pages/Welcome.jsx index 2471b3fc..c58fa606 100644 --- a/sysom_web/src/pages/Welcome.jsx +++ b/sysom_web/src/pages/Welcome.jsx @@ -1,5 +1,5 @@ import { Layout, Carousel, Menu } from 'antd'; -import { useIntl } from 'umi'; +import { useIntl, FormattedMessage } from 'umi'; import AvatarDrop from './../components/RightContent' import styles from './Welcome.less'; import Footer from '@/components/Footer'; @@ -21,49 +21,85 @@ const Welcome = () => {
- 系统运维平台 +
- 首页 - {/* 主机管理 */} - - 主机列表 - 集群列表 + + + + - - 迁移评估 - 迁移实施 + + + - - 系统监控 + + + - - 宕机列表 - 宕机匹配 - 宕机配置 + + + + - - 系统健康检查 - - 系统负载诊断 + + + + + - - IO延时诊断 + + + + - - 网络延时诊断 + + + + + + - - 内存大盘 + + + + + + + - - 审计日志 - 任务日志 - 告警日志 + + + + - - 漏洞中心 + +
@@ -77,7 +113,7 @@ const Welcome = () => {

{item.title}

- 点击进入 +
diff --git a/sysom_web/src/pages/Welcome.less b/sysom_web/src/pages/Welcome.less index 4049bf77..f55eb745 100644 --- a/sysom_web/src/pages/Welcome.less +++ b/sysom_web/src/pages/Welcome.less @@ -19,12 +19,12 @@ .logo{ position: absolute; left: 84px; - width: 120px; + width: 240px; font-size: 16px; } .menuCenter{ position: absolute; - width: 46%; + width: 50%; left: 50%; transform: translate(-50%,-5%); line-height: 48px!important; diff --git a/sysom_web/src/pages/migrate/assessReport/components/SystemConfig/index.js b/sysom_web/src/pages/migrate/assessReport/components/SystemConfig/index.js index a774b901..9f2b55ab 100644 --- a/sysom_web/src/pages/migrate/assessReport/components/SystemConfig/index.js +++ b/sysom_web/src/pages/migrate/assessReport/components/SystemConfig/index.js @@ -8,9 +8,9 @@ import { WrapperContext } from '../../containers'; import { SET_DATA } from '../../containers/constants'; import './index.less'; -const getSysConfigList = async () => { - return await querySysConfigList(); -} +// const getSysConfigList = async () => { +// return await querySysConfigList(); +// } const SYS_CONFIG_TYPE = { os_env: '环境变量', diff --git a/sysom_web/src/pages/user/Login/index.jsx b/sysom_web/src/pages/user/Login/index.jsx index 2730b148..45b9c672 100644 --- a/sysom_web/src/pages/user/Login/index.jsx +++ b/sysom_web/src/pages/user/Login/index.jsx @@ -84,7 +84,9 @@ const Login = () => {
{ block={true} type="primary" > - 登录 + ) : ( ); return [mod];