From 697d825669b4f3801846ba31e7ce8ef8620b74e9 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Mon, 19 Jan 2026 14:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/public/white/back.png | Bin 0 -> 2917 bytes .../Container/Map/components/Header/index.js | 12 +++++++++-- .../Map/components/RightUtils/index.js | 7 ++++++- src/pages/Container/Map/index.js | 11 ++++++++-- src/pages/Container/Map/js/initMap.js | 19 ------------------ .../Container/White/BranchOffice/index.js | 4 ++-- .../White/Share/components/Header/index.js | 12 ++++++++++- .../White/Share/components/Header/index.less | 13 ++++++++++-- src/pages/Container/White/Share/index.js | 4 ++-- 9 files changed, 51 insertions(+), 31 deletions(-) create mode 100644 src/assets/images/public/white/back.png diff --git a/src/assets/images/public/white/back.png b/src/assets/images/public/white/back.png new file mode 100644 index 0000000000000000000000000000000000000000..2aa7cad0596b8ab6c03ce31aab394a6348f6728c GIT binary patch literal 2917 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 I(8f3V-}emvPyhe` literal 0 HcmV?d00001 diff --git a/src/pages/Container/Map/components/Header/index.js b/src/pages/Container/Map/components/Header/index.js index c25ae38..6b4548c 100644 --- a/src/pages/Container/Map/components/Header/index.js +++ b/src/pages/Container/Map/components/Header/index.js @@ -27,7 +27,15 @@ function Header(props) { const onBack = () => { sessionStorage.removeItem("mapCurrentBranchOfficeId"); mitt.emit(deletePeoplePositionPointMittKey); - if (currentPort !== "00003" && currentBranchOffice) { + if (!currentPort) { + window.close(); + setTimeout(() => { + if (!window.closed && !window.opener) { + window.location.href = "https://gbs-gateway.qhdsafety.com/"; + } + }, 500); + } + else if (currentPort !== "00003" && currentBranchOffice) { mitt.emit(clickPortPointMittKey, { id: "", name: "秦港股份" }); mitt.emit(clickBranchOfficePointMittKey, { id: "", corpName: "秦港股份" }); mapMethods.current.removeWall(); @@ -70,7 +78,7 @@ function Header(props) { className={`${displayedTitle === "秦港股份安全监管平台" ? "port" : "branch_office"}`} style={{ backgroundImage: `url(${displayedTitle === "秦港股份安全监管平台" ? topImg1 : topImg2})` }} > - {(currentPort && displayedTitle === "秦港股份安全监管平台") && ( + {(displayedTitle === "秦港股份安全监管平台") && (
)} {displayedTitle !== "秦港股份安全监管平台" && ( diff --git a/src/pages/Container/Map/components/RightUtils/index.js b/src/pages/Container/Map/components/RightUtils/index.js index 4c05c19..3ab084c 100644 --- a/src/pages/Container/Map/components/RightUtils/index.js +++ b/src/pages/Container/Map/components/RightUtils/index.js @@ -65,7 +65,12 @@ function RightUtils(props) { switch (type) { case "back": - // router.push("/"); + window.close(); + setTimeout(() => { + if (!window.closed && !window.opener) { + window.location.href = "https://gbs-gateway.qhdsafety.com/"; + } + }, 500); break; case "full": props.toggleFullscreen(); diff --git a/src/pages/Container/Map/index.js b/src/pages/Container/Map/index.js index 1029659..cda5463 100644 --- a/src/pages/Container/Map/index.js +++ b/src/pages/Container/Map/index.js @@ -1,7 +1,7 @@ import { useFullscreen, useMount } from "ahooks"; import { message } from "antd"; import autoFit from "autofit.js"; -import { useMemo, useRef, useState } from "react"; +import { useEffect, useMemo, useRef, useState } from "react"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import BottomUtils from "./components/BottomUtils"; import CenterUtils from "./components/CenterUtils"; @@ -84,6 +84,13 @@ function Map(props) { }; }); + useEffect(() => { + query.accessTicket && window.sessionStorage.setItem("accessTicket", query.accessTicket); + query.clientId && window.sessionStorage.setItem("clientId", query.clientId); + query.orgId && window.sessionStorage.setItem("orgId", query.orgId); + query.token && window.sessionStorage.setItem("token", query.token); + }, []); + const providerValues = useMemo( () => ({ viewer, mapMethods, currentPort, currentBranchOffice, area, bottomUtilsCurrentIndex, pureMap }), [viewer, mapMethods, currentPort, currentBranchOffice, area, bottomUtilsCurrentIndex, pureMap], @@ -96,7 +103,7 @@ function Map(props) {
- +
diff --git a/src/pages/Container/Map/js/initMap.js b/src/pages/Container/Map/js/initMap.js index c987c81..988b0bb 100644 --- a/src/pages/Container/Map/js/initMap.js +++ b/src/pages/Container/Map/js/initMap.js @@ -106,23 +106,4 @@ export default class InitMap { } }, Cesium.ScreenSpaceEventType.LEFT_CLICK); }; - - // 外部入口 - externalEntryPort = (query) => { - const { id, corpinfoId, mapType, longitude, latitude, name } = query; - setTimeout(() => { - this.#pointClickEvent.pointClickEvent({ - monitorItems: { - data: { - position: { x: longitude, y: latitude }, - id, - corpinfoId, - mapType, - name, - isExternalEntry: "1", - }, - }, - }); - }, 0); - }; } diff --git a/src/pages/Container/White/BranchOffice/index.js b/src/pages/Container/White/BranchOffice/index.js index b35e23c..05bfb4b 100644 --- a/src/pages/Container/White/BranchOffice/index.js +++ b/src/pages/Container/White/BranchOffice/index.js @@ -7,14 +7,14 @@ import RightPanel from "~/pages/Container/White/BranchOffice/components/RightPan import Header from "~/pages/Container/White/Share/components/Header"; import "./index.less"; -function BranchOffice() { +function BranchOffice(props) { useMount(() => { autoFit.init({ dw: 1920, dh: 1080, el: ".white_branch_office", resize: true }); }); return (
-
+
diff --git a/src/pages/Container/White/Share/components/Header/index.js b/src/pages/Container/White/Share/components/Header/index.js index b839aea..5f96bb2 100644 --- a/src/pages/Container/White/Share/components/Header/index.js +++ b/src/pages/Container/White/Share/components/Header/index.js @@ -1,12 +1,22 @@ +import back from "~/assets/images/public/white/back.png"; import more from "~/assets/images/public/white/more.png"; import title from "~/assets/images/public/white/title.png"; import bg from "~/assets/images/public/white/titlebg.png"; import "./index.less"; -function Header() { +function Header(props) { return (
+
+ { + props.history.goBack(); + }} + /> +
已安全生产 365 天
10~27℃ 多云 星期三
diff --git a/src/pages/Container/White/Share/components/Header/index.less b/src/pages/Container/White/Share/components/Header/index.less index 9b0a09a..4c48d4f 100644 --- a/src/pages/Container/White/Share/components/Header/index.less +++ b/src/pages/Container/White/Share/components/Header/index.less @@ -15,9 +15,18 @@ .left { position: absolute; top: 30px; - left: 20px; + left: 10px; display: flex; + .back { + cursor: pointer; + + img { + width: 35px; + height: 39px; + } + } + .list { padding: 6px 15px; border-radius: 23px; @@ -85,5 +94,5 @@ } } } - } + } } diff --git a/src/pages/Container/White/Share/index.js b/src/pages/Container/White/Share/index.js index cefba9c..5fe0303 100644 --- a/src/pages/Container/White/Share/index.js +++ b/src/pages/Container/White/Share/index.js @@ -7,14 +7,14 @@ import Middle from "~/pages/Container/White/Share/components/MiddlePanel"; import Right from "~/pages/Container/White/Share/components/RightPanel"; import "./index.less"; -function Share() { +function Share(props) { useMount(() => { autoFit.init({ dw: 1920, dh: 1080, el: ".white_share_office", resize: true }); }); return (
-
+