diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 4201bb4b0222720a2e0d3ead2359498f3bc87fee..3d06a80928069e527ed3b359dfda0cc60f421c42 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -663,7 +663,6 @@ const Layout = props => { }); } }; - return ( <SecurityLayout {...props}> <BasicLayout @@ -747,7 +746,7 @@ const Layout = props => { {/* ) */} {/* ) : null} */} {/* <AliveScope> */} - {window.location.pathname.startsWith('/civbase/civ_3d/map') || isHaveMap() ? ( + {window.location.pathname.startsWith('/civbase/civ_3d/map') || window.location.pathname.startsWith('/civbase/civ_drainage/map') || isHaveMap() ? ( <KeepAlive when={true}> <CesiumMap /> </KeepAlive> diff --git a/src/layouts/BasicLayout_tags.js b/src/layouts/BasicLayout_tags.js index df3299a99e46f7f32ef2ae636155899173f07a70..2e2bdafd2403a222745c8e2720cd80e8e6fd7e24 100644 --- a/src/layouts/BasicLayout_tags.js +++ b/src/layouts/BasicLayout_tags.js @@ -310,7 +310,7 @@ const Layout = props => { {/* <ArcgisMap options={{ type: 'ArcgisMap' }} /> */} {/* ) */} {/* ) : null} */} - {window.location.pathname.startsWith('/civbase/civ_3d/map') ? ( + {(window.location.pathname.startsWith('/civbase/civ_3d/map') || window.location.pathname.startsWith('/civbase/civ_drainage/map')) ? ( <KeepAlive> <CesiumMap /> </KeepAlive> diff --git a/src/layouts/HNLayout.js b/src/layouts/HNLayout.js index 4e3ea5028e766f9e6931acf91392f5c620417df5..f16272898dc53372e5f59c5141cbc87408843d51 100644 --- a/src/layouts/HNLayout.js +++ b/src/layouts/HNLayout.js @@ -285,7 +285,7 @@ const Layout = props => { > <> <Suspense fallback={<></>}> - {window.location.pathname.startsWith('/civbase/civ_3d') ? ( + {window.location.pathname.startsWith('/civbase/civ_3d') || window.location.pathname.startsWith('/civbase/civ_drainage') ? ( <KeepAlive> <CesiumMap /> </KeepAlive>