From 95931b2b6e02d16a508d289165abb480c9fea65c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 20:45:26 +0800 Subject: [PATCH 01/12] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E6=97=A0?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=80=E6=AE=B5=E6=97=B6=E9=97=B4=E5=90=8E?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=94=81=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GlobalMask/index.vue | 31 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/components/GlobalMask/index.vue b/src/components/GlobalMask/index.vue index 9948332d..f250061d 100644 --- a/src/components/GlobalMask/index.vue +++ b/src/components/GlobalMask/index.vue @@ -14,23 +14,28 @@ 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; + console.log('idleTime', idleTime, idleTime >= time); + if (idleTime >= time) { + clearTimeout(timeoutId); + // 达到设定的无操作时间，执行锁屏操作 + callback(); + } + }, 1000); } /**组件实例挂载之后调用 */ From 946139facb3d5e09ad9f07b9b1494c973cdab29f Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 20:46:58 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E6=97=A0?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=80=E6=AE=B5=E6=97=B6=E9=97=B4=E5=90=8E?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=94=81=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GlobalMask/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/GlobalMask/index.vue b/src/components/GlobalMask/index.vue index f250061d..8173500e 100644 --- a/src/components/GlobalMask/index.vue +++ b/src/components/GlobalMask/index.vue @@ -29,10 +29,8 @@ function idleTimeout(time: number, callback: Function) { // 定时检查用户是否长时间无操作 timeoutId = setInterval(() => { idleTime += 1000; - console.log('idleTime', idleTime, idleTime >= time); if (idleTime >= time) { clearTimeout(timeoutId); - // 达到设定的无操作时间，执行锁屏操作 callback(); } }, 1000); From c5f62e8d7640a284f4c3d3da7f027105add627d1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 28 Jun 2024 11:11:41 +0800 Subject: [PATCH 03/12] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9EOMC=E9=85=8D=E7=BD=AE=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=B2=A1=E6=9C=89telnet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/components/EditModal.vue | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/views/ne/neInfo/components/EditModal.vue b/src/views/ne/neInfo/components/EditModal.vue index 28ff15e6..085a580a 100644 --- a/src/views/ne/neInfo/components/EditModal.vue +++ b/src/views/ne/neInfo/components/EditModal.vue @@ -223,12 +223,6 @@ function fnModalVisibleByEdit(editId: string) { modalState.confirmLoading = false; hide(); if (res.code === RESULT_CODE_SUCCESS) { - // OMC没有telnet - if (res.data.neType === 'OMC') { - res.data.hosts = res.data.hosts.filter( - (s: any) => s.hostType === 'ssh' - ); - } Object.assign(modalState.from, res.data); modalState.title = t('views.ne.neInfo.editTitle'); modalState.visibleByEdit = true; @@ -292,10 +286,6 @@ function fnModalCancel() { */ function fnNeTypeChange(v: any) { const hostsLen = modalState.from.hosts.length; - // OMC没有telnet - if (hostsLen >= 2 && v === 'OMC') { - modalState.from.hosts.splice(1, hostsLen); - } // 网元默认只含22和4100 if (hostsLen === 3 && v !== 'UPF') { modalState.from.hosts.pop(); @@ -626,7 +616,9 @@ onMounted(() => { From 953a36f142fd704dc8627058fb216ae092387c43 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 28 Jun 2024 12:01:07 +0800 Subject: [PATCH 04/12] =?UTF-8?q?style:=20=E7=BD=91=E5=85=83=E8=BD=AF?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AE=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 2 +- src/i18n/locales/zh-CN.ts | 2 +- src/views/ne/neSoftware/index.vue | 9 +++++++-- src/views/ne/neVersion/index.vue | 9 +++++++-- .../quick-start/components/NeInfoSoftwareInstall.vue | 2 +- .../quick-start/components/NeInfoSoftwareLicense.vue | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index a3a346c4..ee36d593 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -766,7 +766,7 @@ 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!", }, diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 05280857..424f4104 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -766,7 +766,7 @@ export default { licensePath: "许可证文件", licensePathTip: "请上传许可证文件", upload: '上传', - uploadBatch: "上传许可证", + uploadFile: "上传许可证", uploadChangeOk: '网元更新许可证成功，正在后台校验！', uploadChangeFail: "部分网元更新许可证失败，请检查服务终端环境是否可用！", }, diff --git a/src/views/ne/neSoftware/index.vue b/src/views/ne/neSoftware/index.vue index bcdeab03..361e955a 100644 --- a/src/views/ne/neSoftware/index.vue +++ b/src/views/ne/neSoftware/index.vue @@ -434,8 +434,13 @@ onMounted(() => { " > - {{ t('views.ne.neSoftware.uploadBatch') }} - {{ tableState.selectedRowOne.neType }} + + { " > - {{ t('views.ne.neSoftware.uploadBatch') }} - {{ tableState.selectedRowOne.neType }} + + { " > - {{ t('views.ne.neSoftware.uploadBatch') }} + {{ t('views.ne.neSoftware.upload') }} {{ state.selectedRowOne.neType }} diff --git a/src/views/system/quick-start/components/NeInfoSoftwareLicense.vue b/src/views/system/quick-start/components/NeInfoSoftwareLicense.vue index 06173771..ddd627a0 100644 --- a/src/views/system/quick-start/components/NeInfoSoftwareLicense.vue +++ b/src/views/system/quick-start/components/NeInfoSoftwareLicense.vue @@ -296,7 +296,7 @@ onMounted(() => { @click.prevent="fnModalOpen" > - {{ t('views.ne.neLicense.uploadBatch') }} + {{ t('views.ne.neLicense.uploadFile') }} Date: Fri, 28 Jun 2024 14:55:40 +0800 Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=B7=E6=96=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E7=BC=96=E8=BE=91=E6=97=B6=E5=B1=80=E9=83=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue index 517c5b9f..d1a5761c 100644 --- a/src/views/ne/neInfo/index.vue +++ b/src/views/ne/neInfo/index.vue @@ -220,6 +220,12 @@ function fnModalVisibleByEdit(row?: Record) { * 进行表达规则校验 */ function fnModalEditOk(from: Record) { + // 新增时刷新列表 + if (!from.id) { + fnGetList(); + return; + } + // 编辑时局部更新信息 stateNeInfo(from.neType, from.neId) .then(res => { // 找到编辑更新的网元 From 1fa8601675c7935e982d8cbd1262d40ca2700387 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 1 Jul 2024 16:02:12 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20UDM=20Object=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/neUser/sub/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue index 358aa2aa..0de9eaaa 100644 --- a/src/views/neUser/sub/index.vue +++ b/src/views/neUser/sub/index.vue @@ -1252,7 +1252,7 @@ onMounted(() => { From 481734cfe1e555002f3f687054dc5db38be642e3 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 3 Jul 2024 14:49:11 +0800 Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BFMME=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/overview/components/NeResources/index.vue | 3 +++ 1 file changed, 3 insertions(+) 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; } From d3332216205cdffc9bf6b710473c500b7a8a7776 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 3 Jul 2024 14:50:25 +0800 Subject: [PATCH 08/12] =?UTF-8?q?style:=20=E5=9C=A8=E7=BA=BF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=96=87=E5=AD=97=E9=9D=A0=E5=B7=A6?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/monitor/online/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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', }, ]; From 43a99e93288d67e40db949560fa49835a53c5c4a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 3 Jul 2024 15:13:41 +0800 Subject: [PATCH 09/12] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E8=A7=92=E8=89=B2=E7=94=A8system=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E9=81=BF=E5=85=8Dadmin=E6=B7=B7=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/admin-constants.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = '*:*:*'; From d49dc9ebfd17d224a44993d1a5a4c0ede49178be Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 4 Jul 2024 10:24:01 +0800 Subject: [PATCH 10/12] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7240704?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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" From d095531952370300dce1e7e4c37ab64e82cd2b86 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 4 Jul 2024 17:02:33 +0800 Subject: [PATCH 11/12] =?UTF-8?q?style:=20=E7=B3=BB=E7=BB=9F=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=88=86=E9=85=8D=E6=A0=87=E9=A2=98=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/role/auth-user.vue | 2 +- src/views/system/role/components/auth-user-select.vue | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/system/role/auth-user.vue b/src/views/system/role/auth-user.vue index 5487ac16..9ece98a9 100644 --- a/src/views/system/role/auth-user.vue +++ b/src/views/system/role/auth-user.vue @@ -184,7 +184,7 @@ type ModalStateType = { /**对话框对象信息状态 */ let modalState: ModalStateType = reactive({ visibleBySelectUser: false, - title: '选择用户', + title: t('views.system.role.distributeUser'), }); /** diff --git a/src/views/system/role/components/auth-user-select.vue b/src/views/system/role/components/auth-user-select.vue index ae09d448..650181a9 100644 --- a/src/views/system/role/components/auth-user-select.vue +++ b/src/views/system/role/components/auth-user-select.vue @@ -237,7 +237,6 @@ watch(