bug:20310

master
LiuJiaNan 2026-08-18 11:36:52 +08:00
parent b9ad0d8d44
commit 4bc3b5c80f
4 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,17 @@
import { Descriptions } from "antd";
function Person(props) {
return (
<Descriptions
column={1}
bordered
items={[
{ label: "姓名", children: props.data.staffName },
{ label: "定位卡号", children: props.data.staffNo },
{ label: "公司", children: props.data.corpinfoName },
]}
/>
);
}
export default Person;

View File

@ -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: <Gate id={modalData.id} />, // 门口门禁-车辆闸机
HGKM_MKMJ_GATE_TYPE_PERSON: <Gate id={modalData.id} />, // 门口门禁-人员闸机
doorCamera: <DoorCamera id={modalData.id} />, // 门口门禁-摄像头
peoplePosition: <Person data={modalData} />, // 人员定位
person: <Person data={modalData} />, // 封闭区域-人员
}[markType];
};

View File

@ -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 },
},
});
};

View File

@ -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。