From 5ac0ca41eb92fcc40b30d9691e9fc9888b91cc9f Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 9 Jul 2024 18:36:27 +0800
Subject: [PATCH 1/5] =?UTF-8?q?style:=20=E7=AD=BE=E7=BA=A6=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7IMSI=E7=BC=96=E8=BE=91=E6=97=B6=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8CcnType=E6=B7=BB=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts      |  1 +
 src/i18n/locales/zh-CN.ts      |  1 +
 src/views/neUser/sub/index.vue | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index d3a5aad9..88c1364c 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -883,6 +883,7 @@ export default {
         imsiTip3: 'MSIN = Mobile Subscriber Identification Number, consisting of 10 equal digits.',
         msisdnTip: 'Maximum parameter length {num}',
         inputTip: 'The maximum length of the parameter is {num}',
+        cnTypeTip: 'Type of network access allowed',
         arfbTip: 'Restricted area template, in which the UE is not allowed to communicate with the network in the restricted area specified in the template',
         sarTip: 'Service Area Restriction template, defining permitted areas in which the UE can communicate with the network, and disallowed areas in which the UE and the network are not allowed to initiate Service Requests or SM signaling to obtain subscriber services',
         micoTip: 'Signed MICO business flag bits',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 7c0a41b1..374af28a 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -883,6 +883,7 @@ export default {
         imsiTip3: 'MSIN=移动客户识别码，采用等长10位数字构成',
         msisdnTip: '参数最大长度 {num}',
         inputTip: '参数最大长度为 {num}',
+        cnTypeTip: '允许接入的网络类型',
         arfbTip: '限制区域模板，在模板指定的限制区域中，UE 不允许与网络通信',
         sarTip: '服务区域限制模板，定义允许的区域，UE 在这些区域中可以和网络通信；定义不允许的区，UE 和网络在这些区域中，不允许发起Service Request 或 SM 信令来获取用户服务',
         micoTip: '签约的 MICO 业务标志位',
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 0de9eaaa..72dc5fff 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -1535,7 +1535,11 @@ onMounted(() => {
               name="imsi"
               v-bind="modalStateFrom.validateInfos.imsi"
             >
-              <a-input v-model:value="modalState.from.imsi" allow-clear>
+              <a-input
+                v-model:value="modalState.from.imsi"
+                allow-clear
+                :disabled="!!modalState.from.id"
+              >
                 <template #prefix>
                   <a-tooltip placement="topLeft">
                     <template #title>
@@ -1549,7 +1553,11 @@ onMounted(() => {
                 </template>
               </a-input>
             </a-form-item>
-            <a-form-item label="CN Type" name="cn">
+            <a-form-item
+              label="CN Type"
+              name="cn"
+              :help="t('views.neUser.sub.cnTypeTip')"
+            >
               <a-select
                 v-model:value="modalState.from.cn"
                 :options="dict.udmSubCNType"
@@ -2096,7 +2104,11 @@ onMounted(() => {
                 </template>
               </a-input>
             </a-form-item>
-            <a-form-item label="CN Type" name="cn">
+            <a-form-item
+              label="CN Type"
+              name="cn"
+              :help="t('views.neUser.sub.cnTypeTip')"
+            >
               <a-select
                 v-model:value="modalState.BatchForm.cn"
                 :options="dict.udmSubCNType"

From 9e0a99d160d0a8b7d600fc68351d26093ceb6bd5 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 9 Jul 2024 19:02:54 +0800
Subject: [PATCH 2/5] =?UTF-8?q?style:=20=E6=95=B0=E6=8D=AECDR=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/smfCDR/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/smfCDR/index.vue b/src/views/dashboard/smfCDR/index.vue
index ad726ee6..385a7b8e 100644
--- a/src/views/dashboard/smfCDR/index.vue
+++ b/src/views/dashboard/smfCDR/index.vue
@@ -197,7 +197,7 @@ let tableColumns: ColumnsType = [
     title: t('views.dashboard.cdr.smfInvocationTime'), // 调用时间
     dataIndex: 'cdrJSON',
     align: 'left',
-    width: 250,
+    width: 200,
     customRender(opt) {
       const cdrJSON = opt.value;
       return cdrJSON.invocationTimestamp;
@@ -616,7 +616,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 3bdae264e110a71d23caa566e9169ac045fef3f8 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 10 Jul 2024 15:47:28 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8D=95=E8=A1=8C=E6=9B=B4=E6=96=B0=E5=B1=80=E9=83=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=98=E6=9B=B4=E5=A4=B1=E6=95=88?=
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, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue
index d1a5761c..9d3cd6f3 100644
--- a/src/views/ne/neInfo/index.vue
+++ b/src/views/ne/neInfo/index.vue
@@ -233,8 +233,10 @@ function fnModalEditOk(from: Record<string, any>) {
       if (item && res.code === RESULT_CODE_SUCCESS) {
         item.neType = from.neType;
         item.neId = from.neId;
-        item.ip = from.ip;
+        item.rmUid = from.rmUid;
         item.neName = from.neName;
+        item.ip = from.ip;
+        item.port = from.port;
         item.status = res.data.online ? '1' : '0';
         Object.assign(item.serverState, res.data);
         const resouresUsage = parseResouresUsage(item.serverState);

From 4dc669997408d3c2f2d04e0e1e670480f2be304a Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 11 Jul 2024 15:02:53 +0800
Subject: [PATCH 4/5] =?UTF-8?q?style:=20UDM=E7=94=A8=E6=88=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=99=90=E5=88=B6imsi=E9=95=BF=E5=BA=A6=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/neUser/auth/index.vue | 14 ++++++++++++--
 src/views/neUser/ims/index.vue  |  2 +-
 src/views/neUser/sub/index.vue  |  9 ++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue
index 2d059b7c..a2d97ec3 100644
--- a/src/views/neUser/auth/index.vue
+++ b/src/views/neUser/auth/index.vue
@@ -770,6 +770,7 @@ onMounted(() => {
               <a-input
                 v-model:value="queryParams.imsi"
                 allow-clear
+                :maxlength="15"
                 :placeholder="t('common.inputPlease')"
               ></a-input>
             </a-form-item>
@@ -1026,6 +1027,7 @@ onMounted(() => {
               <a-input
                 v-model:value="modalState.from.imsi"
                 allow-clear
+                :maxlength="15"
                 :disabled="!!modalState.from.id"
               >
                 <template #prefix>
@@ -1196,7 +1198,11 @@ onMounted(() => {
               name="imsi"
               v-bind="modalStateBatchFrom.validateInfos.imsi"
             >
-              <a-input v-model:value="modalState.BatchForm.imsi" allow-clear>
+              <a-input
+                v-model:value="modalState.BatchForm.imsi"
+                allow-clear
+                :maxlength="15"
+              >
                 <template #prefix>
                   <a-tooltip placement="topLeft">
                     <template #title>
@@ -1344,7 +1350,11 @@ onMounted(() => {
               name="imsi"
               v-bind="modalStateBatchDelFrom.validateInfos.imsi"
             >
-              <a-input v-model:value="modalState.BatchDelForm.imsi" allow-clear>
+              <a-input
+                v-model:value="modalState.BatchDelForm.imsi"
+                allow-clear
+                :maxlength="15"
+              >
                 <template #prefix>
                   <a-tooltip placement="topLeft">
                     <template #title>
diff --git a/src/views/neUser/ims/index.vue b/src/views/neUser/ims/index.vue
index dd8a05ff..e36c0316 100644
--- a/src/views/neUser/ims/index.vue
+++ b/src/views/neUser/ims/index.vue
@@ -223,7 +223,7 @@ onMounted(() => {
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item label="IMSI" name="imsi">
-              <a-input v-model:value="queryParams.imsi" allow-clear></a-input>
+              <a-input v-model:value="queryParams.imsi" allow-clear :maxlength="15"></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 72dc5fff..6ecc587b 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -1262,6 +1262,7 @@ onMounted(() => {
               <a-input
                 v-model:value="queryParams.imsi"
                 allow-clear
+                :maxlength="15"
                 :placeholder="t('common.inputPlease')"
               ></a-input>
             </a-form-item>
@@ -1271,6 +1272,7 @@ onMounted(() => {
               <a-input
                 v-model:value="queryParams.msisdn"
                 allow-clear
+                :maxlength="32"
                 :placeholder="t('common.inputPlease')"
               ></a-input>
             </a-form-item>
@@ -1538,6 +1540,7 @@ onMounted(() => {
               <a-input
                 v-model:value="modalState.from.imsi"
                 allow-clear
+                :maxlength="15"
                 :disabled="!!modalState.from.id"
               >
                 <template #prefix>
@@ -2628,7 +2631,11 @@ onMounted(() => {
               name="imsi"
               v-bind="modalStateBatchDelFrom.validateInfos.imsi"
             >
-              <a-input v-model:value="modalState.BatchDelForm.imsi" allow-clear>
+              <a-input
+                v-model:value="modalState.BatchDelForm.imsi"
+                allow-clear
+                :maxlength="15"
+              >
                 <template #prefix>
                   <a-tooltip placement="topLeft">
                     <template #title>

From 6efd9cb61a0ee280e4bb2b7588f462527a537af1 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 11 Jul 2024 17:56:24 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E6=A0=B9=E6=8D=AE=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E5=9C=B0=E5=9D=80=E6=A0=8Fhostname=E5=8A=A033030?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E8=BF=9E=E6=8E=A5=E5=90=8E=E7=AB=AF=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/default/config.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/default/config.js b/public/default/config.js
index 3b6e9858..7696cf78 100644
--- a/public/default/config.js
+++ b/public/default/config.js
@@ -11,8 +11,9 @@
  */
 (function () {
   // host = ip:port
-  const host = '192.168.8.100:33030';
-
+  // const host = '192.168.8.100:33030';
+  const host = `${window.location.hostname}:33030`;
+  
   // Service Address
   sessionStorage.setItem('baseUrl', `http://${host}`);
   // websocket Address