From b41d3c3882c1fa63da47ec995929836ba189a4ed Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 10 Nov 2023 09:50:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?style:=20=E8=A1=A5=E5=85=85=E8=B7=9F?=
=?UTF-8?q?=E8=B8=AA=E6=A0=8F=E7=9B=AE=E9=A1=B5=E9=9D=A2=E5=A4=9A=E8=AF=AD?=
=?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/locales/en-US.ts | 2 ++
src/i18n/locales/zh-CN.ts | 2 ++
src/views/traceManage/analysis/index.vue | 2 +-
src/views/traceManage/pcap/index.vue | 4 +--
src/views/traceManage/task/index.vue | 38 ++++++++++++++----------
5 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index a130eec0..05c3c949 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -360,6 +360,8 @@ export default {
execUPFStart: 'Execution successful, please stop capturing packets according to the situation',
execUPFStopA: 'Stopped, please start capturing packets according to the situation',
execUPFStop: 'Execution successful, packet capture stopped',
+ execUPFCmdA: 'Suitable for other network element anomalies',
+ execUPFCmdB: 'Suitable for UPF anomalies',
},
task: {
neTypePlease: 'Query network element type',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index a232684f..3df3b9c1 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -360,6 +360,8 @@ export default {
execUPFStart: '执行成功, 请根据情况停止抓包',
execUPFStopA: '已经停止, 请根据情况开始抓包',
execUPFStop: '执行成功, 抓包已停止',
+ execUPFCmdA: '适合其他网元异常，UPF配合抓包的情况',
+ execUPFCmdB: '适合UPF异常需要抓包分析的情况',
},
task: {
neTypePlease: '请选择网元类型',
diff --git a/src/views/traceManage/analysis/index.vue b/src/views/traceManage/analysis/index.vue
index 73eb8ddd..c88be98f 100644
--- a/src/views/traceManage/analysis/index.vue
+++ b/src/views/traceManage/analysis/index.vue
@@ -454,7 +454,7 @@ onMounted(() => {
- 查看详情
+ {{ t('common.viewText') }}
diff --git a/src/views/traceManage/pcap/index.vue b/src/views/traceManage/pcap/index.vue
index 5c20148d..9e2753ab 100644
--- a/src/views/traceManage/pcap/index.vue
+++ b/src/views/traceManage/pcap/index.vue
@@ -52,13 +52,13 @@ let modalState: ModalStateType = reactive({
},
upfCmdOptions: [
{
- label: '适合其他网元异常，UPF配合抓包的情况',
+ label: t('views.traceManage.pcap.execUPFCmdA'),
start: 'pcap trace rx tx max 100000 intfc any',
stop: 'pcap trace rx tx off',
value: 'pcap trace',
},
{
- label: '适合UPF异常需要抓包分析的情况',
+ label: t('views.traceManage.pcap.execUPFCmdB'),
start: 'pcap dispatch trace on max 100000',
stop: 'pcap dispatch trace off',
value: 'pcap dispatch',
diff --git a/src/views/traceManage/task/index.vue b/src/views/traceManage/task/index.vue
index 58757c8c..e74d0184 100644
--- a/src/views/traceManage/task/index.vue
+++ b/src/views/traceManage/task/index.vue
@@ -224,7 +224,7 @@ function fnRecordDelete(id: string) {
function fnGetList(pageNum?: number) {
if (tableState.loading) return;
tableState.loading = true;
- if(pageNum){
+ if (pageNum) {
queryParams.pageNum = pageNum;
}
listTraceTask(toRaw(queryParams)).then(res => {
@@ -432,7 +432,7 @@ function fnModalVisibleByVive(id: string) {
*/
function fnModalVisibleByEdit(id?: string) {
if (!id) {
- fnModalCancel()
+ fnModalCancel();
modalState.title = t('views.traceManage.task.addTask');
modalState.visibleByEdit = true;
} else {
@@ -492,7 +492,7 @@ function fnModalOk() {
content: t('common.msgSuccess', { msg: modalState.title }),
duration: 3,
});
- fnModalCancel()
+ fnModalCancel();
} else {
message.error({
content: `${res.msg}`,
@@ -569,25 +569,31 @@ onMounted(() => {
-
+
-
+
@@ -648,15 +654,15 @@ onMounted(() => {
:selected-keys="[tableState.size as string]"
@click="fnTableSize"
>
- {{
- t('common.size.default')
- }}
- {{
- t('common.size.middle')
- }}
- {{
- t('common.size.small')
- }}
+
+ {{ t('common.size.default') }}
+
+
+ {{ t('common.size.middle') }}
+
+
+ {{ t('common.size.small') }}
+
From e4b504825dc5124e228908aa2f3c6c7771af7680 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 10 Nov 2023 10:03:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?style:=20=E5=B8=83=E5=B1=80=E5=A4=9A?=
=?UTF-8?q?=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/locales/en-US.ts | 19 ++++++++++++++++++-
src/i18n/locales/zh-CN.ts | 19 ++++++++++++++++++-
src/layouts/components/RightContent.vue | 8 ++++----
src/layouts/components/Tabs.vue | 18 +++++++++++++-----
4 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 05c3c949..e7c59619 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -58,7 +58,7 @@ export default {
}
},
- // 导入
+ // 组件
components: {
UploadModal:{
uploadTitle:'Data Import',
@@ -88,6 +88,23 @@ export default {
codeSmsSend: 'Successfully sent, please pay attention to checking the SMS',
},
+ // 布局
+ loayouts: {
+ rightContent: {
+ fullscreen: "Full Screen",
+ logout: "Logout",
+ profile: "Profile",
+ settings: "Settings",
+ },
+ tabs: {
+ reload: "Refresh current",
+ more: "More Options",
+ closeCurrent: "Close Current",
+ closeOther: "Close Other",
+ closeAll: "Close All",
+ }
+ },
+
// 页面
views: {
index: {
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 3df3b9c1..baf8a8d8 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -58,7 +58,7 @@ export default {
}
},
- // 导入
+ // 组件
components: {
UploadModal:{
uploadTitle:'数据导入',
@@ -88,6 +88,23 @@ export default {
codeSmsSend: '发送成功，请注意查看短信',
},
+ // 布局
+ loayouts: {
+ rightContent: {
+ fullscreen: "全屏显示",
+ logout: "退出登录",
+ profile: "个人中心",
+ settings: "个人设置",
+ },
+ tabs: {
+ reload: "刷新当前",
+ more: "更多选项",
+ closeCurrent: "关闭当前",
+ closeOther: "关闭其他",
+ closeAll: "关闭全部",
+ }
+ },
+
// 页面
views: {
index: {
diff --git a/src/layouts/components/RightContent.vue b/src/layouts/components/RightContent.vue
index 78972327..924416c5 100644
--- a/src/layouts/components/RightContent.vue
+++ b/src/layouts/components/RightContent.vue
@@ -50,7 +50,7 @@ function fnChangeLocale(e: any) {
- 全屏显示
+ {{ t('loayouts.rightContent.fullscreen') }}
@@ -90,20 +90,20 @@ function fnChangeLocale(e: any) {
- 个人中心
+ {{ t('loayouts.rightContent.profile') }}
-->
- 个人设置
+ {{ t('loayouts.rightContent.settings') }}
- 退出登录
+ {{ t('loayouts.rightContent.logout') }}
diff --git a/src/layouts/components/Tabs.vue b/src/layouts/components/Tabs.vue
index df9df2d5..371cac10 100644
--- a/src/layouts/components/Tabs.vue
+++ b/src/layouts/components/Tabs.vue
@@ -3,6 +3,8 @@ import IconFont from '@/components/IconFont/index.vue';
import { computed, watch } from 'vue';
import { useRouter } from 'vue-router';
import useTabsStore from '@/store/modules/tabs';
+import useI18n from '@/hooks/useI18n';
+const { t } = useI18n();
const tabsStore = useTabsStore();
const router = useRouter();
@@ -126,7 +128,7 @@ watch(router.currentRoute, v => tabsStore.tabOpen(v), { immediate: true });
- 刷新当前
+ {{ t('loayouts.tabs.reload') }}
tabsStore.tabOpen(v), { immediate: true });
- 更多选项
+ {{ t('loayouts.tabs.more') }}
- 关闭当前
- 关闭其他
- 关闭全部
+
+ {{ t('loayouts.tabs.closeCurrent') }}
+
+
+ {{ t('loayouts.tabs.closeOther') }}
+
+
+ {{ t('loayouts.tabs.closeAll') }}
+
From 946db8848c246987d2c04830b354049f7d2c99be Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 10 Nov 2023 10:18:49 +0800
Subject: [PATCH 3/6] =?UTF-8?q?style:=20=E7=B3=BB=E7=BB=9F=E8=B5=84?=
=?UTF-8?q?=E6=BA=90=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/locales/en-US.ts | 35 +++++++++++++++++-----------
src/i18n/locales/zh-CN.ts | 7 ++++++
src/views/monitor/monitor/index.vue | 36 ++++++++++++++++++++---------
3 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index e7c59619..9f5243b7 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -505,20 +505,27 @@ export default {
logoutSuccess: "User {num} has been forcibly retired",
},
monitor:{
- avgLoad: '平均负载',
- memory: '内存',
- cache: '缓存',
- io: '磁盘',
- network: '网络',
- loadDetail: "负载率",
- resourceUsage: "资源使用率",
- read: '读取',
- write: '写入',
- readWriteCount: '读写次数',
- count: '次',
- readWriteTime: '读写延迟',
- up: '上行',
- down: '下行',
+ filter: "Global Filter",
+ startTime: 'Start Time',
+ endTime: 'End Time',
+ today: 'Today',
+ yesterday: 'Yesterday',
+ week: 'This Week',
+ month: 'This Month',
+ avgLoad: 'Average loads',
+ memory: 'RAM',
+ cache: 'Cache',
+ io: 'Disk',
+ network: 'Network',
+ loadDetail: "Load Factor",
+ resourceUsage: "Resource utilization rate",
+ read: 'retrieve',
+ write: 'write',
+ readWriteCount: 'Number of reads and writes',
+ count: 'substandard',
+ readWriteTime: 'Read/Write Delay',
+ up: 'up train',
+ down: 'down train',
},
online:{
mettingId:'Session number',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index baf8a8d8..69b417f8 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -505,6 +505,13 @@ export default {
logoutSuccess: "已强退用户 {num}",
},
monitor:{
+ filter: "全局过滤",
+ startTime: '开始时间',
+ endTime: '结束时间',
+ today: '昨天',
+ yesterday: '今天',
+ week: '本周',
+ month: '本月',
avgLoad: '平均负载',
memory: '内存',
cache: '缓存',
diff --git a/src/views/monitor/monitor/index.vue b/src/views/monitor/monitor/index.vue
index 03b0c81f..df257aa0 100644
--- a/src/views/monitor/monitor/index.vue
+++ b/src/views/monitor/monitor/index.vue
@@ -17,6 +17,7 @@ const { t } = useI18n();
/**开始结束时间类型 */
type RangePickerType = {
+ placeholder: [string, string];
ranges: Record;
/**全局时间 */
all: [string, string];
@@ -34,14 +35,24 @@ type RangePickerType = {
/**开始结束时间 */
let rangePicker = reactive({
+ placeholder: [
+ t('views.monitor.monitor.startTime'),
+ t('views.monitor.monitor.endTime'),
+ ],
ranges: {
- 昨天: [
+ [t('views.monitor.monitor.today')]: [
dayjs().subtract(1, 'day').startOf('day'),
dayjs().subtract(1, 'day').endOf('day'),
],
- 今天: [dayjs().startOf('day'), dayjs()],
- 本周: [dayjs().startOf('week'), dayjs().endOf('week')],
- 本月: [dayjs().startOf('month'), dayjs().endOf('month')],
+ [t('views.monitor.monitor.yesterday')]: [dayjs().startOf('day'), dayjs()],
+ [t('views.monitor.monitor.week')]: [
+ dayjs().startOf('week'),
+ dayjs().endOf('week'),
+ ],
+ [t('views.monitor.monitor.month')]: [
+ dayjs().startOf('month'),
+ dayjs().endOf('month'),
+ ],
},
all: ['', ''],
load: ['', ''],
@@ -427,7 +438,10 @@ onMounted(() => {
-
+
{
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm:ss"
show-time
- :placeholder="['开始时间', '结束时间']"
+ :placeholder="rangePicker.placeholder"
:ranges="rangePicker.ranges"
style="width: 100%"
>
@@ -469,7 +483,7 @@ onMounted(() => {
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm:ss"
show-time
- :placeholder="['开始时间', '结束时间']"
+ :placeholder="rangePicker.placeholder"
style="width: 100%"
@change="(_:any, d:[string,string]) => fnGetQuery('load', d)"
>
@@ -499,7 +513,7 @@ onMounted(() => {
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm:ss"
show-time
- :placeholder="['开始时间', '结束时间']"
+ :placeholder="rangePicker.placeholder"
style="width: 100%"
@change="(_:any, d:[string,string]) => fnGetQuery('cpu', d)"
>
@@ -527,7 +541,7 @@ onMounted(() => {
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm:ss"
show-time
- :placeholder="['开始时间', '结束时间']"
+ :placeholder="rangePicker.placeholder"
style="width: 100%"
@change="(_:any, d:[string,string]) => fnGetQuery('memory', d)"
>
@@ -557,7 +571,7 @@ onMounted(() => {
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm:ss"
show-time
- :placeholder="['开始时间', '结束时间']"
+ :placeholder="rangePicker.placeholder"
style="width: 100%"
@change="fnGetQueryIO"
>
@@ -585,7 +599,7 @@ onMounted(() => {
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm:ss"
show-time
- :placeholder="['开始时间', '结束时间']"
+ :placeholder="rangePicker.placeholder"
style="width: 100%"
@change="fnGetQueryNetwork"
>
From be4e1b1d0938fbff9119bbfda61a2a3af9d78fed Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 10 Nov 2023 11:43:03 +0800
Subject: [PATCH 4/6] =?UTF-8?q?style:=20=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/locales/en-US.ts | 40 +++++++++++++++-
src/i18n/locales/zh-CN.ts | 40 +++++++++++++++-
.../setting/components/change-copyright.vue | 16 ++++---
.../setting/components/change-login-bg.vue | 39 ++++++++-------
.../system/setting/components/change-logo.vue | 47 ++++++++++++-------
.../setting/components/change-title.vue | 16 ++++---
src/views/system/setting/index.vue | 18 +++++--
7 files changed, 162 insertions(+), 54 deletions(-)
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 9f5243b7..2244636c 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -576,7 +576,45 @@ export default {
loginPwd:'Login password',
updateSure:'Do you want to update existing data',
downloadObj:'Download Tpl',
- }
+ },
+ setting: {
+ charMaxLen: 'bit character length',
+ saveSubmit: 'Submit Save',
+ saveSuccess: 'Submit Save Successful',
+ revert: 'Vat',
+ revertSuccess: 'Vat Successful',
+ uploadFormat: 'Only the upload image format ({format}) is supported',
+ uploadSize: 'Image file size must be less than {size}MB',
+ uploadSuccess: 'File uploaded successfully, submit and save to take effect',
+ sysLogo: 'System Logo',
+ sysLogoBrand: 'Brand',
+ sysLogoIcon: 'Icon',
+ sysLogoUpload: 'Upload Logo',
+ sysLogoTipContent: 'Confirm that you want to submit the currently changed logo file?',
+ sysLogoTipContentUpload: 'Are you sure you want to upload the logo file?',
+ sysLogoInstruction: 'The system logo display style is shown in the preview area.',
+ sysLogoInstruction1: 'If you want to change the image, please adjust it accordingly before uploading.',
+ sysLogoInstruction2: 'Show the whole picture to the system logo area, please use transparent background, size ratio size',
+ sysLogoInstruction3: 'Displayed as logo + system name to the system logo area.',
+ sysLogoInstruction4: 'Logo size ratio size',
+ sysName: 'System Name',
+ sysNamePlease: 'Please enter the system name',
+ sysNameLimitation: 'System Name Restrictions',
+ sysNameTipContent: 'Confirm that you want to submit the current changed system name?',
+ sysCopyright: 'Copyright Notice',
+ sysCopyrightPlease: 'Please enter copyright notice',
+ sysCopyrightLimitation: 'Copyright Notice Limitation',
+ sysCopyrightTipContent: 'Confirmation of submitting a copyright notice for the current change?',
+ sysLoginBg: 'Login screen background',
+ sysLoginBgNone: 'No background image',
+ sysLoginBgUpload: 'Upload background image',
+ sysLoginBgTipContentUpload: 'Confirmed to upload login screen background file?',
+ sysLoginBgTipContent: 'Are you sure you want to submit the currently changed login screen background?',
+ sysLoginBgTipContentRevert: 'Are you sure you want to restore the background image to the initial system default background?',
+ sysLoginBgInstruction: 'The background style of the system login interface is shown in the preview area, please refer to the actual display.',
+ sysLoginBgInstruction1: 'Please select the appropriate image for uploading.',
+ sysLoginBgInstruction2: 'Restore the background image to the initial system default background by clicking the Restore button.',
+ },
},
},
};
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 69b417f8..775774d4 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -576,7 +576,45 @@ export default {
loginPwd:'登入密码',
updateSure:'是否更新已经存在的数据',
downloadObj:'下载模板',
- },
+ },
+ setting: {
+ charMaxLen: '位字符长度',
+ saveSubmit: '提交保存',
+ saveSuccess: '提交保存成功',
+ revert: '还原',
+ revertSuccess: '还原成功',
+ uploadFormat: '只支持上传图片格式（{format}）',
+ uploadSize: '图片文件大小必须小于 {size}MB',
+ uploadSuccess: '文件上传成功,提交保存生效',
+ sysLogo: '系统LOGO',
+ sysLogoBrand: '全图',
+ sysLogoIcon: '小图',
+ sysLogoUpload: '上传LOGO',
+ sysLogoTipContent: '确认要提交当前变更的LOGO文件吗?',
+ sysLogoTipContentUpload: '确认要上传LOGO文件吗?',
+ sysLogoInstruction: '系统LOGO展示样式如预览区域所示',
+ sysLogoInstruction1: '如需变更请将图片进行对应处理调整后在进行上传。',
+ sysLogoInstruction2: '将整张图片展示到系统LOGO区域，请使用透明背景，尺寸比例大小',
+ sysLogoInstruction3: '以LOGO+系统名称的形式展示到系统LOGO区域。',
+ sysLogoInstruction4: 'LOGO尺寸比例大小',
+ sysName: '系统名称',
+ sysNamePlease: '请输入系统名称',
+ sysNameLimitation: '系统名称限制',
+ sysNameTipContent: '确认要提交当前变更的系统名称吗?',
+ sysCopyright: '版权声明',
+ sysCopyrightPlease: '请输入版权声明',
+ sysCopyrightLimitation: '版权声明限制',
+ sysCopyrightTipContent: '确认要提交当前变更的版权声明吗?',
+ sysLoginBg: '登录界面背景',
+ sysLoginBgNone: '暂无背景图',
+ sysLoginBgUpload: '上传背景图',
+ sysLoginBgTipContentUpload: '确认要上传登录界面背景文件吗?',
+ sysLoginBgTipContent: '确认要提交当前变更的登录界面背景吗?',
+ sysLoginBgTipContentRevert: '确认要将背景图还原到系统初始默认的背景吗?',
+ sysLoginBgInstruction: '系统登录界面背景样式如预览区域所示，请以实际显示为准',
+ sysLoginBgInstruction1: '请将选择合适的图片进行进行上传。',
+ sysLoginBgInstruction2: '通过点击《还原》按钮，将背景图还原到系统初始默认的背景。',
+ },
},
},
};
diff --git a/src/views/system/setting/components/change-copyright.vue b/src/views/system/setting/components/change-copyright.vue
index 4d902d43..3180f58d 100644
--- a/src/views/system/setting/components/change-copyright.vue
+++ b/src/views/system/setting/components/change-copyright.vue
@@ -35,7 +35,7 @@ function fnEdit(v: boolean) {
function fnSave() {
Modal.confirm({
title: t('common.tipTitle'),
- content: `确认要提交当前变更的版权声明吗?`,
+ content: t('views.system.setting.sysCopyrightTipContent'),
onOk() {
// 发送请求
const hide = message.loading(t('common.loading'), 0);
@@ -45,7 +45,7 @@ function fnSave() {
state.loading = false;
hide();
if (res.code === RESULT_CODE_SUCCESS) {
- message.success('提交保存成功', 3);
+ message.success(t('views.system.setting.saveSuccess'), 3);
appStore.copyright = state.copyright;
fnEdit(false);
} else {
@@ -72,7 +72,7 @@ onMounted(() => {
v-model:value="state.copyright"
allow-clear
:maxlength="40"
- placeholder="输入版权声明"
+ :placeholder="t('views.system.setting.sysCopyrightPlease')"
>
@@ -82,7 +82,7 @@ onMounted(() => {
:disabled="state.copyright === state.flag"
@click="fnSave"
>
- 提交保存
+ {{ t('views.system.setting.saveSubmit') }}
{{ t('common.cancel') }}
@@ -92,15 +92,17 @@ onMounted(() => {
{{ state.copyright }}
- 编辑
+
+ {{ t('common.editText') }}
+
- 版权声明限制
+ {{ t('views.system.setting.sysCopyrightLimitation') }}
40
- 位字符长度
+ {{ t('views.system.setting.charMaxLen') }}
diff --git a/src/views/system/setting/components/change-login-bg.vue b/src/views/system/setting/components/change-login-bg.vue
index 1c70663f..24e57727 100644
--- a/src/views/system/setting/components/change-login-bg.vue
+++ b/src/views/system/setting/components/change-login-bg.vue
@@ -36,11 +36,14 @@ function fnBeforeUpload(file: FileType) {
'image/webp',
].includes(file.type);
if (!isJpgOrPng) {
- message.error('只支持上传图片格式（jpg、png、svg、webp）', 3);
+ message.error(
+ t('views.system.setting.uploadFormat', { format: 'jpg、png、svg、webp' }),
+ 3
+ );
}
const isLt10M = file.size / 1024 / 1024 < 10;
if (!isLt10M) {
- message.error('图片文件大小必须小于 10MB', 3);
+ message.error(t('views.system.setting.uploadSize', { size: 10 }), 3);
}
return isJpgOrPng && isLt10M;
}
@@ -49,7 +52,7 @@ function fnBeforeUpload(file: FileType) {
function fnUpload(up: UploadRequestOption) {
Modal.confirm({
title: t('common.tipTitle'),
- content: `确认要上传登录界面背景文件吗?`,
+ content: t('views.system.setting.sysLoginBgTipContentUpload'),
onOk() {
// 发送请求
const hide = message.loading(t('common.loading'), 0);
@@ -61,7 +64,7 @@ function fnUpload(up: UploadRequestOption) {
state.loading = false;
hide();
if (res.code === RESULT_CODE_SUCCESS) {
- message.success('文件上传成功,提交保存生效', 3);
+ message.success(t('views.system.setting.uploadSuccess'), 3);
state.filePath = res.data.fileName;
// 兼容旧前端可改配置文件
const baseUrl = import.meta.env.PROD
@@ -89,7 +92,7 @@ function fnEdit(v: boolean) {
function fnSave() {
Modal.confirm({
title: t('common.tipTitle'),
- content: `确认要提交当前变更的登录界面背景吗?`,
+ content: t('views.system.setting.sysLoginBgTipContent'),
onOk() {
// 发送请求
const hide = message.loading(t('common.loading'), 0);
@@ -99,7 +102,7 @@ function fnSave() {
state.loading = false;
hide();
if (res.code === RESULT_CODE_SUCCESS) {
- message.success('提交保存成功', 3);
+ message.success(t('views.system.setting.saveSuccess'), 3);
appStore.loginBackground = state.filePath;
fnEdit(false);
} else {
@@ -115,7 +118,7 @@ function fnSave() {
function fnRevert() {
Modal.confirm({
title: t('common.tipTitle'),
- content: `确认要将背景图还原到系统初始默认的背景吗?`,
+ content: t('views.system.setting.sysLoginBgTipContentRevert'),
onOk() {
// 发送请求
const hide = message.loading(t('common.loading'), 0);
@@ -126,7 +129,7 @@ function fnRevert() {
state.loading = false;
hide();
if (res.code === RESULT_CODE_SUCCESS) {
- message.success('还原成功', 3);
+ message.success(t('views.system.setting.revertSuccess'), 3);
appStore.loginBackground = state.filePath;
fnEdit(false);
} else {
@@ -148,7 +151,9 @@ onMounted(() => {
-
暂无背景图
+
+ {{ t('views.system.setting.sysLoginBgNone') }}
+
- 请将选择合适的图片进行进行上传。
- 通过点击《还原》按钮，将背景图还原到系统初始默认的背景。
+ {{ t('views.system.setting.sysLoginBgInstruction') }}
+ {{ t('views.system.setting.sysLoginBgInstruction1') }}
+ {{ t('views.system.setting.sysLoginBgInstruction2') }}
diff --git a/src/views/system/setting/components/change-logo.vue b/src/views/system/setting/components/change-logo.vue
index 1a197985..d09020e0 100644
--- a/src/views/system/setting/components/change-logo.vue
+++ b/src/views/system/setting/components/change-logo.vue
@@ -51,7 +51,7 @@ function fnBeforeUpload(file: FileType) {
function fnUpload(up: UploadRequestOption) {
Modal.confirm({
title: t('common.tipTitle'),
- content: `确认要上传LOGO文件吗?`,
+ content: t('views.system.setting.sysLogoTipContentUpload'),
onOk() {
// 发送请求
const hide = message.loading(t('common.loading'), 0);
@@ -63,7 +63,7 @@ function fnUpload(up: UploadRequestOption) {
state.loading = false;
hide();
if (res.code === RESULT_CODE_SUCCESS) {
- message.success('文件上传成功,提交保存生效', 3);
+ message.success(t('views.system.setting.uploadSuccess'), 3);
state.filePath = res.data.fileName;
// 兼容旧前端可改配置文件
const baseUrl = import.meta.env.PROD
@@ -101,7 +101,7 @@ function fnEdit(v: boolean) {
function fnSave() {
Modal.confirm({
title: t('common.tipTitle'),
- content: `确认要提交当前变更的LOGO文件吗?`,
+ content: t('views.system.setting.sysLogoTipContent'),
onOk() {
const reqArr = [];
// 改变LOGO地址
@@ -126,7 +126,7 @@ function fnSave() {
state.loading = false;
hide();
if (resArr[0].code === RESULT_CODE_SUCCESS) {
- message.success('提交保存成功', 3);
+ message.success(t('views.system.setting.saveSuccess'), 3);
if (state.filePath) {
appStore.setLOGO(state.type, state.filePath);
}
@@ -175,15 +175,19 @@ onMounted(() => {
{{ appStore.appName }}
-
+
- 全图
- 小图
+
+ {{ t('views.system.setting.sysLogoBrand') }}
+
+
+ {{ t('views.system.setting.sysLogoIcon') }}
+
{
:custom-request="fnUpload"
>
- 上传LOGO
+ {{ t('views.system.setting.sysLogoUpload') }}
@@ -203,7 +207,7 @@ onMounted(() => {
- 提交保存
+ {{ t('views.system.setting.saveSubmit') }}
{{ t('common.cancel') }}
@@ -211,24 +215,31 @@ onMounted(() => {
- 编辑
+
+ {{ t('common.editText') }}
+
- 系统LOGO展示样式如预览区域所示
- 如需变更请将图片进行对应处理调整后在进行上传。
+ {{ t('views.system.setting.sysLogoInstruction') }}
+ {{ t('views.system.setting.sysLogoInstruction1') }}
- 全图
+ {{
+ t('views.system.setting.sysLogoBrand')
+ }}
- 将整张图片展示到系统LOGO区域，请使用透明背景，尺寸比例大小
+ {{ t('views.system.setting.sysLogoInstruction2') }}
174x48
- 小图
+
+ {{ t('views.system.setting.sysLogoIcon') }}
+
- 以LOGO+系统名称的形式展示到系统LOGO区域。
- LOGO尺寸比例大小1:1
- 列如：132x132
+ {{ t('views.system.setting.sysLogoInstruction3') }}
+ {{ t('views.system.setting.sysLogoInstruction4') }}
+ 1:1
+ eg：132x132
diff --git a/src/views/system/setting/components/change-title.vue b/src/views/system/setting/components/change-title.vue
index 25f4502a..1936bede 100644
--- a/src/views/system/setting/components/change-title.vue
+++ b/src/views/system/setting/components/change-title.vue
@@ -35,7 +35,7 @@ function fnEdit(v: boolean) {
function fnSave() {
Modal.confirm({
title: t('common.tipTitle'),
- content: `确认要提交当前变更的系统名称吗?`,
+ content: t('views.system.setting.sysNameTipContent'),
onOk() {
// 发送请求
const hide = message.loading(t('common.loading'), 0);
@@ -44,7 +44,7 @@ function fnSave() {
state.loading = false;
hide();
if (res.code === RESULT_CODE_SUCCESS) {
- message.success('提交保存成功', 3);
+ message.success(t('views.system.setting.saveSuccess'), 3);
appStore.appName = state.title;
fnEdit(false);
} else {
@@ -71,7 +71,7 @@ onMounted(() => {
allow-clear
:maxlength="11"
style="width: 224px"
- placeholder="输入系统名称"
+ :placeholder="t('views.system.setting.sysNamePlease')"
>
@@ -81,7 +81,7 @@ onMounted(() => {
:disabled="state.title === state.flag"
@click="fnSave"
>
- 提交保存
+ {{ t('views.system.setting.saveSubmit') }}
{{ t('common.cancel') }}
@@ -91,15 +91,17 @@ onMounted(() => {
{{ state.title }}
- 编辑
+
+ {{ t('common.editText') }}
+
- 系统名称限制
+ {{ t('views.system.setting.sysNameLimitation') }}
11
- 位字符长度
+ {{ t('views.system.setting.charMaxLen') }}
diff --git a/src/views/system/setting/index.vue b/src/views/system/setting/index.vue
index 2db5c391..f3f7bcbe 100644
--- a/src/views/system/setting/index.vue
+++ b/src/views/system/setting/index.vue
@@ -4,18 +4,28 @@ import ChangeLogo from './components/change-logo.vue';
import ChangeLogoBG from './components/change-login-bg.vue';
import ChangeTitle from './components/change-title.vue';
import ChangeCopyright from './components/change-copyright.vue';
+import useI18n from '@/hooks/useI18n';
+const { t } = useI18n();
- 系统LOGO
+
+ {{ t('views.system.setting.sysLogo') }}
+
- 系统名称
+
+ {{ t('views.system.setting.sysName') }}
+
- 版权声明
+
+ {{ t('views.system.setting.sysCopyright') }}
+
- 登录界面背景
+
+ {{ t('views.system.setting.sysLoginBg') }}
+
From 04a7b3887f362ef188e86e283669d4e11439c99d Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 10 Nov 2023 14:15:14 +0800
Subject: [PATCH 5/6] =?UTF-8?q?style:=20error=E9=A1=B5=E9=9D=A2=E5=A4=9A?=
=?UTF-8?q?=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/locales/en-US.ts | 16 ++++++++++++++++
src/i18n/locales/zh-CN.ts | 16 ++++++++++++++++
src/views/error/403.vue | 14 ++++++++++----
src/views/error/404.vue | 21 ++++++++++++++-------
4 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 2244636c..165623c5 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -122,6 +122,22 @@ export default {
serialNum: 'serialNum',
expiryDate: 'expiryDate',
},
+ error: {
+ err403: {
+ ttile: 'No access',
+ subTitle:'Please do not perform illegal operations, you can go back to the main page or return to the',
+ backHome: 'Back to Home',
+ back: 'Back',
+ },
+ err404: {
+ ttile: 'Match page not found',
+ subTitle:'Sorry, the page you are looking for does not exist.',
+ backHome: 'Back to Home',
+ tipTitle: "Can't find the page?",
+ paragraph: 'Try checking the URL for errors and then press the refresh button on your browser.',
+ paragraph1: 'Try to find other content in our application.',
+ },
+ },
login: {
tabPane1: 'Account password login',
tabPane2: 'Login with phone number',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 775774d4..25b40cda 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -122,6 +122,22 @@ export default {
serialNum: '序列号',
expiryDate: '许可证到期日期',
},
+ error: {
+ err403: {
+ ttile: '没有访问权限',
+ subTitle:'请不要进行非法操作，您可以返回主页面或返回',
+ backHome: '返回首页',
+ back: '返回',
+ },
+ err404: {
+ ttile: '找不到匹配页面',
+ subTitle:'对不起，您正在寻找的页面不存在。',
+ backHome: '返回首页',
+ tipTitle: '找不到网页？',
+ paragraph: '尝试检查URL的错误，然后按浏览器上的刷新按钮。',
+ paragraph1: '尝试在我们的应用程序中找到其他内容。',
+ },
+ },
login: {
tabPane1: '账号密码登录',
tabPane2: '手机号登录',
diff --git a/src/views/error/403.vue b/src/views/error/403.vue
index 13c215c4..b7578e2d 100644
--- a/src/views/error/403.vue
+++ b/src/views/error/403.vue
@@ -1,19 +1,25 @@
- 返回首页
+
+ {{ t('views.error.err403.backHome') }}
+
- 返回
+
+ {{ t('views.error.err403.back') }}
+
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index 14b1e60e..99261f9b 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -1,23 +1,30 @@
-
+
- 返回首页
+
+ {{ t('views.error.err404.backHome') }}
+
- 找不到网页？
+
+ {{ t('views.error.err404.tipTitle') }}
+
- 1. 尝试检查URL的错误，然后按浏览器上的刷新按钮。
+ 1. {{ t('views.error.err404.paragraph') }}
- 2. 尝试在我们的应用程序中找到其他内容。
+ 2. {{ t('views.error.err404.paragraph1') }}
From 7d361f5c3194c35c8f3ae99f886390a71ecdbc00 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 10 Nov 2023 14:38:36 +0800
Subject: [PATCH 6/6] =?UTF-8?q?style:=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/locales/en-US.ts | 7 +++--
src/i18n/locales/zh-CN.ts | 7 +++--
src/views/system/config/index.vue | 49 +++++++++++++++++--------------
src/views/system/user/index.vue | 43 ++++++++++++++-------------
4 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 165623c5..eb48cd0b 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -8,6 +8,8 @@ export default {
title: 'Core Network Management Platform',
desc: 'Core Network Management Platform',
loading: 'Please wait...',
+ ipnutPlease: 'Please input',
+ selectPlease: 'please select',
tipTitle: 'Prompt',
msgSuccess: 'Success {msg}',
errorFields: 'Please fill in the required information in {num} correctly!',
@@ -24,11 +26,13 @@ export default {
editText: 'Edit',
deleteText: 'Delete',
downloadText: 'Download',
+ import:'Import',
export:'Export',
uploadText: 'Upload',
unableNull:' Cannot be empty',
moreText: 'More',
searchBarText: 'Search bar',
+ tableStripedText: 'Form Zebra',
reloadText: 'Refresh',
sizeText: 'Density',
size: {
@@ -578,8 +582,6 @@ export default {
delSuss:'Successfully deleted',
sureTip:'Are you sure you want to {text} {userName} user?',
delSure:'Confirm deletion of data item with user ID {userId}?',
- export:'Export',
- import:'Import',
exportSure:'Are you sure to export the xlsx table file based on search criteria??',
phone:'Phone Number',
createTime:'Creation time',
@@ -588,6 +590,7 @@ export default {
email:'E-mail',
fromClass:'DEPARTMENT',
userWork:'User position',
+ userWorkPlease: 'Please select user post',
userTip:'User Description',
loginPwd:'Login password',
updateSure:'Do you want to update existing data',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 25b40cda..a922c0d6 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -8,6 +8,8 @@ export default {
title: '核心网管理平台',
desc: '核心网管理平台',
loading: '请稍等...',
+ ipnutPlease: '请输入',
+ selectPlease: '请选择',
tipTitle: '提示',
msgSuccess: '{msg}成功 ',
errorFields: '请正确填写 {num} 处必填信息！',
@@ -24,11 +26,13 @@ export default {
editText: '编辑',
deleteText: '删除',
downloadText: '下载',
+ import:'导入',
export:'导出',
uploadText: '上传',
unableNull:'不能为空',
moreText: '更多',
searchBarText: '搜索栏',
+ tableStripedText: '表格斑马纹',
reloadText: '刷新',
sizeText: '密度',
size: {
@@ -578,8 +582,6 @@ export default {
delSuss:'删除成功',
sureTip:'确定要{text} {userName} 用户吗?',
delSure:'确认删除用户编号为{userId}的数据项?',
- export:'导出',
- import:'导入',
exportSure:'确认根据搜索条件导出xlsx表格文件吗?',
phone:'手机号码',
createTime:'创建时间',
@@ -588,6 +590,7 @@ export default {
email:'电子邮箱',
fromClass:'所属部门',
userWork:'用户岗位',
+ userWorkPlease: '请选择用户岗位',
userTip:'用户说明',
loginPwd:'登入密码',
updateSure:'是否更新已经存在的数据',
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 147e8ed7..8ed4f6ce 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -465,7 +465,7 @@ onMounted(() => {
@@ -474,7 +474,7 @@ onMounted(() => {
@@ -483,7 +483,7 @@ onMounted(() => {
@@ -496,7 +496,6 @@ onMounted(() => {
allow-clear
bordered
value-format="YYYY-MM-DD"
- :placeholder="['创建开始', '创建结束']"
style="width: 100%"
>
@@ -506,12 +505,12 @@ onMounted(() => {
- 搜索
+ {{ t('common.search') }}
+
- 重置
+ {{ t('common.reset') }}
+
@@ -529,7 +528,7 @@ onMounted(() => {
v-perms:has="['system:config:add']"
>
- 新建
+ {{ t('common.addText') }}
{
v-perms:has="['system:config:remove']"
>
- 删除
+ {{ t('common.deleteText') }}
{
v-perms:has="['system:config:export']"
>
- 导出
+ {{ t('common.export') }}
@@ -565,31 +564,31 @@ onMounted(() => {
- 搜索栏
+ {{ t('common.searchBarText') }}
- 表格斑马纹
+ {{ t('common.tableStripedText') }}
- 刷新
+ {{ t('common.reloadText') }}
- 密度
+ {{ t('common.sizeText') }}
@@ -599,9 +598,15 @@ onMounted(() => {
:selected-keys="[tableState.size as string]"
@click="fnTableSize"
>
- 默认
- 中等
- 紧凑
+
+ {{ t('common.size.default') }}
+
+
+ {{ t('common.size.middle') }}
+
+
+ {{ t('common.size.small') }}
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d50f480d..d30132d5 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -840,6 +840,7 @@ onMounted(() => {
v-model:value="queryParams.userName"
allow-clear
:maxlength="30"
+ :placeholder="t('common.ipnutPlease')"
>
@@ -852,6 +853,7 @@ onMounted(() => {
v-model:value="queryParams.phonenumber"
allow-clear
:maxlength="11"
+ :placeholder="t('common.ipnutPlease')"
>
@@ -861,6 +863,7 @@ onMounted(() => {
v-model:value="queryParams.status"
allow-clear
:options="dict.sysNormalDisable"
+ :placeholder="t('common.selectPlease')"
>
@@ -911,7 +914,7 @@ onMounted(() => {
v-perms:has="['system:user:import']"
>
- {{ t('views.system.user.import') }}
+ {{ t('common.import') }}
{
v-perms:has="['system:user:export']"
>
- {{ t('views.system.user.export') }}
+ {{ t('common.export') }}
@@ -936,15 +939,15 @@ onMounted(() => {
size="small"
/>
-
+
{{ t('common.reloadText') }}
@@ -962,15 +965,15 @@ onMounted(() => {
:selected-keys="[tableState.size as string]"
@click="fnTableSize"
>
- {{
- t('common.size.default')
- }}
- {{
- t('common.size.middle')
- }}
- {{
- t('common.size.small')
- }}
+
+ {{ t('common.size.default') }}
+
+
+ {{ t('common.size.middle') }}
+
+ {{ t('common.size.small') }}
+
@@ -1207,7 +1210,7 @@ onMounted(() => {
:value="modalState.from.postIds"
disabled
mode="multiple"
- placeholder="请选择用户岗位"
+ :placeholder="t('views.system.user.userWorkPlease')"
option-label-prop="postName"
:options="modalState.options.posts"
:field-names="{ label: 'postName', value: 'postId' }"
@@ -1238,9 +1241,9 @@ onMounted(() => {
- {{
- t('common.close')
- }}
+
+ {{ t('common.close') }}
+