diff --git a/.env.development b/.env.development index dd1252ea..2692c792 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.240627" +VITE_APP_VERSION = "2.240704" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index ab00a551..6096f580 100644 --- a/.env.production +++ b/.env.production @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS" VITE_APP_CODE = "CN EMS" # 应用版本 -VITE_APP_VERSION = "2.240627" +VITE_APP_VERSION = "2.240704" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/src/components/GlobalMask/index.vue b/src/components/GlobalMask/index.vue index 9948332d..8173500e 100644 --- a/src/components/GlobalMask/index.vue +++ b/src/components/GlobalMask/index.vue @@ -14,23 +14,26 @@ const { t } = useI18n(); /**显示遮罩 */ const isVisible = computed(() => !['none', 'lock'].includes(maskStore.type)); -// 等待指定的时间后触发事件的函数 +// 用户无操作一段时间后进行锁屏 function idleTimeout(time: number, callback: Function) { if (time === 0) return; let timeoutId: any; - - function resetTimer() { - clearTimeout(timeoutId); - timeoutId = setTimeout(callback, time); + let idleTime = 0; + function resetIdleTime() { + idleTime = 0; } - - // 监听浏览器标签是否活动 - window.addEventListener('blur', useThrottleFn(resetTimer, 300)); - window.addEventListener('focus', useThrottleFn(resetTimer, 300)); - document.addEventListener('visibilitychange', useThrottleFn(resetTimer, 300)); - - // 初始化定时器 - resetTimer(); + // 监听用户活动事件 + document.addEventListener('mousemove', useThrottleFn(resetIdleTime, 1000)); + document.addEventListener('keydown', useThrottleFn(resetIdleTime, 1000)); + document.addEventListener('click', useThrottleFn(resetIdleTime, 1000)); + // 定时检查用户是否长时间无操作 + timeoutId = setInterval(() => { + idleTime += 1000; + if (idleTime >= time) { + clearTimeout(timeoutId); + callback(); + } + }, 1000); } /**组件实例挂载之后调用 */ diff --git a/src/constants/admin-constants.ts b/src/constants/admin-constants.ts index eeca5ec2..645cd472 100644 --- a/src/constants/admin-constants.ts +++ b/src/constants/admin-constants.ts @@ -1,5 +1,5 @@ -/**管理员-系统指定角色KEY */ -export const ADMIN_ROLE_KEY = 'admin'; +/**系统管理员-系统指定角色KEY */ +export const ADMIN_ROLE_KEY = 'system'; -/**管理员-系统指定权限 */ +/**系统管理员-系统指定权限 */ export const ADMIN_PERMISSION = '*:*:*'; diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 447abf77..244081dc 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -767,11 +767,13 @@ export default { licensePath: "License File", licensePathTip: "Please upload license file", upload: 'Upload', - uploadBatch: "Upload License", + uploadFile: "Upload License", uploadChangeOk: 'Network Element renewed license successfully and is being calibrated in the background!', uploadChangeFail: "Some network elements failed to update the license, please check whether the service terminal environment is available!", }, neConfPara5G: { + headerTip: 'Check and save the public parameter properties of the network element before performing the installation of the network element, and make sure that the latest parameter properties are applied.', + headerTipToPage: 'Jump Installation', save: 'Save', reload: 'Reload', title: 'Save Info', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 45e7cd0b..d606836a 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -767,11 +767,13 @@ export default { licensePath: "许可证文件", licensePathTip: "请上传许可证文件", upload: '上传', - uploadBatch: "上传许可证", + uploadFile: "上传许可证", uploadChangeOk: '网元更新许可证成功，正在后台校验！', uploadChangeFail: "部分网元更新许可证失败，请检查服务终端环境是否可用！", }, neConfPara5G: { + headerTip: '进行网元安装前检查并保存网元公共参数属性，确认应用为最新参数属性', + headerTipToPage: '跳转安装', save: '保存', reload: '刷新', title: '保存信息', diff --git a/src/views/dashboard/overview/components/NeResources/index.vue b/src/views/dashboard/overview/components/NeResources/index.vue index 07b2f34c..05d5467e 100644 --- a/src/views/dashboard/overview/components/NeResources/index.vue +++ b/src/views/dashboard/overview/components/NeResources/index.vue @@ -277,6 +277,9 @@ function fnChangeData(data: any[], itemID: string) { if (men > 100) { men = +(men / 100).toFixed(2); } + if (men > 100) { + men = 100; + } sysMemUsage = men; } diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue index eb3b7b29..51b245ac 100644 --- a/src/views/monitor/online/index.vue +++ b/src/views/monitor/online/index.vue @@ -45,7 +45,7 @@ let tableColumns: ColumnsType = [ title: t('common.rowId'), dataIndex: 'num', width: '50px', - align: 'center', + align: 'left', customRender(opt) { const idxNum = (tablePagination.current - 1) * tablePagination.pageSize; return idxNum + opt.index + 1; @@ -54,17 +54,17 @@ let tableColumns: ColumnsType = [ { title: t('views.monitor.online.mettingId'), dataIndex: 'tokenId', - align: 'center', + align: 'left', }, { title: t('views.monitor.online.account'), dataIndex: 'userName', - align: 'center', + align: 'left', }, { title: t('views.monitor.online.host'), dataIndex: 'ipaddr', - align: 'center', + align: 'left', }, // { // title: t('views.monitor.online.loginDes'), @@ -74,17 +74,17 @@ let tableColumns: ColumnsType = [ { title: t('views.monitor.online.os'), dataIndex: 'os', - align: 'center', + align: 'left', }, { title: t('views.monitor.online.lib'), dataIndex: 'browser', - align: 'center', + align: 'left', }, { title: t('views.monitor.online.loginTime'), dataIndex: 'loginTime', - align: 'center', + align: 'left', customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); @@ -93,7 +93,7 @@ let tableColumns: ColumnsType = [ { title: t('common.operate'), key: 'tokenId', - align: 'center', + align: 'left', }, ]; diff --git a/src/views/ne/neConfPara5G/index.vue b/src/views/ne/neConfPara5G/index.vue index 8712a255..6be68cb9 100644 --- a/src/views/ne/neConfPara5G/index.vue +++ b/src/views/ne/neConfPara5G/index.vue @@ -119,8 +119,8 @@ function fnGetData() { for (const item of resArr[1].rows) { switch (item.neType) { case 'OMC': - state.from.sbi.omc_ip = item.ip; - Object.assign(state.omcInfo, item); + // state.from.sbi.omc_ip = item.ip; + Object.assign(state.omcInfo, item); // 主动改OMC_IP break; case 'IMS': state.from.sbi.ims_ip = item.ip; @@ -204,6 +204,13 @@ onMounted(() => {