From 5aa4a814ab8d4aa194a9683ebefaefdfc6d92c3a Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 17 Sep 2024 17:18:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/components/Layout/Header.jsx | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/gz-customerSystem/src/components/Layout/Header.jsx b/gz-customerSystem/src/components/Layout/Header.jsx
index a91e32c..bb24e9b 100644
--- a/gz-customerSystem/src/components/Layout/Header.jsx
+++ b/gz-customerSystem/src/components/Layout/Header.jsx
@@ -37,10 +37,9 @@
* handleClickMenu: function 头部导航点击
* handleChangeRole: function 切换角色
*/
-const Header = ({ roleActive, headerMenu, headerMenuActive, headerUserChange, handleClickMenu, handleChangeRole }) => {
- let navigate = useNavigate();
+const Header = ({ roleActive, headerMenu, headerMenuActive, headerUserChange, handleClickMenu, handleChangeRole,userData }) => {
- const [data, setData] = useState([]);
+ let navigate = useNavigate();
// 修改密码窗口显示隐藏
const [visible, setVisible] = useState(false);
@@ -73,7 +72,7 @@
const userMenu = (
<Menu>
- {data?.ctUseroleList?.length > 1 && (
+ {userData?.ctUseroleList?.length > 1 && (
<>
<Menu.Item key="changeRole" onClick={() => setRoleModal({ visible: true, value: roleActive.id })}>
<UserSwitchOutlined style={{ marginRight: '8px' }} />
@@ -110,9 +109,6 @@
}
}
- useEffect(() => {
- setData($$.getLocal('customerSystemUser') || {});
- }, [headerUserChange]);
return (
<header className="header">
@@ -155,9 +151,9 @@
<div className="header-user-avatar">
<Avatar icon={<UserOutlined />} />
<div>
- <div className="header-user-name">{data?.trueName || '-'}</div>
+ <div className="header-user-name">{userData?.trueName || '-'}</div>
<div className="header-user-unit">
- <span>{data?.unit || '-'}</span>
+ <span>{userData?.unit || '-'}</span>
<span className="public-rightBorder">{roleActive.roleName || '-'}</span>
<DownCircleFilled style={{ fontSize: '10px', marginLeft: '8px', color: '#ffffff' }} />
</div>
@@ -173,7 +169,7 @@
value={roleModal.value}
onChange={(e) => setRoleModal({ visible: true, value: e.target.value, name: e.target.label, roleCode: e.target.roleCode })}
>
- {data?.ctUseroleList?.map((x) => (
+ {userData?.ctUseroleList?.map((x) => (
<Radio key={x.roleId} value={x.roleId} label={x.roleName} roleCode={x.roleCode}>
{x.roleName}
</Radio>
--
Gitblit v1.8.0