diff --git a/src/pages/Container/Map/components/Content/modal/Person/index.js b/src/pages/Container/Map/components/Content/modal/Person/index.js new file mode 100644 index 0000000..03f9725 --- /dev/null +++ b/src/pages/Container/Map/components/Content/modal/Person/index.js @@ -0,0 +1,17 @@ +import { Descriptions } from "antd"; + +function Person(props) { + return ( + + ); +} + +export default Person; diff --git a/src/pages/Container/Map/components/Content/modal/index.js b/src/pages/Container/Map/components/Content/modal/index.js index 79a26f6..ed31fa7 100644 --- a/src/pages/Container/Map/components/Content/modal/index.js +++ b/src/pages/Container/Map/components/Content/modal/index.js @@ -21,6 +21,7 @@ import HoistingWork from "./HoistingWork"; import HotWork from "./HotWork"; import KeyProject from "./KeyProject"; import MeteorologicalMonitoring from "./MeteorologicalMonitoring"; +import Person from "./Person"; import VideoPlay from "./VideoPlay"; const CustomModal = () => { @@ -51,6 +52,8 @@ const CustomModal = () => { HGKM_MKMJ_GATE_TYPE_CAR: , // 门口门禁-车辆闸机 HGKM_MKMJ_GATE_TYPE_PERSON: , // 门口门禁-人员闸机 doorCamera: , // 门口门禁-摄像头 + peoplePosition: , // 人员定位 + person: , // 封闭区域-人员 }[markType]; }; diff --git a/src/pages/Container/Map/js/useMapMethods.js b/src/pages/Container/Map/js/useMapMethods.js index 3d94036..0ea53fc 100644 --- a/src/pages/Container/Map/js/useMapMethods.js +++ b/src/pages/Container/Map/js/useMapMethods.js @@ -519,7 +519,7 @@ export default function useMapMethods(viewerRef, request) { name: point.name || point.id, }), monitorItems: { - data: { ...clonePoint, markType: `标记点_${options.markType}`, isShowModal: options.isShowModal ?? true }, + data: { ...clonePoint, markType: `标记点_${options.markType}`, title: options.title, isShowModal: options.isShowModal ?? true }, }, }); }; diff --git a/src/pages/Container/Map/js/usePeoplePosition.js b/src/pages/Container/Map/js/usePeoplePosition.js index 5a991b1..26477c5 100644 --- a/src/pages/Container/Map/js/usePeoplePosition.js +++ b/src/pages/Container/Map/js/usePeoplePosition.js @@ -58,7 +58,7 @@ export default function usePeoplePosition(mapMethods, currentBranchOffice, portA icon_type: pointColor, }; points.current.push(perLoc); - mapMethods.current && (await mapMethods.current.addPeoplePoint(perLoc, { markType, isShowModal: false })); + mapMethods.current && (await mapMethods.current.addPeoplePoint(perLoc, { markType, title: "人员定位信息" })); } } // 将已去重的实时人员列表同步给轨迹筛选面板,避免面板直接依赖 WebSocket。