diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index a798c982..b2939560 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -723,6 +723,10 @@ export default { status: "Revision Status", upgradeBatch: "Batch Upgrade", upgradeBatchTip: "Do you perform new version upgrades on checked records?", + upgradeNotNewVer: 'No new version found', + upgradeDone: 'Update complete, service being reloaded', + upgradeFail: 'The update failed, check if the service terminal environment is available!', + upgradeModal: 'Network Element Version Updates', }, neLicense: { status: "License Status", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 7a5ce946..1e72fab6 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -723,6 +723,10 @@ export default { status: "版本状态", upgradeBatch: "批量更新", upgradeBatchTip: "对勾选的记录进行新版本升级吗?", + upgradeNotNewVer: '没有发现新版本', + upgradeDone: '更新完成,服务正在重载', + upgradeFail: '更新失败,请检查服务终端环境是否可用!', + upgradeModal: '网元版本更新', }, neLicense: { status: "许可证状态", diff --git a/src/views/ne/neSoftware/components/EditModal.vue b/src/views/ne/neSoftware/components/EditModal.vue index e179259b..289df45f 100644 --- a/src/views/ne/neSoftware/components/EditModal.vue +++ b/src/views/ne/neSoftware/components/EditModal.vue @@ -170,12 +170,10 @@ function fnBeforeUploadFile(file: FileType) { /**表单上传文件 */ function fnUploadFile(up: UploadRequestOption) { // 发送请求 - const hide = message.loading(t('common.loading'), 0); modalState.confirmLoading = true; uploadFileChunk(up.file as File, 5, 'software') .then(res => { if (res.code === RESULT_CODE_SUCCESS) { - message.success('上传成功', 3); // 改为完成状态 const file = modalState.uploadFiles[0]; file.percent = 100; @@ -189,7 +187,6 @@ function fnUploadFile(up: UploadRequestOption) { } }) .finally(() => { - hide(); modalState.confirmLoading = false; }); } diff --git a/src/views/ne/neVersion/index.vue b/src/views/ne/neVersion/index.vue index 15acabca..a97b60d8 100644 --- a/src/views/ne/neVersion/index.vue +++ b/src/views/ne/neVersion/index.vue @@ -316,16 +316,13 @@ function fnRecordVersion( if (res.code === RESULT_CODE_SUCCESS) { lockedStore.fnLock('reload'); } else { - message.error({ - content: `${res.msg}`, - duration: 3, - }); + message.error(t('views.ne.neVersion.upgradeFail'), 3); } return; } fnGetList(1); } else { - message.error(res.msg, 3); + message.error(t('views.ne.neVersion.upgradeFail'), 3); } }) .finally(() => { @@ -336,65 +333,73 @@ function fnRecordVersion( }); } -/**版本升级 */ -function fnRecordUpgrade() { +/**版本升级弹出确认是否升级 */ +function fnRecordUpgradeConfirm() { Modal.confirm({ title: t('common.tipTitle'), content: t('views.ne.neVersion.upgradeBatchTip'), onOk() { - if (modalState.confirmLoading) return; - modalState.confirmLoading = true; - const hide = message.loading(t('common.loading'), 0); - // 操作升级的网元数据 - const selectRows = tableState.data.filter(item => - tableState.selectedRowKeys.includes(item.id) - ); - for (const row of selectRows) { - if (row.neType.toUpperCase() === 'OMC') { - continue; - } - let preinput = {}; - if (row.neType.toUpperCase() === 'IMS') { - preinput = { pisCSCF: 'y' }; - } - modalState.operateDataUpgrade.push({ - neType: row.neType, - neId: row.neId, - action: 'upgrade', - preinput: preinput, - }); - } - - // 发请求信息 - modalState.visibleByUpgrade = true; - Promise.allSettled( - modalState.operateDataUpgrade.map(s => operateNeVersion(s)) - ) - .then(resArr => { - console.log(resArr); - resArr.forEach((s, i) => { - if (s.status === 'rejected') { - message.error(s.reason, 3); - } else { - const res = s.value; - if (res.code === RESULT_CODE_SUCCESS) { - modalState.operateDataUpgrade[i].status = 'done'; - modalState.operateDataUpgrade[i].log = res.data; - } else { - modalState.operateDataUpgrade[i].status = 'fail'; - modalState.operateDataUpgrade[i].log = res.msg; - } - } - }); - }) - .finally(() => { - hide(); - modalState.confirmLoading = false; - }); + fnRecordUpgrade(); }, }); } +/**版本升级进行 */ +async function fnRecordUpgrade() { + if (modalState.confirmLoading) return; + modalState.confirmLoading = true; + modalState.visibleByUpgrade = true; + // 操作升级的网元数据 + const selectRows = tableState.data.filter(item => + tableState.selectedRowKeys.includes(item.id) + ); + for (const row of selectRows) { + if (row.newVersion === '-' || row.newVersion === '') { + modalState.operateDataUpgrade.push({ + neType: row.neType, + neId: row.neId, + status: 'fail', + log: t('views.ne.neVersion.upgradeNotNewVer'), + }); + continue; + } + // 开始升级 + let preinput = {}; + if (row.neType.toUpperCase() === 'IMS') { + preinput = { pisCSCF: 'y' }; + } + const installData = { + neType: row.neType, + neId: row.neId, + action: 'upgrade', + preinput: preinput, + }; + + try { + const res = await operateNeVersion(installData); + const operateData = { + neType: row.neType, + neId: row.neId, + status: 'fail', + log: t('common.operateErr'), + }; + if (res.code === RESULT_CODE_SUCCESS) { + operateData.status = 'done'; + operateData.log = t('views.ne.neVersion.upgradeDone'); + } else { + operateData.status = 'fail'; + operateData.log = t('views.ne.neVersion.upgradeFail'); + } + modalState.operateDataUpgrade.unshift(operateData); + } catch (error) { + console.error(error); + } + } + + // 结束 + modalState.confirmLoading = false; +} + onMounted(() => { // 初始字典数据 getDict('ne_version_status').then(res => { @@ -491,11 +496,11 @@ onMounted(() => { {{ t('views.ne.neSoftware.uploadBatch') }} {{ t('views.ne.neVersion.upgradeBatch') }} @@ -614,20 +619,54 @@ onMounted(() => { @cancel="fnModalEditCancel" > - + -

- {{ o.neType }} - {{ o.neId }} - {{ o.status }} - + + +

+ + + +

+ +

+ + +