From 731de8b1a87cf54d8ee04c47c03f1e623eca1abe Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Wed, 22 Jul 2026 14:43:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(map):=20=E4=BF=AE=E6=94=B9=E6=B8=AF?= =?UTF-8?q?=E5=8C=BAportArea=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=B9=B6?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=A4=9A=E5=A4=84=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Container/Map/components/CenterUtils/index.js | 6 +++--- src/pages/Container/Map/components/Content/index.js | 4 ++-- .../Content/modal/AlarmEquipment/index.js | 13 ++++--------- .../Content/modal/BlindBoardWork/index.js | 4 ++-- .../Content/modal/BreakGroundWork/index.js | 4 ++-- .../Content/modal/ConfinedSpaceWork/index.js | 4 ++-- .../components/Content/modal/CutRoadWork/index.js | 4 ++-- .../Content/modal/ElectricityWork/index.js | 4 ++-- .../Content/modal/FireControlRoom/index.js | 4 ++-- .../Content/modal/FirePointLocation/index.js | 7 ++++--- .../components/Content/modal/FirePumpRoom/index.js | 4 ++-- .../Content/modal/FireWaterSource/index.js | 4 ++-- .../Map/components/Content/modal/HighWork/index.js | 4 ++-- .../components/Content/modal/HoistingWork/index.js | 4 ++-- .../Map/components/Content/modal/HotWork/index.js | 4 ++-- .../Container/Map/components/Content/modal/index.js | 5 +++++ src/pages/Container/Map/js/context.js | 2 +- src/pages/Container/Map/js/mapMethods.js | 2 +- 18 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/pages/Container/Map/components/CenterUtils/index.js b/src/pages/Container/Map/components/CenterUtils/index.js index b492429..83bced9 100644 --- a/src/pages/Container/Map/components/CenterUtils/index.js +++ b/src/pages/Container/Map/components/CenterUtils/index.js @@ -47,7 +47,7 @@ function CenterUtils() { const list = [ { label: "秦皇岛西", portArea: 3 }, - { label: "秦皇岛港区", portArea: 1 }, + { label: "秦皇岛港区", portArea: "" }, { label: "秦皇岛东", portArea: 2 }, ]; @@ -89,7 +89,7 @@ function CenterUtils() {
- {[1, 3].includes(portArea) && ( + {["", 3].includes(portArea) && (
西港区
@@ -102,7 +102,7 @@ function CenterUtils() { )} - {[1, 2].includes(portArea) && ( + {["", 2].includes(portArea) && (
东港区
diff --git a/src/pages/Container/Map/components/Content/index.js b/src/pages/Container/Map/components/Content/index.js index e4d4925..4d394b5 100644 --- a/src/pages/Container/Map/components/Content/index.js +++ b/src/pages/Container/Map/components/Content/index.js @@ -73,7 +73,7 @@ function Content(props) { "danger": PortWeiXian, "weather": PortQiXiang, "people": PortRenYuan, - "project": PortZhongDian, + "keyProject": PortZhongDian, "closedArea": PortFengBi, }; const Component = contentMap[bottomUtilsCurrentType]; @@ -88,7 +88,7 @@ function Content(props) { "fire": BranchXiaoFang, "people": BranchRenYuan, "weather": BranchQiXiang, - "project": BranchZhongDian, + "keyProject": BranchZhongDian, "closedArea": BranchFengBi, "camera": BranchCamera, }; diff --git a/src/pages/Container/Map/components/Content/modal/AlarmEquipment/index.js b/src/pages/Container/Map/components/Content/modal/AlarmEquipment/index.js index d32c01f..b8484d0 100644 --- a/src/pages/Container/Map/components/Content/modal/AlarmEquipment/index.js +++ b/src/pages/Container/Map/components/Content/modal/AlarmEquipment/index.js @@ -1,7 +1,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Descriptions } from "antd"; import { useEffect, useState } from "react"; -import { getLabelName } from "zy-react-library/utils"; +import { getLabelName, isEmptyToWhether } from "zy-react-library/utils"; import { NS_BI_MARK_INFO } from "~/enumerate/namespace"; const SENSOR_ATTR_OPTIONS = [ @@ -9,11 +9,6 @@ const SENSOR_ATTR_OPTIONS = [ { bianma: "SWITCH", name: "开关类" }, ]; -const YES_NO_OPTIONS = [ - { bianma: 1, name: "是" }, - { bianma: 0, name: "否" }, -]; - const SENSOR_STATUS_OPTIONS = [ { bianma: "NORMAL", name: "正常" }, { bianma: "FAULT", name: "故障" }, @@ -21,7 +16,7 @@ const SENSOR_STATUS_OPTIONS = [ { bianma: "deactivate", name: "停用" }, ]; -const FireRescueTeam = (props) => { +const AlarmEquipment = (props) => { const [info, setInfo] = useState({}); const getData = async () => { @@ -47,11 +42,11 @@ const FireRescueTeam = (props) => { { label: "传感器状态", children: getLabelName({ status: info.sensorStatus, list: SENSOR_STATUS_OPTIONS }) }, { label: "安装位置", children: info.installPosition }, { label: "出厂日期", children: info.factoryDate }, - { label: "是否阈值设定", children: getLabelName({ status: info.thresholdFlag, list: YES_NO_OPTIONS }) }, + { label: "是否阈值设定", children: isEmptyToWhether(info.thresholdFlag) }, ]} />
); }; -export default Connect([NS_BI_MARK_INFO], true)(FireRescueTeam); +export default Connect([NS_BI_MARK_INFO], true)(AlarmEquipment); diff --git a/src/pages/Container/Map/components/Content/modal/BlindBoardWork/index.js b/src/pages/Container/Map/components/Content/modal/BlindBoardWork/index.js index f865034..5d92248 100644 --- a/src/pages/Container/Map/components/Content/modal/BlindBoardWork/index.js +++ b/src/pages/Container/Map/components/Content/modal/BlindBoardWork/index.js @@ -8,7 +8,7 @@ import OpinionSign from "../eightWordPubilc/OpinionSign"; import SafetyMeasures from "../eightWordPubilc/SafetyMeasures"; import "../eightWordPubilc/index.less"; -function View(props) { +function BlindBoardWork(props) { const [info, setInfo] = useState({}); const getData = async () => { @@ -175,4 +175,4 @@ function View(props) { ); } -export default Connect([NS_BI_MARK_INFO], true)(View); +export default Connect([NS_BI_MARK_INFO], true)(BlindBoardWork); diff --git a/src/pages/Container/Map/components/Content/modal/BreakGroundWork/index.js b/src/pages/Container/Map/components/Content/modal/BreakGroundWork/index.js index cf296cb..0449c13 100644 --- a/src/pages/Container/Map/components/Content/modal/BreakGroundWork/index.js +++ b/src/pages/Container/Map/components/Content/modal/BreakGroundWork/index.js @@ -9,7 +9,7 @@ import OpinionSign from "../eightWordPubilc/OpinionSign"; import SafetyMeasures from "../eightWordPubilc/SafetyMeasures"; import "../eightWordPubilc/index.less"; -function View(props) { +function BreakGroundWork(props) { const [info, setInfo] = useState({}); const getData = async () => { @@ -144,4 +144,4 @@ function View(props) { ); } -export default Connect([NS_BI_MARK_INFO], true)(View); +export default Connect([NS_BI_MARK_INFO], true)(BreakGroundWork); diff --git a/src/pages/Container/Map/components/Content/modal/ConfinedSpaceWork/index.js b/src/pages/Container/Map/components/Content/modal/ConfinedSpaceWork/index.js index 3968c71..a519e65 100644 --- a/src/pages/Container/Map/components/Content/modal/ConfinedSpaceWork/index.js +++ b/src/pages/Container/Map/components/Content/modal/ConfinedSpaceWork/index.js @@ -5,7 +5,7 @@ import { getFileUrl } from "zy-react-library/utils"; import { NS_BI_MARK_INFO } from "~/enumerate/namespace"; import "../eightWordPubilc/index.less"; -function View(props) { +function ConfinedSpaceWork(props) { const [info, setInfo] = useState({}); const [safetyMeasures, setSafetyMeasures] = useState([]); const [otherSafetyMeasures, setOtherSafetyMeasures] = useState([]); @@ -206,4 +206,4 @@ function View(props) { ); } -export default Connect([NS_BI_MARK_INFO], true)(View); +export default Connect([NS_BI_MARK_INFO], true)(ConfinedSpaceWork); diff --git a/src/pages/Container/Map/components/Content/modal/CutRoadWork/index.js b/src/pages/Container/Map/components/Content/modal/CutRoadWork/index.js index 68a4995..d504817 100644 --- a/src/pages/Container/Map/components/Content/modal/CutRoadWork/index.js +++ b/src/pages/Container/Map/components/Content/modal/CutRoadWork/index.js @@ -9,7 +9,7 @@ import OpinionSign from "../eightWordPubilc/OpinionSign"; import SafetyMeasures from "../eightWordPubilc/SafetyMeasures"; import "../eightWordPubilc/index.less"; -function View(props) { +function CutRoadWork(props) { const [info, setInfo] = useState({}); const getData = async () => { @@ -144,4 +144,4 @@ function View(props) { ); } -export default Connect([NS_BI_MARK_INFO], true)(View); +export default Connect([NS_BI_MARK_INFO], true)(CutRoadWork); diff --git a/src/pages/Container/Map/components/Content/modal/ElectricityWork/index.js b/src/pages/Container/Map/components/Content/modal/ElectricityWork/index.js index 22ba37b..4caed2f 100644 --- a/src/pages/Container/Map/components/Content/modal/ElectricityWork/index.js +++ b/src/pages/Container/Map/components/Content/modal/ElectricityWork/index.js @@ -9,7 +9,7 @@ import OpinionSign from "../eightWordPubilc/OpinionSign"; import SafetyMeasures from "../eightWordPubilc/SafetyMeasures"; import "../eightWordPubilc/index.less"; -function View(props) { +function ElectricityWork(props) { const [info, setInfo] = useState({}); const [gasMonitoringRecord, setGasMonitoringRecord] = useState([]); @@ -175,4 +175,4 @@ function View(props) { ); } -export default Connect([NS_BI_MARK_INFO], true)(View); +export default Connect([NS_BI_MARK_INFO], true)(ElectricityWork); diff --git a/src/pages/Container/Map/components/Content/modal/FireControlRoom/index.js b/src/pages/Container/Map/components/Content/modal/FireControlRoom/index.js index 9bc46dc..158f7d3 100644 --- a/src/pages/Container/Map/components/Content/modal/FireControlRoom/index.js +++ b/src/pages/Container/Map/components/Content/modal/FireControlRoom/index.js @@ -9,7 +9,7 @@ import useGetFile from "zy-react-library/hooks/useGetFile"; import { getLabelName } from "zy-react-library/utils"; import { NS_BI_MARK_INFO } from "~/enumerate/namespace"; -const FireRescueTeam = (props) => { +const FireControlRoom = (props) => { const { getDictionary } = useDictionary(); const { getFile } = useGetFile(); @@ -86,4 +86,4 @@ const FireRescueTeam = (props) => { ); }; -export default Connect([NS_BI_MARK_INFO], true)(FireRescueTeam); +export default Connect([NS_BI_MARK_INFO], true)(FireControlRoom); diff --git a/src/pages/Container/Map/components/Content/modal/FirePointLocation/index.js b/src/pages/Container/Map/components/Content/modal/FirePointLocation/index.js index 027ce89..726ad9f 100644 --- a/src/pages/Container/Map/components/Content/modal/FirePointLocation/index.js +++ b/src/pages/Container/Map/components/Content/modal/FirePointLocation/index.js @@ -2,9 +2,10 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Descriptions } from "antd"; import { useEffect, useState } from "react"; import PreviewImg from "zy-react-library/components/PreviewImg"; +import { isEmptyToWhether } from "zy-react-library/utils"; import { NS_BI_MARK_INFO } from "~/enumerate/namespace"; -const FireRescueTeam = (props) => { +const FirePointLocation = (props) => { const [info, setInfo] = useState({}); const getData = async () => { @@ -30,7 +31,7 @@ const FireRescueTeam = (props) => { { label: "消防点位编码", children: info.firePointCode }, { label: "经度", children: info.longitude }, { label: "维度", children: info.latitude }, - { label: "是否关联NFC", children: info.nfcFlag === 1 ? "是" : info.nfcFlag === 0 ? "否" : "" }, + { label: "是否关联NFC", children: isEmptyToWhether(info.nfcFlag) }, { label: "点检照片", children: () }, ]} /> @@ -38,4 +39,4 @@ const FireRescueTeam = (props) => { ); }; -export default Connect([NS_BI_MARK_INFO], true)(FireRescueTeam); +export default Connect([NS_BI_MARK_INFO], true)(FirePointLocation); diff --git a/src/pages/Container/Map/components/Content/modal/FirePumpRoom/index.js b/src/pages/Container/Map/components/Content/modal/FirePumpRoom/index.js index 8d97a87..a986387 100644 --- a/src/pages/Container/Map/components/Content/modal/FirePumpRoom/index.js +++ b/src/pages/Container/Map/components/Content/modal/FirePumpRoom/index.js @@ -9,7 +9,7 @@ import useGetFile from "zy-react-library/hooks/useGetFile"; import { getLabelName } from "zy-react-library/utils"; import { NS_BI_MARK_INFO } from "~/enumerate/namespace"; -const FireRescueTeam = (props) => { +const FirePumpRoom = (props) => { const { getDictionary } = useDictionary(); const { getFile } = useGetFile(); @@ -76,4 +76,4 @@ const FireRescueTeam = (props) => { ); }; -export default Connect([NS_BI_MARK_INFO], true)(FireRescueTeam); +export default Connect([NS_BI_MARK_INFO], true)(FirePumpRoom); diff --git a/src/pages/Container/Map/components/Content/modal/FireWaterSource/index.js b/src/pages/Container/Map/components/Content/modal/FireWaterSource/index.js index da52f7d..837dfa7 100644 --- a/src/pages/Container/Map/components/Content/modal/FireWaterSource/index.js +++ b/src/pages/Container/Map/components/Content/modal/FireWaterSource/index.js @@ -5,7 +5,7 @@ import useDictionary from "zy-react-library/hooks/useDictionary"; import { getLabelName } from "zy-react-library/utils"; import { NS_BI_MARK_INFO } from "~/enumerate/namespace"; -const FireRescueTeam = (props) => { +const FireWaterSource = (props) => { const { getDictionary } = useDictionary(); const [info, setInfo] = useState({}); @@ -55,4 +55,4 @@ const FireRescueTeam = (props) => { ); }; -export default Connect([NS_BI_MARK_INFO], true)(FireRescueTeam); +export default Connect([NS_BI_MARK_INFO], true)(FireWaterSource); diff --git a/src/pages/Container/Map/components/Content/modal/HighWork/index.js b/src/pages/Container/Map/components/Content/modal/HighWork/index.js index b5cc6ae..e0845ed 100644 --- a/src/pages/Container/Map/components/Content/modal/HighWork/index.js +++ b/src/pages/Container/Map/components/Content/modal/HighWork/index.js @@ -9,7 +9,7 @@ import OpinionSign from "../eightWordPubilc/OpinionSign"; import SafetyMeasures from "../eightWordPubilc/SafetyMeasures"; import "../eightWordPubilc/index.less"; -function View(props) { +function HighWork(props) { const [info, setInfo] = useState({}); const getData = async () => { @@ -141,4 +141,4 @@ function View(props) { ); } -export default Connect([NS_BI_MARK_INFO], true)(View); +export default Connect([NS_BI_MARK_INFO], true)(HighWork); diff --git a/src/pages/Container/Map/components/Content/modal/HoistingWork/index.js b/src/pages/Container/Map/components/Content/modal/HoistingWork/index.js index 2bc6858..5fe19d9 100644 --- a/src/pages/Container/Map/components/Content/modal/HoistingWork/index.js +++ b/src/pages/Container/Map/components/Content/modal/HoistingWork/index.js @@ -9,7 +9,7 @@ import OpinionSign from "../eightWordPubilc/OpinionSign"; import SafetyMeasures from "../eightWordPubilc/SafetyMeasures"; import "../eightWordPubilc/index.less"; -function View(props) { +function HoistingWork(props) { const [info, setInfo] = useState({}); const getData = async () => { @@ -153,4 +153,4 @@ function View(props) { ); } -export default Connect([NS_BI_MARK_INFO], true)(View); +export default Connect([NS_BI_MARK_INFO], true)(HoistingWork); diff --git a/src/pages/Container/Map/components/Content/modal/HotWork/index.js b/src/pages/Container/Map/components/Content/modal/HotWork/index.js index 67be2b9..479414b 100644 --- a/src/pages/Container/Map/components/Content/modal/HotWork/index.js +++ b/src/pages/Container/Map/components/Content/modal/HotWork/index.js @@ -7,7 +7,7 @@ import { NS_BI_MARK_INFO } from "~/enumerate/namespace"; import SafetyMeasures from "../eightWordPubilc/SafetyMeasures"; import "../eightWordPubilc/index.less"; -function View(props) { +function HotWork(props) { const [info, setInfo] = useState({}); const [delayedMonitoringRecord, setDelayedMonitoringRecord] = useState([]); const [gasMonitoringRecord, setGasMonitoringRecord] = useState([]); @@ -200,4 +200,4 @@ function View(props) { ); } -export default Connect([NS_BI_MARK_INFO], true)(View); +export default Connect([NS_BI_MARK_INFO], true)(HotWork); diff --git a/src/pages/Container/Map/components/Content/modal/index.js b/src/pages/Container/Map/components/Content/modal/index.js index 87757f4..d1f514a 100644 --- a/src/pages/Container/Map/components/Content/modal/index.js +++ b/src/pages/Container/Map/components/Content/modal/index.js @@ -15,7 +15,9 @@ import FireWaterSource from "./FireWaterSource"; import HighWork from "./HighWork"; import HoistingWork from "./HoistingWork"; import HotWork from "./HotWork"; +import KeyProject from "./KeyProject"; import MeteorologicalMonitoring from "./MeteorologicalMonitoring"; +import VideoPlay from "./VideoPlay"; const CustomModal = () => { const { modalVisible, modalData, actions } = useContext(Context); @@ -38,6 +40,9 @@ const CustomModal = () => { breakground_work: , // 动土作业 hoisting_work: , // 吊装作业 blindboard_work: , // 盲板抽堵作业 + keyProject: , // 重点工程定位 + video: , // 重点工程-视频定位 + platCamera: , // 视频巡屏-摄像头 }[markType]; }; diff --git a/src/pages/Container/Map/js/context.js b/src/pages/Container/Map/js/context.js index cc80b88..9abcb0d 100644 --- a/src/pages/Container/Map/js/context.js +++ b/src/pages/Container/Map/js/context.js @@ -7,7 +7,7 @@ export const initialMapState = { coverMaskVisible: false, currentPort: "", currentBranchOffice: "", - portArea: 1, + portArea: "", bottomUtilsCurrentIndex: "", pureMap: false, headerTitle: "秦港股份安全监管平台", diff --git a/src/pages/Container/Map/js/mapMethods.js b/src/pages/Container/Map/js/mapMethods.js index 4cc562d..120b5d9 100644 --- a/src/pages/Container/Map/js/mapMethods.js +++ b/src/pages/Container/Map/js/mapMethods.js @@ -129,7 +129,7 @@ export default function useMapMethods(viewerRef, request) { }; // 添加分公司点 - const addBranchOfficePoint = async (portArea = 1, pointInfo = null) => { + const addBranchOfficePoint = async (portArea = "", pointInfo = null) => { const { data = [] } = await request.getCorpInfoListAll({ eqPortArea: portArea, inType: [0, 1, 2, 6] }); mitt.emit(changeCoverMaskVisibleMittKey, true); let branchOfficePoint = [];