diff --git a/.env.development b/.env.development index 5fe43fa5..a9f414b6 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.250124" +VITE_APP_VERSION = "2.250214" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index 5fe43fa5..a9f414b6 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.250124" +VITE_APP_VERSION = "2.250214" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/package.json b/package.json index 3ef1814a..1d6df080 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,12 @@ "@codemirror/merge": "^6.8.0", "@codemirror/theme-one-dark": "^6.1.2", "@tato30/vue-pdf": "^1.11.3", - "@vueuse/core": "^12.3.0", + "@vueuse/core": "^12.5.0", "@xterm/addon-fit": "^0.10.0", "@xterm/xterm": "^5.5.0", "ant-design-vue": "^4.2.6", "antdv-pro-layout": "^4.2.0", - "antdv-pro-modal": "^4.0.5", + "antdv-pro-modal": "^4.0.6", "codemirror": "^6.0.1", "crypto-js": "^4.2.0", "dayjs": "^1.11.11", @@ -39,7 +39,7 @@ "p-queue": "~8.0.1", "pinia": "^2.3.0", "vue": "^3.5.13", - "vue-i18n": "^11.0.1", + "vue-i18n": "^11.1.0", "vue-router": "^4.5.0", "vue3-smooth-dnd": "^0.0.6", "xlsx": "~0.18.5" @@ -54,8 +54,8 @@ "less": "^4.2.1", "typescript": "~5.6.3", "unplugin-vue-components": "^0.28.0", - "vite": "^6.0.6", + "vite": "^6.1.0", "vite-plugin-compression": "~0.5.1", - "vue-tsc": "~2.1.10" + "vue-tsc": "^2.2.0" } } diff --git a/public/nbStateImput/en.xlsx b/public/nbStateImput/en.xlsx new file mode 100644 index 00000000..21aa7d9e Binary files /dev/null and b/public/nbStateImput/en.xlsx differ diff --git a/public/nbStateImput/zh.xlsx b/public/nbStateImput/zh.xlsx new file mode 100644 index 00000000..571dc245 Binary files /dev/null and b/public/nbStateImput/zh.xlsx differ diff --git a/src/api/logManage/exportFile.ts b/src/api/logManage/exportFile.ts index 85c29ccf..1136b642 100644 --- a/src/api/logManage/exportFile.ts +++ b/src/api/logManage/exportFile.ts @@ -1,3 +1,5 @@ +import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants'; +import { sessionGet } from '@/utils/cache-session-utils'; import { request } from '@/plugins/http-fetch'; /** @@ -62,6 +64,7 @@ export function updateFTPInfo(data: Record) { url: `/lm/table/ftp`, method: 'post', data: data, + crypto: sessionGet(CACHE_SESSION_CRYPTO_API) !== 'false', }); } @@ -74,6 +77,7 @@ export function getFTPInfo() { return request({ url: `/lm/table/ftp`, method: 'get', + crypto: sessionGet(CACHE_SESSION_CRYPTO_API) !== 'false', }); } diff --git a/src/api/neData/nb-state.ts b/src/api/neData/nb-state.ts new file mode 100644 index 00000000..a5f9f91d --- /dev/null +++ b/src/api/neData/nb-state.ts @@ -0,0 +1,30 @@ +import { request } from '@/plugins/http-fetch'; + +/** + * 历史记录列表 + * @param query 查询参数 + * @returns object + */ +export function listNBState(query: Record) { + return request({ + url: '/neData/nb-state/list', + method: 'get', + params: query, + timeout: 60_000, + }); +} + +/** + * 历史记录列表导出 + * @param data 查询列表条件 + * @returns object + */ +export function exportNBState(data: Record) { + return request({ + url: '/neData/nb-state/export', + method: 'post', + data, + responseType: 'blob', + timeout: 60_000, + }); +} diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 36761c25..7d73869a 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -726,6 +726,9 @@ export default { time: "Change Time", addRadio: "Add Radio Info", editRadio: "Edit Radio Info", + history: "Status History", + exportTip: "Confirm exporting xlsx table files based on search criteria?", + importDataEmpty: "Imported data is empty", }, }, neUser: { @@ -738,6 +741,7 @@ export default { checkExport : 'Check Export', checkExportConfirm: 'Confirm exporting the checked authenticated user data?', import: 'Import', + importFail: 'Failure Record', loadDataConfirm: 'Are you sure you want to reload the data?', loadData: 'Load Data', loadDataTip: 'Successfully fetched loaded data: {num} items, the system is internally updating the data, it will take about {timer} seconds, please wait!!!!!.', @@ -766,6 +770,7 @@ export default { checkExport : 'Check Export', checkExportConfirm: 'Are you sure to export the data of the checked subscribers?', import: 'Import', + importFail: 'Failure Record', loadDataConfirm: 'Are you sure you want to reload the data?', loadData: 'Load Data', loadDataTip: 'Successfully fetched loaded data: {num} items, the system is internally updating the data, it will take about {timer} seconds, please wait!!!!!.', @@ -968,6 +973,7 @@ export default { expressionModal:'Expression Modal', expressionErrorTip:'Please check the expression, the wrong indicator is {kpiId}', expressionNoIdTip:'Please check the expression, no valid indicator is found', + unitSelect:'To better display the image, the same unit needs to be selected. The current unit is:', }, kpiKeyTarget:{ "time":"Time", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 30c00eec..5b8b0380 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -726,6 +726,9 @@ export default { time: "变更时间", addRadio: "添加基站信息", editRadio: "更新基站信息", + history: "历史记录", + exportTip: "确认根据搜索条件导出xlsx表格文件吗?", + importDataEmpty: "导入数据为空", }, }, neUser: { @@ -738,6 +741,7 @@ export default { checkExport : '勾选导出', checkExportConfirm: '确认导出已勾选的鉴权用户数据吗？', import: '导入', + importFail: '失败记录', loadDataConfirm: '确认要重新加载数据吗？', loadData: '加载数据', loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，大约需要{timer}秒，请稍候!!!', @@ -766,6 +770,7 @@ export default { checkExport : '勾选导出', checkExportConfirm: '确认导出已勾选的签约用户数据吗？', import: '导入', + importFail: '失败记录', loadDataConfirm: '确认要重新加载数据吗？', loadData: '加载数据', loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，大约需要{timer}秒，请稍候!!!', @@ -968,6 +973,7 @@ export default { expressionModal:'表达式模块', expressionErrorTip:'请检查表达式,错误的指标为{kpiId}', expressionNoIdTip:'请检查表达式,没有找到任何有效的指标', + unitSelect:'为更好展示图需选择相同单位,当前单位为:', }, kpiKeyTarget:{ "time":"时间", diff --git a/src/utils/execl-utils.ts b/src/utils/execl-utils.ts index cc1ad49d..bcc0a7ff 100644 --- a/src/utils/execl-utils.ts +++ b/src/utils/execl-utils.ts @@ -42,7 +42,7 @@ export async function readLoalXlsx( /** * 读取表格数据 工作表 * @param fileBolb 文件对象 - * @param index 文件保存路径 + * @param index SheetName索引 * @return 表格对象列表 */ export async function readSheet( diff --git a/src/views/logManage/exportFile/index.vue b/src/views/logManage/exportFile/index.vue index 60d35470..b43cafee 100644 --- a/src/views/logManage/exportFile/index.vue +++ b/src/views/logManage/exportFile/index.vue @@ -290,13 +290,13 @@ type ModalStateType = { /**FTP日志对象信息状态 */ let modalState: ModalStateType = reactive({ openByEdit: false, - title: 'FTP上报服务设置', + title: '设置远程备份配置', from: { - useranme: '', + username: '', password: '', toIp: '', toPort: 22, - protocol: 'ftp', + enable: false, dir: '', }, confirmLoading: false, @@ -343,12 +343,12 @@ function fnModalVisibleByEdit() { hide(); if (res.code === RESULT_CODE_SUCCESS && res.data) { modalState.from = Object.assign(modalState.from, res.data); - modalState.title = 'FTP Info'; + modalState.title = 'Setting Remote Backup'; modalState.openByEdit = true; } else { message.error(res.msg, 3); - modalState.title = 'FTP Info'; - modalState.openByEdit = true; + modalState.title = 'Setting Remote Backup'; + modalState.openByEdit = false; } }); } @@ -361,9 +361,10 @@ function fnModalOk() { updateFTPInfo(from) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { - message.success(`FTP configuration saved successfully`, 3); + message.success(`Configuration saved successfully`, 3); + fnModalCancel(); } else { - message.warning(`FTP configuration save exception`, 3); + message.warning(`Configuration save exception`, 3); } }) .finally(() => { @@ -389,7 +390,7 @@ function fnSyncFileToFTP(row: Record) { putFTPInfo(row.filePath, row.fileName) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { - message.success(`OK`, 3); + message.success(t('common.operateOk'), 3); } else { message.warning(res.msg, 3); } @@ -435,7 +436,7 @@ function fnSyncFileToFTP(row: Record) {