From 9f2b80718ece4ebb2a4a03c2fd02933d6622ac48 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 27 May 2024 17:08:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E5=8C=85=E7=B1=BB=E5=9E=8B=E6=94=AF=E6=8C=81adb,mf,rtproxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 5 +- src/i18n/locales/zh-CN.ts | 3 + .../components/NeInfoSoftwareInstall.vue | 10 ++-- .../ne/neSoftware/components/EditModal.vue | 31 +++++----- .../neSoftware/components/UploadMoreFile.vue | 58 +++++++++---------- src/views/ne/neSoftware/index.vue | 27 +++++---- 6 files changed, 75 insertions(+), 59 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index ff87e588..a798c982 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -694,6 +694,8 @@ export default { uploadBatch: "Update Softwares", uploadBatchMax: "Multiple packages can be uploaded, with up to {txt} selected at the same time.", uploadFileName: "Parses file names in the format of: amf-r2.240x.xx-xxx", + type: 'Software Type', + typePlease: 'Please select the software type', name: "File Name", path: "Software File", pathPlease: "Please upload the software package file", @@ -769,7 +771,7 @@ export default { configAddTip: 'Is it added as new network element information and continue?', configUpdateTitle: 'Update Tips', configUpdateTip: 'Does it update to the already existing network element information and continue?', - configStepNext: 'Confirm that you want to proceed to the next step for the Net Element software installation?', + configStepNext: 'Confirm that you want to proceed to the next step for the Network Element software installation?', installTitle: "Network Element Installation", installDesc: "Installation to Service Terminal", installConfirmTip: 'Are you sure you want to install package [{name}]?', @@ -786,6 +788,7 @@ export default { licenseResultTitleOk: 'Successful Activation', licenseUpload: 'License', licenseEnd: 'Finish', + licenseEndTip: "Confirmed to end the installation?", licenseCheack: 'Waiting for network element validation', licenseTip1: '1. Click [License] to get the license activation code, and then contact the network element vendor for activation.', licenseTip2: '2. Clicking [Finish] will end the installation process.', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index dcbcb44f..7a5ce946 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -694,6 +694,8 @@ export default { uploadBatch: "上传软件包", uploadBatchMax: "可上传多个软件包，最多同时选择{txt}个。", uploadFileName: "解析文件名称格式如: amf-r2.240x.xx-xxx", + type: '软件类型', + typePlease: '请选择软件包类型', name: "文件名", path: "软件文件", pathPlease: "请上传软件包文件", @@ -786,6 +788,7 @@ export default { licenseResultTitleOk: '成功激活', licenseUpload: '许可证', licenseEnd: '结束', + licenseEndTip: "确认要结束安装吗？", licenseCheack: '等待网元验证', licenseTip1: '1. 点击【许可证】可获取许可激活码，随后联系网元厂商进行激活', licenseTip2: '2. 点击【结束】将结束安装过程', diff --git a/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue b/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue index 4f832b44..0c68fca3 100644 --- a/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue +++ b/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue @@ -29,10 +29,10 @@ let tableColumns: ColumnsType = [ width: 50, }, { - title: t('views.ne.common.neType'), - dataIndex: 'neType', + title: t('views.ne.neSoftware.type'), + dataIndex: 'type', align: 'left', - width: 100, + width: 120, }, { title: t('views.ne.neSoftware.version'), @@ -275,7 +275,7 @@ function fnStepPrev() { function fnStepNext() { Modal.confirm({ title: t('common.tipTitle'), - content: t('views.ne.neQuickSetup.neInfoSoftwareInstallStepNext'), + content: t('views.ne.neQuickSetup.installStepNext'), onOk() { fnToStepName('NeInfoSoftwareLicense'); }, @@ -285,7 +285,7 @@ function fnStepNext() { onMounted(() => { const { neType, neId } = stepState.neInfo; if (neId) { - tableState.queryParams.neType = neType; + tableState.queryParams.type = neType; state.from.neType = neType; state.from.neId = neId; fnGetList(1); diff --git a/src/views/ne/neSoftware/components/EditModal.vue b/src/views/ne/neSoftware/components/EditModal.vue index bbca52ce..e179259b 100644 --- a/src/views/ne/neSoftware/components/EditModal.vue +++ b/src/views/ne/neSoftware/components/EditModal.vue @@ -34,7 +34,7 @@ type ModalStateType = { /**表单数据 */ from: { id: string; - neType: string; + type: string; name: string; path: string; version: string; @@ -52,7 +52,7 @@ let modalState: ModalStateType = reactive({ title: '软件包文件', from: { id: '', - neType: '', + type: '', name: '', path: '', version: '', @@ -66,12 +66,12 @@ let modalState: ModalStateType = reactive({ const modalStateFrom = Form.useForm( modalState.from, reactive({ - neType: [ + type: [ { required: true, min: 1, max: 32, - message: t('views.ne.common.neTypePlease'), + message: t('views.ne.neSoftware.typePlease'), }, ], version: [ @@ -160,9 +160,9 @@ function fnBeforeUploadFile(file: FileType) { if (matches) { modalState.from.version = matches[0]; } - const neTypeIndex = fileName.indexOf('-'); - if (neTypeIndex !== -1) { - modalState.from.neType = fileName.substring(0, neTypeIndex).toUpperCase(); + const typeIndex = fileName.indexOf('-'); + if (typeIndex !== -1) { + modalState.from.type = fileName.substring(0, typeIndex).toUpperCase(); } return true; } @@ -235,7 +235,7 @@ onMounted(() => {});