Merge branch 'multi-tenant' of http://192.168.2.166:3180/OMC/ems_frontend_vue3 into multi-tenant

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

src/i18n/locales/en-US.ts

@@ -884,6 +884,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',

src/i18n/locales/zh-CN.ts

@@ -884,6 +884,7 @@ export default {
         imsiTip3: 'MSIN=移动客户识别码，采用等长10位数字构成',
         msisdnTip: '参数最大长度 {num}',
         inputTip: '参数最大长度为 {num}',
+        cnTypeTip: '允许接入的网络类型',
         arfbTip: '限制区域模板，在模板指定的限制区域中，UE 不允许与网络通信',
         sarTip: '服务区域限制模板，定义允许的区域，UE 在这些区域中可以和网络通信；定义不允许的区，UE 和网络在这些区域中，不允许发起Service Request 或 SM 信令来获取用户服务',
         micoTip: '签约的 MICO 业务标志位',

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);

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>

src/views/neUser/ims/index.vue

@@ -232,7 +232,7 @@ onMounted(() => {
           </a-col>
           <a-col :lg="8" :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="8" :md="12" :xs="24">

src/views/neUser/sub/index.vue

@@ -1325,6 +1325,7 @@ onMounted(() => {
               <a-input
                 v-model:value="queryParams.imsi"
                 allow-clear
+                :maxlength="15"
                 :placeholder="t('common.inputPlease')"
               ></a-input>
             </a-form-item>
@@ -1348,6 +1349,7 @@ onMounted(() => {
               <a-input
                 v-model:value="queryParams.msisdn"
                 allow-clear
+                :maxlength="32"
                 :placeholder="t('common.inputPlease')"
               ></a-input>
             </a-form-item>
@@ -1627,6 +1629,7 @@ onMounted(() => {
               <a-input
                 v-model:value="modalState.from.imsi"
                 allow-clear
+                :maxlength="15"
                 :disabled="!!modalState.from.id"
               >
                 <template #prefix>
@@ -1642,7 +1645,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"
@@ -2189,7 +2196,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"
@@ -2709,7 +2720,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>