diff --git a/.env.development b/.env.development index c8e86be9..4ae1f773 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS" VITE_APP_CODE = "CN EMS" # 应用版本 -VITE_APP_VERSION = "2.231124.8" +VITE_APP_VERSION = "2.231128.8" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/public/default/config.js b/public/default/config.js index 25d86329..98d65367 100644 --- a/public/default/config.js +++ b/public/default/config.js @@ -2,15 +2,16 @@ * =============== Zh =============== * - Nginx部署 * 删除loading.js同级下同名文件,Nginx代理地址: /omc-api - * - * Nginx Deployment - * Delete the file with the same name under the same level of loading.js, Nginx proxy address: /omc-api - * + * * - 非Nginx部署 * 请将当前文件与loading.js同级,将host变量值修改为数据服务访问地址 * !!!注意: 修改当前文件后,建议关闭浏览器后重新访问 + * + * =============== En =============== + * - Nginx Deployment + * Delete the file with the same name under the same level of loading.js, Nginx proxy address: /omc-api * - * Non-Nginx Deployment + * - Non-Nginx Deployment * Please make the current file the same level as the loading.js, change the host variable value to the data service access address * !!! Note: After modifying the current file, it is recommended to revisit it after closing the browser. * diff --git a/src/api/index.ts b/src/api/index.ts index 3d622b2b..c2f450af 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -84,7 +84,7 @@ export function getSysConf() { */ export function transferHelpDoc(data: Record) { return request({ - url: `/help-doc`, + url: `/helpDoc`, method: 'post', data, }); diff --git a/src/api/mmlManage/neOperate.ts b/src/api/mmlManage/neOperate.ts index 2b227719..0be5b6e9 100644 --- a/src/api/mmlManage/neOperate.ts +++ b/src/api/mmlManage/neOperate.ts @@ -36,18 +36,30 @@ export async function getMMLByNE(neType: string) { export async function sendMMlByNE( neType: string, neId: string, - cmdStr: string + cmdArr: string[] ) { // 发起请求 const result = await request({ url: `/api/rest/operationManagement/v1/elementType/${neType}/objectType/mml?ne_id=${neId}`, method: 'post', - data: { mml: [cmdStr] }, + data: { mml: cmdArr }, timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - result.data = result.data.data[0]; + result.data = result.data.data; } return result; } + +/** + * 发送文件到网元端 + * @returns object + */ +export function transferToNeFile(data: Record) { + return request({ + url: `/ne/action/pushFile`, + method: 'post', + data, + }); +} diff --git a/src/api/mmlManage/omcOperate.ts b/src/api/mmlManage/omcOperate.ts index f7d27a04..e129391e 100644 --- a/src/api/mmlManage/omcOperate.ts +++ b/src/api/mmlManage/omcOperate.ts @@ -31,17 +31,17 @@ export async function getMMLByOMC() { * @param cmdStr 命令串 * @returns */ -export async function sendMMlByOMC(neId: string, cmdStr: string) { +export async function sendMMlByOMC(neId: string, cmdArr: string[]) { // 发起请求 const result = await request({ url: `/api/rest/operationManagement/v1/elementType/OMC/objectType/mml?ne_id=${neId}`, method: 'post', - data: { mml: [cmdStr] }, + data: { mml: cmdArr }, timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - result.data = result.data.data[0]; + result.data = result.data.data; } return result; } diff --git a/src/api/mmlManage/udmOperate.ts b/src/api/mmlManage/udmOperate.ts index a6a7d9fe..56b8ab6b 100644 --- a/src/api/mmlManage/udmOperate.ts +++ b/src/api/mmlManage/udmOperate.ts @@ -31,17 +31,17 @@ export async function getMMLByUDM() { * @param cmdStr 命令串 * @returns */ -export async function sendMMlByUDM(neId: string, cmdStr: string) { +export async function sendMMlByUDM(neId: string, cmdArr: string[]) { // 发起请求 const result = await request({ url: `/api/rest/operationManagement/v1/elementType/UDM/objectType/mml?ne_id=${neId}`, method: 'post', - data: { mml: [cmdStr] }, + data: { mml: cmdArr }, timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - result.data = result.data.data[0]; + result.data = result.data.data; } return result; } diff --git a/src/api/neUser/auth.ts b/src/api/neUser/auth.ts index aad5efd9..e3b3d49f 100644 --- a/src/api/neUser/auth.ts +++ b/src/api/neUser/auth.ts @@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch'; */ export function exportAuth(query: Record) { return request({ - url: '/ne/udm/sub/export', + url: '/ne/udm/auth/export', method: 'post', data: query, responseType: 'blob', @@ -22,7 +22,7 @@ export function exportAuth(query: Record) { */ export function importAuthData(data: FormData) { return request({ - url: `/ne/udm/sub/import`, + url: `/ne/udm/auth/import`, method: 'post', data, dataType: 'form-data', diff --git a/src/api/neUser/base5G.ts b/src/api/neUser/base5G.ts index 95317280..d8f4150e 100644 --- a/src/api/neUser/base5G.ts +++ b/src/api/neUser/base5G.ts @@ -26,5 +26,8 @@ export async function listBase5G(query: Record) { data.total = rows.length; data.rows = rows; } + // 模拟数据 + // data.rows =[{"address":"192.168.1.137:38412","id":"217","name":"","ueNum":0}] + return data; } diff --git a/src/api/perfManage/perfData.ts b/src/api/perfManage/perfData.ts index 1544404f..92e84f58 100644 --- a/src/api/perfManage/perfData.ts +++ b/src/api/perfManage/perfData.ts @@ -16,15 +16,24 @@ export async function listperfData(query: Record) { if (query.neType) { querySQL += ` and ne_type like '%${query.neType}%' `; } + if (query.taskId) { + querySQL += ` and task_id like '%${query.taskId}%' `; + } if (query.beginTime) { querySQL += ` and start_time >= '${query.beginTime}' `; } if (query.endTime) { - querySQL += ` and start_time <= '${query.endTime}' `; + querySQL += ` and end_time <= '${query.endTime}' `; } // 排序 - let sortSql = ' order by start_time '; + let sortSql = ' order by '; + if (query.sortField) { + sortSql += ` ${query.sortField} `; + }else{ + sortSql += ` start_time `; + } + if (query.sortOrder === 'asc') { sortSql += ' asc '; } else { diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 23fabe51..8f1a9f41 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -1300,6 +1300,8 @@ export default { clearLog: "Clear Logs", exec: "Execute", cmdAwait: "Waiting for a command to be sent", + uploadFileTip: 'Are you sure you want to upload the file?', + uploadFileOk: 'File Upload Successful', omcOperate:{ noOMC: "No OMC network elements", }, diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index a804c18b..02ef0078 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -1304,6 +1304,8 @@ export default { clearLog: "清除日志", exec: "执行", cmdAwait: "等待发送命令", + uploadFileTip: '确认要上传文件吗?', + uploadFileOk: '文件上传成功', omcOperate:{ noOMC: "暂无OMC网元", }, diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 30e281ee..6eb53133 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -120,6 +120,16 @@ function fnComponentSetName(component: any, to: any) { // 清空导航栏标签 tabsStore.clear(); +/**系统使用手册跳转 */ +function fnClickHelpDoc(language?: string) { + const routeData = router.resolve({ name: 'HelpDoc' }); + let href = routeData.href; + if (language) { + href = `${routeData.href}?language=${language}`; + } + window.open(href, '_blank'); +} + /** * 国际化翻译转换 */ @@ -285,9 +295,8 @@ document.addEventListener('visibilitychange', function () { {{ t('loayouts.basic.helpDoc') }} diff --git a/src/layouts/components/RightContent.vue b/src/layouts/components/RightContent.vue index 5a4b3c95..f608b151 100644 --- a/src/layouts/components/RightContent.vue +++ b/src/layouts/components/RightContent.vue @@ -32,6 +32,16 @@ function fnClickAlarm() { router.push({ path: '/faultManage/active-alarm' }); } +/**系统使用手册跳转 */ +function fnClickHelpDoc(language?: string) { + const routeData = router.resolve({ name: 'HelpDoc' }); + let href = routeData.href; + if (language) { + href = `${routeData.href}?language=${language}`; + } + window.open(href, '_blank'); +} + /**改变多语言 */ function fnChangeLocale(e: any) { changeLocale(e.key); @@ -54,7 +64,7 @@ function fnChangeLocale(e: any) { - + diff --git a/src/views/configManage/configParamTreeTable/index.vue b/src/views/configManage/configParamTreeTable/index.vue index f9528882..0dd3b558 100644 --- a/src/views/configManage/configParamTreeTable/index.vue +++ b/src/views/configManage/configParamTreeTable/index.vue @@ -1330,11 +1330,7 @@ onMounted(() => {