From d49dc9ebfd17d224a44993d1a5a4c0ede49178be Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 4 Jul 2024 10:24:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7240704?=
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 dd1252ea..2692c792 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.240627"
+VITE_APP_VERSION = "2.240704"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
diff --git a/.env.production b/.env.production
index ab00a551..6096f580 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.240627"
+VITE_APP_VERSION = "2.240704"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"

From d095531952370300dce1e7e4c37ab64e82cd2b86 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 4 Jul 2024 17:02:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style:=20=E7=B3=BB=E7=BB=9F=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=88=86=E9=85=8D=E6=A0=87=E9=A2=98=E5=A4=9A=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/auth-user.vue                   | 2 +-
 src/views/system/role/components/auth-user-select.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/system/role/auth-user.vue b/src/views/system/role/auth-user.vue
index 5487ac16..9ece98a9 100644
--- a/src/views/system/role/auth-user.vue
+++ b/src/views/system/role/auth-user.vue
@@ -184,7 +184,7 @@ type ModalStateType = {
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   visibleBySelectUser: false,
-  title: '选择用户',
+  title: t('views.system.role.distributeUser'),
 });
 
 /**
diff --git a/src/views/system/role/components/auth-user-select.vue b/src/views/system/role/components/auth-user-select.vue
index ae09d448..650181a9 100644
--- a/src/views/system/role/components/auth-user-select.vue
+++ b/src/views/system/role/components/auth-user-select.vue
@@ -237,7 +237,6 @@ watch(
 <template>
   <ProModal
     :drag="true"
-    :width="800"
     :destroyOnClose="true"
     :forceFullscreen="true"
     :title="props.title"
@@ -302,7 +301,7 @@ watch(
       :loading="tableState.loading"
       :data-source="tableState.data"
       :size="tableState.size"
-      :scroll="{ scrollToFirstRowOnChange: true, y: 400, x: 600 }"
+      :scroll="{ scrollToFirstRowOnChange: true }"
       :pagination="tablePagination"
       :row-selection="{
         type: 'checkbox',

From 61029723732e9e3d1e6347d48b529ecdfd22070d Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 5 Jul 2024 14:42:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEOMC=E7=9A=84IP=E5=8E=BB=E9=99=A4=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts           |  2 ++
 src/i18n/locales/zh-CN.ts           |  2 ++
 src/views/ne/neConfPara5G/index.vue | 11 +++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index ee36d593..d3a5aad9 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -771,6 +771,8 @@ export default {
         uploadChangeFail: "Some network elements failed to update the license, please check whether the service terminal environment is available!",
       },
       neConfPara5G: {
+        headerTip: 'Check and save the public parameter properties of the network element before performing the installation of the network element, and make sure that the latest parameter properties are applied.',
+        headerTipToPage: 'Jump Installation',
         save: 'Save',
         reload: 'Reload',
         title: 'Save Info',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 424f4104..7c0a41b1 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -771,6 +771,8 @@ export default {
         uploadChangeFail: "部分网元更新许可证失败，请检查服务终端环境是否可用！",
       },
       neConfPara5G: {
+        headerTip: '进行网元安装前检查并保存网元公共参数属性，确认应用为最新参数属性',
+        headerTipToPage: '跳转安装',
         save: '保存',
         reload: '刷新',
         title: '保存信息',
diff --git a/src/views/ne/neConfPara5G/index.vue b/src/views/ne/neConfPara5G/index.vue
index 8712a255..6be68cb9 100644
--- a/src/views/ne/neConfPara5G/index.vue
+++ b/src/views/ne/neConfPara5G/index.vue
@@ -119,8 +119,8 @@ function fnGetData() {
       for (const item of resArr[1].rows) {
         switch (item.neType) {
           case 'OMC':
-            state.from.sbi.omc_ip = item.ip;
-            Object.assign(state.omcInfo, item);
+            // state.from.sbi.omc_ip = item.ip;
+            Object.assign(state.omcInfo, item); // 主动改OMC_IP
             break;
           case 'IMS':
             state.from.sbi.ims_ip = item.ip;
@@ -204,6 +204,13 @@ onMounted(() => {
 
 <template>
   <PageContainer>
+    <template #content>
+      {{ t('views.ne.neConfPara5G.headerTip') }}
+      <RouterLink :to="{ name: 'NeQuickSetup_2142' }">
+        {{ t('views.ne.neConfPara5G.headerTipToPage') }}
+      </RouterLink>
+    </template>
+
     <a-card :bordered="false">
       <!-- 公共参数表单 -->
       <Para5GForm v-model:data="state.from" :ne="state.hasNE"></Para5GForm>