From a2d93ddafe78ae99d8b4ee5e001f09afc474cdfe Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 16 Jul 2024 11:21:16 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=A8=AA=E5=90=91=E6=BB=9A=E5=8A=A8=E8=A1=94=E6=8E=A5=E5=8A=A8?= =?UTF-8?q?=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/BasicLayout.vue | 27 ++++++++++------ .../quick-start/components/SystemConfig.vue | 24 +++++++++----- .../system/setting/components/change-logo.vue | 32 ++++++++++++------- 3 files changed, 54 insertions(+), 29 deletions(-) diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index f8c8f72a..a3aaade7 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -176,6 +176,7 @@ function fnCheckAppNameOverflow() { if (!text) return; if (text.offsetWidth > container.offsetWidth) { text.classList.add('app-name_scrollable'); + text.setAttribute('data-content', text.innerText); } else { text.classList.remove('app-name_scrollable'); } @@ -382,20 +383,26 @@ onUnmounted(() => { // text-overflow: ellipsis; white-space: nowrap; width: 148px; - - &_scrollable { - // padding-left: 100%; + > .app-name_scrollable { + padding-right: 12px; display: inline-block; animation: scrollable-animation linear 6s infinite both; - } - - @keyframes scrollable-animation { - 0% { - transform: translate3d(0, 0, 0); + &::after { + content: attr(data-content); + position: absolute; + top: 0; + right: -100%; + transition: right 0.3s ease; } - 100% { - transform: translate3d(-100%, 0, 0); + @keyframes scrollable-animation { + 0% { + transform: translateX(0); + } + + 100% { + transform: translateX(calc(-100% - 12px)); + } } } } diff --git a/src/views/system/quick-start/components/SystemConfig.vue b/src/views/system/quick-start/components/SystemConfig.vue index 627e04c9..5e06321f 100644 --- a/src/views/system/quick-start/components/SystemConfig.vue +++ b/src/views/system/quick-start/components/SystemConfig.vue @@ -206,6 +206,7 @@ function fnCheckAppNameOverflow() { if (!text) return; if (text.offsetWidth > container.offsetWidth) { text.classList.add('app-name_scrollable'); + text.setAttribute('data-content', text.innerText); } else { text.classList.remove('app-name_scrollable'); } @@ -398,18 +399,25 @@ onMounted(() => { font-size: 18px; > .app-name_scrollable { - // padding-left: 100%; + padding-right: 12px; display: inline-block; animation: scrollable-animation linear 6s infinite both; - } - - @keyframes scrollable-animation { - 0% { - transform: translate3d(0, 0, 0); + &::after { + content: attr(data-content); + position: absolute; + top: 0; + right: -100%; + transition: right 0.3s ease; } - 100% { - transform: translate3d(-100%, 0, 0); + @keyframes scrollable-animation { + 0% { + transform: translateX(0); + } + + 100% { + transform: translateX(calc(-100% - 12px)); + } } } } diff --git a/src/views/system/setting/components/change-logo.vue b/src/views/system/setting/components/change-logo.vue index 4257b9b2..ca9955a7 100644 --- a/src/views/system/setting/components/change-logo.vue +++ b/src/views/system/setting/components/change-logo.vue @@ -184,12 +184,15 @@ watch( /**检查系统名称是否超出范围进行滚动 */ function fnCheckAppNameOverflow() { - const container: HTMLDivElement | null = document.querySelector('.header-icon > .app-name'); + const container: HTMLDivElement | null = document.querySelector( + '.header-icon > .app-name' + ); if (!container) return; const text: HTMLDivElement | null = container.querySelector('.marquee'); if (!text) return; if (text.offsetWidth > container.offsetWidth) { text.classList.add('app-name_scrollable'); + text.setAttribute('data-content', text.innerText); } else { text.classList.remove('app-name_scrollable'); } @@ -201,7 +204,7 @@ watch( ); onMounted(() => { - fnCheckAppNameOverflow() + fnCheckAppNameOverflow(); Object.assign(state, { language: currentLocale.value, filePath: '', @@ -360,20 +363,27 @@ onMounted(() => { margin: 0 0 0 12px; font-weight: 600; font-size: 18px; - + > .app-name_scrollable { - // padding-left: 100%; + padding-right: 12px; display: inline-block; animation: scrollable-animation linear 6s infinite both; - } - - @keyframes scrollable-animation { - 0% { - transform: translate3d(0, 0, 0); + &::after { + content: attr(data-content); + position: absolute; + top: 0; + right: -100%; + transition: right 0.3s ease; } - 100% { - transform: translate3d(-100%, 0, 0); + @keyframes scrollable-animation { + 0% { + transform: translateX(0); + } + + 100% { + transform: translateX(calc(-100% - 12px)); + } } } } From fcf53d09951426353d56d3fc436d5b382f2e3d3a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 17 Jul 2024 18:06:59 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=87=AA=E5=8A=A8=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue index 9d3cd6f3..33b1c148 100644 --- a/src/views/ne/neInfo/index.vue +++ b/src/views/ne/neInfo/index.vue @@ -283,10 +283,10 @@ function fnRecordDelete(id: string) { message.success(t('common.operateOk'), 3); // 过滤掉删除的id tableState.data = tableState.data.filter(item => { - if (id.indexOf(',')) { + if (id.indexOf(',') > -1) { return !tableState.selectedRowKeys.includes(item.id); } else { - return item.id != id; + return item.id !== id; } }); // 刷新缓存 From 2d9011cf6b82ac5d6422e3f395d70460dc672afa Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 17 Jul 2024 18:11:22 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BF=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=9B=BE=E6=97=A0=E7=BD=91=E5=85=83=E7=8A=B6=E4=BD=93=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=96=E5=80=BC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/overview/components/NeResources/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dashboard/overview/components/NeResources/index.vue b/src/views/dashboard/overview/components/NeResources/index.vue index 05d5467e..b17ec354 100644 --- a/src/views/dashboard/overview/components/NeResources/index.vue +++ b/src/views/dashboard/overview/components/NeResources/index.vue @@ -237,7 +237,7 @@ function handleRanderChart( function fnChangeData(data: any[], itemID: string) { let info = data.find((item: any) => item.id === itemID); - if (!info.neState.online) return; + if (!info || !info.neState.online) return; // if (!info.neState.online) { // info = data.find((item: any) => item.id === itemID); // graphNodeClickID.value = itemID; From d53c4c34f0b9c8c1c3564ca7a7f862932f0ce8cd Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 18 Jul 2024 15:44:35 +0800 Subject: [PATCH 4/9] =?UTF-8?q?style:=20=E6=96=B0=E5=A2=9E=E7=BD=91?= =?UTF-8?q?=E5=85=83=E4=BF=A1=E6=81=AF=E6=97=B6ssh=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=88=9D=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/components/EditModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ne/neInfo/components/EditModal.vue b/src/views/ne/neInfo/components/EditModal.vue index 085a580a..2cd20e81 100644 --- a/src/views/ne/neInfo/components/EditModal.vue +++ b/src/views/ne/neInfo/components/EditModal.vue @@ -124,8 +124,8 @@ let modalState: ModalStateType = reactive({ addr: '', port: 22, user: 'omcuser', - authMode: '2', - password: '', + authMode: '0', + password: 'a9tU53r', privateKey: '', passPhrase: '', remark: '', From acd19ebdbdbd5da22168d84e3088af76e3c50462 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 19 Jul 2024 14:41:40 +0800 Subject: [PATCH 5/9] =?UTF-8?q?style:=20=E7=9C=8B=E6=9D=BF=E5=9F=BA?= =?UTF-8?q?=E7=AB=99=E6=95=B0=E9=87=8F=E5=88=86=E5=BC=80=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=88=86=E4=B8=8D=E6=B8=85=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/overview/css/index.css | 6 +++--- src/views/dashboard/overview/index.vue | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/views/dashboard/overview/css/index.css b/src/views/dashboard/overview/css/index.css index 56a135e4..9b053c7c 100644 --- a/src/views/dashboard/overview/css/index.css +++ b/src/views/dashboard/overview/css/index.css @@ -159,14 +159,14 @@ /* 概览区域 衍生基站信息 */ .skim.base { - height: 20.6%; + height: 12%; } .skim.base .inner .data { display: flex; flex-direction: row; align-items: center; - height: 45%; + height: 75%; } .skim.base .inner .data .item { display: flex; @@ -178,7 +178,7 @@ /* 用户行为 */ .userActivity { /* min-height: 35.8rem; */ - height: 60%; + height: 54.6%; } .userActivity .inner .chart { width: 100%; diff --git a/src/views/dashboard/overview/index.vue b/src/views/dashboard/overview/index.vue index bc9aa8a0..27716a99 100644 --- a/src/views/dashboard/overview/index.vue +++ b/src/views/dashboard/overview/index.vue @@ -270,7 +270,7 @@ onBeforeUnmount(() => {

-    +    5G {{ t('views.dashboard.overview.skim.baseTitle') }}

@@ -302,6 +302,14 @@ onBeforeUnmount(() => { {{ t('views.dashboard.overview.skim.gnbUeNum') }}
+
+ +
+
+

+    4G + {{ t('views.dashboard.overview.skim.baseTitle') }} +

Date: Tue, 23 Jul 2024 14:25:08 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E6=97=A5=E5=BF=97=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E9=BB=98=E8=AE=A4=E7=A9=BA?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=85=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/amfUE/index.vue | 8 ++++---- src/views/dashboard/mmeUE/index.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/dashboard/amfUE/index.vue b/src/views/dashboard/amfUE/index.vue index cefe710e..3ea8ddd3 100644 --- a/src/views/dashboard/amfUE/index.vue +++ b/src/views/dashboard/amfUE/index.vue @@ -42,7 +42,7 @@ let queryParams = reactive({ /**网元类型 */ neType: 'AMF', neId: '001', - eventType: 'auth-result', + eventType: '', imsi: '', sortField: 'timestamp', sortOrder: 'desc', @@ -58,9 +58,9 @@ let queryParams = reactive({ /**查询参数重置 */ function fnQueryReset() { - eventTypes.value = ['auth-result']; + eventTypes.value = []; queryParams = Object.assign(queryParams, { - eventType: 'auth-result', + eventType: '', imsi: '', startTime: '', endTime: '', @@ -74,7 +74,7 @@ function fnQueryReset() { } /**记录类型 */ -const eventTypes = ref(['auth-result']); +const eventTypes = ref([]); /**查询记录类型变更 */ function fnQueryEventTypeChange(value: any) { diff --git a/src/views/dashboard/mmeUE/index.vue b/src/views/dashboard/mmeUE/index.vue index 74a6523d..0c605066 100644 --- a/src/views/dashboard/mmeUE/index.vue +++ b/src/views/dashboard/mmeUE/index.vue @@ -43,7 +43,7 @@ let queryParams = reactive({ /**网元类型 */ neType: 'MME', neId: '001', - eventType: 'auth-result', + eventType: '', imsi: '', sortField: 'timestamp', sortOrder: 'desc', @@ -59,9 +59,9 @@ let queryParams = reactive({ /**查询参数重置 */ function fnQueryReset() { - eventTypes.value = ['auth-result']; + eventTypes.value = []; queryParams = Object.assign(queryParams, { - eventType: 'auth-result', + eventType: '', imsi: '', startTime: '', endTime: '', @@ -75,7 +75,7 @@ function fnQueryReset() { } /**记录类型 */ -const eventTypes = ref(['auth-result']); +const eventTypes = ref([]); /**查询记录类型变更 */ function fnQueryEventTypeChange(value: any) { From fac47279b586cf15f8eb9e8c2467050b83ec0795 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 23 Jul 2024 14:26:09 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E6=97=A5=E5=BF=97IMS-CDR=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E9=BB=98=E8=AE=A4=E7=A9=BA=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=85=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/imsCDR/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/dashboard/imsCDR/index.vue b/src/views/dashboard/imsCDR/index.vue index ba134389..b4bbdef0 100644 --- a/src/views/dashboard/imsCDR/index.vue +++ b/src/views/dashboard/imsCDR/index.vue @@ -44,7 +44,7 @@ let queryParams = reactive({ /**网元类型 */ neType: 'IMS', neId: '001', - recordType: 'MOC', + recordType: '', callerParty: '', calledParty: '', sortField: 'timestamp', @@ -61,9 +61,9 @@ let queryParams = reactive({ /**查询参数重置 */ function fnQueryReset() { - recordTypes.value = ['MOC']; + recordTypes.value = []; queryParams = Object.assign(queryParams, { - recordType: 'MOC', + recordType: '', callerParty: '', calledParty: '', startTime: '', @@ -78,7 +78,7 @@ function fnQueryReset() { } /**记录类型 */ -const recordTypes = ref(['MOC']); +const recordTypes = ref([]); /**查询记录类型变更 */ function fnQueryRecordTypeChange(value: any) { @@ -639,7 +639,7 @@ onBeforeUnmount(() => { :data-source="tableState.data" :size="tableState.size" :pagination="tablePagination" - :scroll="{ x: tableColumns.length * 120, y: 'calc(100vh - 480px)' }" + :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }" :row-selection="{ type: 'checkbox', columnWidth: '48px', From 06db1344c35d5f4b0364e4c8a9bed10a426cf500 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 23 Jul 2024 14:48:53 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E6=97=A5=E5=BF=97=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?cm=E7=BB=93=E6=9E=9C=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=98=BE?= =?UTF-8?q?=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/dashboard/amfUE/index.vue | 7 ++----- src/views/dashboard/mmeUE/index.vue | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/views/dashboard/amfUE/index.vue b/src/views/dashboard/amfUE/index.vue index 3ea8ddd3..e9186bc9 100644 --- a/src/views/dashboard/amfUE/index.vue +++ b/src/views/dashboard/amfUE/index.vue @@ -607,10 +607,7 @@ onBeforeUnmount(() => { :value="record.eventJSON.authCode" /> - + {{ t('views.dashboard.ue.resultOk') }} @@ -706,7 +703,7 @@ onBeforeUnmount(() => { /> - {{ t('views.dashboard.ue.resultOK') }} + {{ t('views.dashboard.ue.resultOk') }} { /> - {{ t('views.dashboard.ue.resultOK') }} + {{ t('views.dashboard.ue.resultOk') }} Date: Wed, 24 Jul 2024 17:18:15 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=AF=B9=E4=BD=BF=E7=94=A8=E6=89=8B?= =?UTF-8?q?=E5=86=8C,=E5=AE=98=E7=BD=91=E8=BF=9B=E8=A1=8C=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/BasicLayout.vue | 8 +++++++- src/layouts/components/RightContent.vue | 7 ++++++- src/views/login.vue | 17 ---------------- .../setting/components/change-help-doc.vue | 2 ++ .../system/setting/components/change-logo.vue | 8 ++++++-- src/views/system/setting/index.vue | 20 +++++++++++-------- 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index a3aaade7..089acd16 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -343,11 +343,17 @@ onUnmounted(() => { :href="appStore.officialUrl" target="_blank" size="small" + v-perms:has="['system:setting:link']" v-if="appStore.officialUrl !== '#'" > {{ t('loayouts.basic.officialUrl') }} - + {{ t('loayouts.basic.helpDoc') }} diff --git a/src/layouts/components/RightContent.vue b/src/layouts/components/RightContent.vue index f78d7eaa..9c59821f 100644 --- a/src/layouts/components/RightContent.vue +++ b/src/layouts/components/RightContent.vue @@ -126,7 +126,12 @@ function fnChangeLocale(e: any) { - + diff --git a/src/views/login.vue b/src/views/login.vue index 3d80bdea..9c086ef9 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -166,23 +166,6 @@ function fnClickHelpDoc(language?: string) {
-
- - - {{ t('loayouts.basic.officialUrl') }} - - - - {{ t('loayouts.basic.helpDoc') }} - - -
- + { margin: 0 0 0 12px; font-weight: 600; font-size: 18px; - + > .app-name_scrollable { padding-right: 12px; display: inline-block; diff --git a/src/views/system/setting/index.vue b/src/views/system/setting/index.vue index 60b2ee1e..973867dd 100644 --- a/src/views/system/setting/index.vue +++ b/src/views/system/setting/index.vue @@ -31,14 +31,18 @@ const { t } = useI18n(); {{ t('views.system.setting.sysLoginBg') }} - - {{ t('views.system.setting.sysHelpDoc') }} - - - - {{ t('views.system.setting.sysOfficialUrl') }} - - +
+ + {{ t('views.system.setting.sysHelpDoc') }} + + +
+
+ + {{ t('views.system.setting.sysOfficialUrl') }} + + +
{{ t('views.system.setting.i18n') }}