From 70fca5ca414a09416413fc7ebdc1637a67d92310 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 5 Aug 2024 17:44:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1=E6=81=AFOAM?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9omc=20ip,?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4omc=E7=BC=96=E8=BE=91OAM=E4=BF=A1=E6=81=AF?=
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/ne/neInfo/components/OAMModal.vue | 13 +++++++++++++
 src/views/ne/neInfo/index.vue               |  5 ++++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 3ebe951c..ddd0ed55 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -658,6 +658,7 @@ export default {
           kpiEnable: 'Report',
           kpiTimer: 'Reporting Cycle',
           kpiTimerPlease: 'Please enter the reporting period (in seconds)',
+          omcIP: 'OMC IP',
         },
         backConf: {
           export: 'Config Export',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 32e76e82..51f81718 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -658,6 +658,7 @@ export default {
           kpiEnable: '上报',
           kpiTimer: '上报周期',
           kpiTimerPlease: '请输入上报周期（单位秒）',
+          omcIP: 'OMC IP',
         },
         backConf: {
           export: '配置导出',
diff --git a/src/views/ne/neInfo/components/OAMModal.vue b/src/views/ne/neInfo/components/OAMModal.vue
index 5895ac94..3108dda5 100644
--- a/src/views/ne/neInfo/components/OAMModal.vue
+++ b/src/views/ne/neInfo/components/OAMModal.vue
@@ -42,6 +42,7 @@ let modalState: ModalStateType = reactive({
   title: 'OAM Configuration',
   sync: true,
   from: {
+    omcIP: '',
     oamEnable: true,
     oamPort: 33030,
     snmpEnable: true,
@@ -77,6 +78,7 @@ function fnModalVisibleByTypeAndId(neType: string, neId: string) {
       if (res.code === RESULT_CODE_SUCCESS) {
         const data = res.data;
         Object.assign(modalState.from, {
+          omcIP: data.oamConfig[data.oamConfig.ipType],
           oamEnable: data.oamConfig.enable,
           oamPort: data.oamConfig.port,
           snmpEnable: data.snmpConfig.enable,
@@ -224,6 +226,17 @@ watch(
               </a-form-item>
             </a-col>
           </a-row>
+          <a-form-item
+            :label="t('views.ne.neInfo.oam.omcIP')"
+            name="omcIP"
+            :label-col="{ span: 6 }"
+            :labelWrap="true"
+          >
+            <a-input
+              v-model:value="modalState.from.omcIP"
+              :maxlength="128"
+            ></a-input>
+          </a-form-item>
         </a-collapse-panel>
         <a-collapse-panel header="SNMP">
           <a-row :gutter="16">
diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue
index 8a95f042..0c58214a 100644
--- a/src/views/ne/neInfo/index.vue
+++ b/src/views/ne/neInfo/index.vue
@@ -625,7 +625,10 @@ onMounted(() => {
                         <DeleteOutlined />
                         {{ t('common.deleteText') }}
                       </a-menu-item>
-                      <a-menu-item key="oam">
+                      <a-menu-item
+                        key="oam"
+                        v-if="!['OMC'].includes(record.neType)"
+                      >
                         <FileTextOutlined />
                         {{ t('views.ne.common.oam') }}
                       </a-menu-item>