From 05fd678ce29b9ab069248d4a504c6467b5d6bbc2 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 8 May 2024 11:35:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20SMF=E5=9C=A8=E7=BA=BF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE=E5=8F=98=E6=9B=B4?= =?UTF-8?q?/RAT=20Type=E6=96=87=E5=AD=97=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/neUser/smf.ts | 41 +++++++++++++++++++---------------- src/views/neUser/ue/index.vue | 4 ++-- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/api/neUser/smf.ts b/src/api/neUser/smf.ts index 2bcfbd54..a1221024 100644 --- a/src/api/neUser/smf.ts +++ b/src/api/neUser/smf.ts @@ -28,35 +28,38 @@ export async function listUEInfoBySMF(query: Record) { } // 模拟数据 + // data.code = RESULT_CODE_SUCCESS; // data.rows = [ // { - // imsi: 'imsi-460029004200044', - // msisdn: 'msisdn-12346002044', + // imsi: 'imsi-460002082101038', + // msisdn: 'msisdn-12307550000', // pduSessionInfo: [ // { - // activeTime: '2023-11-29 18:39:06', + // activeTime: '2024-05-08 11:08:22', // dnn: 'ims', - // ipv4: '10.10.48.97', - // ipv6: '', - // pduSessionID: 6, - // ranN3IP: '192.168.8.223', - // sstSD: '1-000001', - // tai: '46000-0001', - // upfN3IP: '192.168.1.161', - // }, - // { - // activeTime: '2023-11-29 18:39:05', - // dnn: 'cmnet', - // ipv4: '10.10.48.62', + // ipv4: '10.10.86.2', // ipv6: '', // pduSessionID: 5, - // ranN3IP: '192.168.8.223', + // ranN3IP: '192.168.5.100', // sstSD: '1-000001', - // tai: '46000-0001', - // upfN3IP: '192.168.1.163', + // tai: '46000-001124', + // upState: 'Active', + // upfN3IP: '192.168.14.201', + // }, + // { + // activeTime: '2024-05-08 11:08:23', + // dnn: 'cmnet', + // ipv4: '10.10.86.201', + // ipv6: '', + // pduSessionID: 6, + // ranN3IP: '192.168.5.100', + // sstSD: '1-000001', + // tai: '46000-001124', + // upState: 'Active', + // upfN3IP: '192.168.14.201', // }, // ], - // ratType: 'EUTRAN', + // ratType: 'NR', // }, // ]; return data; diff --git a/src/views/neUser/ue/index.vue b/src/views/neUser/ue/index.vue index dca1aaba..587e85a1 100644 --- a/src/views/neUser/ue/index.vue +++ b/src/views/neUser/ue/index.vue @@ -414,8 +414,8 @@ onMounted(() => { @cancel="fnModalCancel" :footer="null" > - - + + {{ modalState.from.imsi }} From 2db0220c98230e390ffbd7a44cde8a93d24d724f Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 8 May 2024 11:35:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC240508?= 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 4ca4be23..e8936783 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.240425.1" +VITE_APP_VERSION = "2.240508.1" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index c59776c8..c082d4e6 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.240425.1" +VITE_APP_VERSION = "2.240508.1" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" From ad935887963da91714699c564b704911054d6c2a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 9 May 2024 18:27:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6post,put,?= =?UTF-8?q?delete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configParamTreeTable/index.vue | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/views/configManage/configParamTreeTable/index.vue b/src/views/configManage/configParamTreeTable/index.vue index 97eec590..2f77656f 100644 --- a/src/views/configManage/configParamTreeTable/index.vue +++ b/src/views/configManage/configParamTreeTable/index.vue @@ -43,7 +43,7 @@ let treeState: TreeStateType = reactive({ selectNode: { topDisplay: '' as string, topTag: '' as string, - method: '' as string, + method: [] as string[], // title: '' as string, key: '' as string, @@ -57,7 +57,11 @@ function fnSelectConfigNode(_: any, info: any) { const { title, key, method } = info.node; treeState.selectNode.topDisplay = title; treeState.selectNode.topTag = key; - treeState.selectNode.method = method; + if (method) { + treeState.selectNode.method = method.split(','); + } else { + treeState.selectNode.method = ['post', 'put', 'delete']; + } treeState.selectNode.title = title; treeState.selectNode.key = key; fnActiveConfigNode(key); @@ -1349,7 +1353,9 @@ onMounted(() => { @@ -1363,7 +1369,7 @@ onMounted(() => { { type="primary" @click.prevent="arrayAdd()" size="small" - v-if="treeState.selectNode.method !== 'get'" + v-if="treeState.selectNode.method.includes('post')" > {{ t('common.addText') }} @@ -1388,7 +1394,7 @@ onMounted(() => { @@ -1398,13 +1404,17 @@ onMounted(() => {