diff --git a/src/pages/Container/BranchCompany/ControlRoom/List/index.js b/src/pages/Container/BranchCompany/ControlRoom/List/index.js index cf4a46a..6e78ea3 100644 --- a/src/pages/Container/BranchCompany/ControlRoom/List/index.js +++ b/src/pages/Container/BranchCompany/ControlRoom/List/index.js @@ -176,19 +176,8 @@ function List(props) { onFinish={handleSearch} /> ( - - {query.corpName} - - ) + headerTitle={isFromSupervision && query.corpName + ? 公司名称:{query.corpName} : undefined } toolBarRender={() => ( diff --git a/src/pages/Container/BranchCompany/FireResourceStats/index.js b/src/pages/Container/BranchCompany/FireResourceStats/index.js index aaec59d..dda90c7 100644 --- a/src/pages/Container/BranchCompany/FireResourceStats/index.js +++ b/src/pages/Container/BranchCompany/FireResourceStats/index.js @@ -22,7 +22,9 @@ function FireResourceStats(props) { if (routeMap[type]) { const corpId = record.corpId || record.companyId || ""; - props.history.push(`${routeMap[type]}?eqCorpId=${corpId}`); + const corpName = record.corpName || record.companyName || ""; + const searchParams = new URLSearchParams({ eqCorpId: corpId, corpName }); + props.history.push(`${routeMap[type]}?${searchParams.toString()}`); } }; diff --git a/src/pages/Container/BranchCompany/PumpRoom/List/index.js b/src/pages/Container/BranchCompany/PumpRoom/List/index.js index 2d862a7..eb4b332 100644 --- a/src/pages/Container/BranchCompany/PumpRoom/List/index.js +++ b/src/pages/Container/BranchCompany/PumpRoom/List/index.js @@ -157,19 +157,8 @@ function List(props) { onFinish={handleSearch} />
( - - {query.corpName} - - ) + headerTitle={isFromSupervision && query.corpName + ? 公司名称:{query.corpName} : undefined } toolBarRender={() => ( diff --git a/src/pages/Container/BranchCompany/RescueTeam/List/index.js b/src/pages/Container/BranchCompany/RescueTeam/List/index.js index 5e97cf4..db9ab86 100644 --- a/src/pages/Container/BranchCompany/RescueTeam/List/index.js +++ b/src/pages/Container/BranchCompany/RescueTeam/List/index.js @@ -142,22 +142,12 @@ function List(props) { />
( - - {query.corpName} - - ) + headerTitle={isFromSupervision && query.corpName + ? 公司名称:{query.corpName} : undefined } toolBarRender={() => ( + {canAdd && ( diff --git a/src/pages/Container/BranchCompany/WaterSource/List/index.js b/src/pages/Container/BranchCompany/WaterSource/List/index.js index bbbb1b9..2779a64 100644 --- a/src/pages/Container/BranchCompany/WaterSource/List/index.js +++ b/src/pages/Container/BranchCompany/WaterSource/List/index.js @@ -170,19 +170,8 @@ function List(props) { onFinish={handleSearch} />
( - - {query.corpName} - - ) + headerTitle={isFromSupervision && query.corpName + ? 公司名称:{query.corpName} : undefined } toolBarRender={() => ( diff --git a/src/pages/Container/Filiale/FireResourceStats/index.js b/src/pages/Container/Filiale/FireResourceStats/index.js index bf8e3da..0dfca1e 100644 --- a/src/pages/Container/Filiale/FireResourceStats/index.js +++ b/src/pages/Container/Filiale/FireResourceStats/index.js @@ -27,10 +27,12 @@ function FireResourceStats(props) { if (routeMap[type]) { const corpId = record.corpId || record.companyId || ""; + const corpName = record.corpName || record.companyName || ""; const backPath = `${props.location?.pathname || window.location.pathname}${props.location?.search || window.location.search || ""}`; window.sessionStorage.setItem("supervisionFireResourceStatsBackPath", backPath); const searchParams = new URLSearchParams({ eqCorpId: corpId, + corpName, backPath, }); const permissionConfig = FIRE_RESOURCE_SUPERVISION_PERMISSION_MAP[type] || {};