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/index.jsx | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/gz-customerSystem/src/components/Layout/index.jsx b/gz-customerSystem/src/components/Layout/index.jsx
index 92aec73..1b04597 100644
--- a/gz-customerSystem/src/components/Layout/index.jsx
+++ b/gz-customerSystem/src/components/Layout/index.jsx
@@ -7,8 +7,8 @@
* @Version: 1.0.0
* @Description: 外层layout
*/
-import React, { useState, useRef, useEffect } from 'react';
-import { useLocation, Outlet, useNavigate } from 'react-router-dom';
+import React, { useState, useRef, useEffect } from 'react';
+import { useLocation, Outlet, useNavigate,useSearchParams } from 'react-router-dom';
import './index.less';
import Header from './Header';
import Navigation from './Navigation';
@@ -54,6 +54,9 @@
//网格跳转请求状态
const [gridStatus, setGridStatus] = useState(false)
+ const [searchParams] = useSearchParams();
+ const [userData, setUserData] = useState({});
+
// 切换头部menu
function handleClickHeaderMenu(values) {
@@ -117,28 +120,34 @@
token
})
if (res.type) {
- setGridStatus(true)
- $$.setSessionStorage('gridToken', '')
+ $$.clearSessionStorage();
$$.setSessionStorage('customerSystemToken', res.data?.token);
$$.setLocal('customerSystemUser', res.data || {});
+ console.log('getGridToken', res.data);
+ setUserData(res.data || {})
let ctUseroleList = res.data?.ctUseroleList || [];
+ console.log(ctUseroleList);
const roleId = ctUseroleList[0]?.roleId
const roleName = ctUseroleList[0]?.roleName
const roleCode = ctUseroleList[0]?.roleCode
$$.setSessionStorage('role', { roleId: roleId, roleName: roleName });
setRoleActive({ id: roleId, roleName: roleName, powerMap: {} });
- const res = await switchRoleApi({ roleCode: roleCode });
- if (res.type) {
- $$.setSessionStorage('customerSystemToken', res.data);
- navigate('/mediate/visit/visitWorkBench');
+ const result = await switchRoleApi({ roleCode: roleCode });
+ if (result.type) {
+ $$.setSessionStorage('customerSystemToken', result.data);
+ setGridStatus(true)
}
}
}
+
// 初始化 格式化数据适应菜单栏
useEffect(() => {
//单点登录，网格传一个token在session，如果有就请求接口
- const gridToken = $$.getSessionStorage('gridToken');
+ // const gridToken = $$.getSessionStorage('gridToken');
+
+ const gridToken = searchParams.get('gridToken'); // 获取名为 'gridToken' 的参数
+ console.log(gridToken,'gridToken')
if (gridToken) {
getGridToken(gridToken)
} else {
@@ -149,6 +158,7 @@
return;
}
let customerSystemUser = $$.getLocal('customerSystemUser');
+ setUserData(customerSystemUser || {})
let ctUseroleList = customerSystemUser?.ctUseroleList || [];
if (ctUseroleList[0]?.roleId) {
setRoleActive({ id: ctUseroleList[0]?.roleId, roleName: ctUseroleList[0]?.roleName, powerMap: {} });
@@ -207,7 +217,11 @@
getRolePower(roleActive.id, roleActive.roleName);
}
}, [roleActive.id]);
-
+ useEffect(() => {
+ let customerSystemUser = $$.getLocal('customerSystemUser');
+ setUserData(customerSystemUser || {});
+ }, [headerUserChange]);
+console.log(gridStatus);
return (
<>
<Header
@@ -217,6 +231,7 @@
handleClickMenu={handleClickHeaderMenu}
headerUserChange={headerUserChange}
handleChangeRole={handleChangeRole}
+ userData={userData}
/>
{gridStatus && isNotNav ? (
<main className="layout-main" id="layoutMain">
--
Gitblit v1.8.0