From d1b9d7b9ba0369d1a39ebc71e5082927eb4b33e6 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 19 Jun 2024 12:01:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style:=20=E7=BD=91=E5=85=83=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E5=8F=82=E6=95=B0=E5=90=8C=E6=AD=A5=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6=E4=B8=8D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ne/neConfPara5G/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/ne/neConfPara5G/index.vue b/src/views/ne/neConfPara5G/index.vue
index fb028ed0..8712a255 100644
--- a/src/views/ne/neConfPara5G/index.vue
+++ b/src/views/ne/neConfPara5G/index.vue
@@ -233,6 +233,7 @@ onMounted(() => {
     <!-- 保存选择同步网元 -->
     <ProModal
       :drag="true"
+      :minHeight="0"
       :keyboard="false"
       :mask-closable="false"
       :visible="state.visible"

From 639a4f0b1fa4bf7eceb85352b0f0231283e64d42 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 19 Jun 2024 12:03:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=9D=E5=AD=98userId=E4=BF=A1=E6=81=AF=E5=81=9A?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 1d4d4629..1a9b1932 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -9,6 +9,8 @@ import { parseUrlPath } from '@/plugins/file-static-url';
 
 /**用户信息类型 */
 type UserInfo = {
+  /**用户ID */
+  userId: string;
   /**登录账号 */
   userName: string;
   /**用户角色 字符串数组 */
@@ -31,6 +33,7 @@ type UserInfo = {
 
 const useUserStore = defineStore('user', {
   state: (): UserInfo => ({
+    userId: '',
     userName: '',
     roles: [],
     permissions: [],
@@ -109,6 +112,7 @@ const useUserStore = defineStore('user', {
       const res = await getInfo();
       if (res.code === RESULT_CODE_SUCCESS && res.data) {
         const { user, roles, permissions } = res.data;
+        this.userId = user.userId;
         // 登录账号
         this.userName = user.userName;
         // 用户头像