From f513b47fb8cc38180226221db0f010260951c754 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 13 Jun 2025 20:12:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=202.250613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- CHANGELOG.md | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index eab11384..a2ef0e76 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC" VITE_APP_CODE = "OMC" # 应用版本 -VITE_APP_VERSION = "2.250607" +VITE_APP_VERSION = "2.250613" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index eab11384..a2ef0e76 100644 --- a/.env.production +++ b/.env.production @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC" VITE_APP_CODE = "OMC" # 应用版本 -VITE_APP_VERSION = "2.250607" +VITE_APP_VERSION = "2.250613" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/CHANGELOG.md b/CHANGELOG.md index fd6e3923..94bff81b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # 版本发布日志 +## 2.2506.2-20250613 + +- 修复 数值控件属性maxlength拼写错误 +- 修复 空格内容无法编辑，提示信息显示方向 +- 优化 抓包文件目录列表显示文件大小 + +## 2.2506.1-20250607 + +- 优化 请求响应码常量，身份信息更换逻辑优化 +- 修复 更新tcpdump路径从/tmp到/usr/local以符合新目录结构 + + ## 2.2505.4-20250530 - 优化 网元参数配置修改tooltip位置为bottomLeft防止遮挡 From d6aa4086e23727466d952fb589462ce3420de07a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 16 Jun 2025 18:47:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20UDM=20voup/ims=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/neData/udm-voip/index.vue | 85 ++++++++++++++++++++++------ src/views/neData/udm-volte/index.vue | 78 ++++++++++++++++++++----- 2 files changed, 131 insertions(+), 32 deletions(-) diff --git a/src/views/neData/udm-voip/index.vue b/src/views/neData/udm-voip/index.vue index c7778986..98ddb348 100644 --- a/src/views/neData/udm-voip/index.vue +++ b/src/views/neData/udm-voip/index.vue @@ -26,7 +26,8 @@ import useNeListStore from '@/store/modules/ne_list'; import useI18n from '@/hooks/useI18n'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { saveAs } from 'file-saver'; -import { uploadFileToNE } from '@/api/tool/file'; +import { uploadFile } from '@/api/tool/file'; +import { getNeViewFile } from '@/api/tool/neFile'; const { t } = useI18n(); const neListStore = useNeListStore(); /**网元参数 */ @@ -489,15 +490,27 @@ function fnModalUploadImportUpload(file: File) { } const hide = message.loading(t('common.loading'), 0); uploadImportState.loading = true; - uploadFileToNE('UDM', neID, file, 5) + // 上传文件 + let formData = new FormData(); + formData.append('file', file); + formData.append('subPath', 'import'); + uploadFile(formData) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { - return importUDMVOIP({ - neId: neID, - uploadPath: res.data, - }); + return res.data.filePath; + } else { + uploadImportState.msg = res.msg; + uploadImportState.loading = false; + return ''; } - return res; + }) + .then((filePath: string) => { + if (!filePath) return; + // 文件导入 + return importUDMVOIP({ + neId: neID, + uploadPath: filePath, + }); }) .then(res => { if (!res) return; @@ -517,6 +530,33 @@ function fnModalUploadImportUpload(file: File) { }); } +/**对话框表格信息导入失败原因 */ +function fnModalUploadImportFailReason() { + const neId = queryParams.neId; + if (!neId) return; + const hide = message.loading(t('common.loading'), 0); + getNeViewFile({ + neType: 'UDM', + neId: neId, + path: '/tmp', + fileName: 'import_imsuser_err_records.txt', + }) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { + message.success(t('common.operateOk'), 3); + const blob = new Blob([res.data], { + type: 'text/plain', + }); + saveAs(blob, `import_udmvoip_err_records_${Date.now()}.txt`); + } else { + message.error(`${res.msg}`, 3); + } + }) + .finally(() => { + hide(); + }); +} + /**对话框表格信息导入模板 */ function fnModalDownloadImportTemplate() { const hide = message.loading(t('common.loading'), 0); @@ -554,7 +594,7 @@ onMounted(() => { if (neOtions.value.length > 0) { queryParams.neId = neOtions.value[0].value; } - + // 获取列表数据 fnGetList(); }); @@ -868,14 +908,13 @@ onMounted(() => { name="username" v-bind="modalStateFrom.validateInfos.username" > - - + { - + + + diff --git a/src/views/neData/udm-volte/index.vue b/src/views/neData/udm-volte/index.vue index 296591d2..fd75450e 100644 --- a/src/views/neData/udm-volte/index.vue +++ b/src/views/neData/udm-volte/index.vue @@ -16,7 +16,8 @@ import useNeListStore from '@/store/modules/ne_list'; import useI18n from '@/hooks/useI18n'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { saveAs } from 'file-saver'; -import { uploadFileToNE } from '@/api/tool/file'; +import { uploadFile } from '@/api/tool/file'; +import { getNeViewFile } from '@/api/tool/neFile'; import { addUDMVolteIMS, batchAddUDMVolteIMS, @@ -541,15 +542,27 @@ function fnModalUploadImportUpload(file: File) { } const hide = message.loading(t('common.loading'), 0); uploadImportState.loading = true; - uploadFileToNE('UDM', neID, file, 5) + // 上传文件 + let formData = new FormData(); + formData.append('file', file); + formData.append('subPath', 'import'); + uploadFile(formData) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { - return importUDMVolteIMS({ - neId: neID, - uploadPath: res.data, - }); + return res.data.filePath; + } else { + uploadImportState.msg = res.msg; + uploadImportState.loading = false; + return ''; } - return res; + }) + .then((filePath: string) => { + if (!filePath) return; + // 文件导入 + return importUDMVolteIMS({ + neId: neID, + uploadPath: filePath, + }); }) .then(res => { if (!res) return; @@ -569,6 +582,33 @@ function fnModalUploadImportUpload(file: File) { }); } +/**对话框表格信息导入失败原因 */ +function fnModalUploadImportFailReason() { + const neId = queryParams.neId; + if (!neId) return; + const hide = message.loading(t('common.loading'), 0); + getNeViewFile({ + neType: 'UDM', + neId: neId, + path: '/tmp', + fileName: 'import_imsuser_err_records.txt', + }) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { + message.success(t('common.operateOk'), 3); + const blob = new Blob([res.data], { + type: 'text/plain', + }); + saveAs(blob, `import_udmvolte_err_records_${Date.now()}.txt`); + } else { + message.error(`${res.msg}`, 3); + } + }) + .finally(() => { + hide(); + }); +} + /**对话框表格信息导入模板 */ function fnModalDownloadImportTemplate() { const hide = message.loading(t('common.loading'), 0); @@ -1089,13 +1129,23 @@ onMounted(() => { - + + +