From 69f3347a4d9ed406c0b4cf0a12b6e79c23f3f47e Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 17 May 2024 16:04:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 25 +++++-- src/i18n/locales/zh-CN.ts | 23 ++++-- .../ne/neLicense/components/EditModal.vue | 2 +- src/views/ne/neLicense/index.vue | 2 +- src/views/ne/neVersion/index.vue | 72 ++++++------------- 5 files changed, 59 insertions(+), 65 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 2429917e..1986dd79 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -55,6 +55,8 @@ export default { rowId: 'ID', createTime: 'Create Time', updateTime: 'Update Time', + remark: 'Remark', + description: 'Description', operate: 'Operation', operateOk: 'Operation Successful!', operateErr: 'Operation Failed!', @@ -585,7 +587,6 @@ export default { neId: 'NE ID', serialNum: 'Serial Num', expiryDate: 'Expiry Date', - remark: 'Remark', }, neInfo: { version: "Version", @@ -643,15 +644,25 @@ export default { addTitle: "New Host Commands", editTitle: "Edit Host Commands", }, + neSoftware: { + upload: "Upload", + uploadBatch: "Upload More Software", + }, neVersion: { upgrade: "Upgrade To New Version", - upgradeTip: "Are you sure you want to upgrade to the new version?", - upgradeTipEmpty: "There is currently no upgrade available", - upgradeTipEqual: "The current version is the same as the new version", - rollback: 'Rollback To Previous Version', - rollbackTip: "Are you sure you want to roll back to the previous version?", - rollbackTipEmpty: "There is currently no rollback available", + upgradeTip: "Confirmed to upgrade to the new version?", + upgradeTipEmpty: "There are currently no new versions available", + upgradeTipEqual: "Current version is the same as the new version", + rollback: 'Switch to previous version', + rollbackTip: "Confirm switching to the previous version?", + rollbackTipEmpty: "There is currently no previous version available", rollbackTipEqual: 'The current version is the same as the previous version', + version: "Current Version", + preVersion: "Previous Version", + newVersion: "New Version", + status: "Revision Status", + upgradeBatch: "Batch Upgrade", + upgradeBatchTip: "Do you perform new version upgrades on checked records?", }, neLicense: { status: "License Status", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 4901ca0d..f90d0b05 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -55,6 +55,8 @@ export default { rowId: '编号', createTime: '创建时间', updateTime: '更新时间', + remark: '备注', + description: '说明', operate: '操作', operateOk: '操作成功！', operateErr: '操作失败！', @@ -585,7 +587,6 @@ export default { neId: '网元内部标识', serialNum: '序列号', expiryDate: '许可证到期时间', - remark: '备注', }, neInfo: { version: "网元版本", @@ -643,15 +644,25 @@ export default { addTitle: "新增主机命令", editTitle: "编辑主机命令", }, + neSoftware: { + upload: "上传", + uploadBatch: "上传多软件包", + }, neVersion: { upgrade: "升级到新版本", upgradeTip: "确认要升级到新版本吗？", - upgradeTipEmpty: "当前没有可用的升级", + upgradeTipEmpty: "当前没有可用的新版本", upgradeTipEqual: "当前版本与新版本相同", - rollback: '回滚到以前的版本', - rollbackTip: "确认要回滚到上一版本吗？", - rollbackTipEmpty: "目前没有可用的回滚", - rollbackTipEqual: '当前版本与之前版本相同', + rollback: '切换到上一个版本', + rollbackTip: "确认切换到上一个版本吗？", + rollbackTipEmpty: "目前没有可用的上一个版本", + rollbackTipEqual: '当前版本与之前版本相同', + version: "当前版本", + preVersion: "上一个版本", + newVersion: "新版本", + status: "版本状态", + upgradeBatch: "批量更新", + upgradeBatchTip: "对勾选的记录进行新版本升级吗？", }, neLicense: { status: "许可证状态", diff --git a/src/views/ne/neLicense/components/EditModal.vue b/src/views/ne/neLicense/components/EditModal.vue index c3c71bc6..03224d8d 100644 --- a/src/views/ne/neLicense/components/EditModal.vue +++ b/src/views/ne/neLicense/components/EditModal.vue @@ -372,7 +372,7 @@ onMounted(() => {}); - + ([ width: 120, }, { - title: t('views.ne.common.remark'), + title: t('common.remark'), dataIndex: 'remark', key: 'remark', align: 'left', diff --git a/src/views/ne/neVersion/index.vue b/src/views/ne/neVersion/index.vue index 742ffd16..15acabca 100644 --- a/src/views/ne/neVersion/index.vue +++ b/src/views/ne/neVersion/index.vue @@ -36,8 +36,6 @@ let queryParams = reactive({ neType: undefined, /**网元ID */ neId: '', - /**版本 */ - version: '', /**当前页数 */ pageNum: 1, /**每页条数 */ @@ -49,7 +47,6 @@ function fnQueryReset() { queryParams = Object.assign(queryParams, { neType: undefined, neId: '', - version: '', pageNum: 1, pageSize: 20, }); @@ -90,28 +87,28 @@ let tableColumns = ref([ width: 100, }, { - title: 'neType', + title: t('views.ne.common.neType'), dataIndex: 'neType', align: 'left', width: 100, }, { - title: 'neId', + title: t('views.ne.common.neId'), dataIndex: 'neId', align: 'left', width: 100, }, { - title: 'version', + title: t('views.ne.neVersion.version'), dataIndex: 'version', align: 'left', - width: 100, + width: 150, resizable: true, - minWidth: 100, + minWidth: 150, maxWidth: 200, }, { - title: 'Previous Version', + title: t('views.ne.neVersion.preVersion'), dataIndex: 'preVersion', align: 'left', width: 150, @@ -120,24 +117,25 @@ let tableColumns = ref([ maxWidth: 200, }, { - title: 'New Version', + title: t('views.ne.neVersion.newVersion'), dataIndex: 'newVersion', align: 'left', - width: 100, + width: 150, resizable: true, - minWidth: 100, + minWidth: 150, maxWidth: 200, }, { - title: 'status', + title: t('views.ne.neVersion.status'), + key: 'status', dataIndex: 'status', align: 'left', - width: 100, + width: 120, }, { - title: 'updateTime', + title: t('common.updateTime'), dataIndex: 'updateTime', - align: 'center', + align: 'left', customRender(opt) { if (!opt.value) return ''; return parseDateToStr(opt.value); @@ -342,7 +340,7 @@ function fnRecordVersion( function fnRecordUpgrade() { Modal.confirm({ title: t('common.tipTitle'), - content: `check upgrade version?`, + content: t('views.ne.neVersion.upgradeBatchTip'), onOk() { if (modalState.confirmLoading) return; modalState.confirmLoading = true; @@ -366,23 +364,6 @@ function fnRecordUpgrade() { preinput: preinput, }); } - // operateNeVersion({ - // neType: 'row.neType', - // neId: 'row.neId', - // action: 'upgrade', - // preinput: 'preinput', - // }) - // .then(res => { - // if (res.code === RESULT_CODE_SUCCESS) { - // console.log(res); - // } else { - // message.error(res.msg, 3); - // } - // }) - // .finally(() => { - // hide(); - // modalState.confirmLoading = false; - // }); // 发请求信息 modalState.visibleByUpgrade = true; @@ -450,7 +431,7 @@ onMounted(() => { - + { - + { > - - - - - @@ -505,8 +477,8 @@ onMounted(() => { () => (modalState.visibleByEdit = !modalState.visibleByEdit) " > - - Upload Software + + {{ t('views.ne.neSoftware.upload') }} { (modalState.visibleByMoreFile = !modalState.visibleByMoreFile) " > - - Upload More Software + + {{ t('views.ne.neSoftware.uploadBatch') }} { @click.prevent="fnRecordUpgrade()" > - Check Upgrade + {{ t('views.ne.neVersion.upgradeBatch') }}