diff --git a/web/src/views/HandDevice/Home/components/HistoricalCurve.vue b/web/src/views/HandDevice/Home/components/HistoricalCurve.vue index cdeffb3..d4dc7ab 100644 --- a/web/src/views/HandDevice/Home/components/HistoricalCurve.vue +++ b/web/src/views/HandDevice/Home/components/HistoricalCurve.vue @@ -97,6 +97,7 @@ async function getData(row: MarkerData) { ...item, timeStr: dayjs(item.ts).format('YYYY-MM-DD HH:mm:ss') })) + console.log(historicalData.value) } catch (error) { // ElMessage.error(error.message) } finally { diff --git a/web/src/views/HandDevice/Home/components/OpenLayerMap.vue b/web/src/views/HandDevice/Home/components/OpenLayerMap.vue index 6b4f5cf..029c8fb 100644 --- a/web/src/views/HandDevice/Home/components/OpenLayerMap.vue +++ b/web/src/views/HandDevice/Home/components/OpenLayerMap.vue @@ -96,7 +96,7 @@ const { toggleFenceDrawing, clearFenceDrawLayer, updateMarkers, - refreshMarkerStyles + } = useMapServices() const { @@ -125,7 +125,8 @@ const toggleTrajectories = () => { showTrajectoriesStatus.value = !showTrajectoriesStatus.value // console.log(showTrajectoriesStatus.value, props.markers); if (showTrajectoriesStatus.value) { - setTrajectoriesVisible(showTrajectoriesStatus.value, []) + setTrajectoriesVisible(showTrajectoriesStatus.value) + } } @@ -165,7 +166,7 @@ const init = () => { // 设置初始显示状态 setMarkersVisible(showMarkers.value) - setTrajectoriesVisible(showTrajectoriesStatus.value, []) + setTrajectoriesVisible(showTrajectoriesStatus.value) setFencesVisible(showFences.value) // 设置事件监听器,打开弹窗,点击设备 marker 时触发 @@ -185,7 +186,7 @@ const init = () => { console.log('onZoomEnd', zoom) services.markerService?.createMarkerLayer(props) } - // refreshMarkerStyles + } ) // 设置轨迹监听器 @@ -201,8 +202,6 @@ const init = () => { setTrajectoriesVisible, setFencesVisible, toggleFenceDrawing, - - markers: props.markers || [] }) setupAllWatchers() @@ -268,10 +267,14 @@ const showTrajectory = (startTime: number, endTime: number, markers: MarkerData[ }) ]) services.mapService?.fitToMarkers(latLng) + + services.trajectoryService?.setTrajectoryData(markers) showTrajectoriesStatus.value = true + setTrajectoriesVisible(true) + console.log('showTrajectory', latLng) - setTrajectoriesVisible(true, markers) + } } diff --git a/web/src/views/HandDevice/Home/components/TopPanel.vue b/web/src/views/HandDevice/Home/components/TopPanel.vue index 1f8763c..502ad40 100644 --- a/web/src/views/HandDevice/Home/components/TopPanel.vue +++ b/web/src/views/HandDevice/Home/components/TopPanel.vue @@ -12,17 +12,17 @@ 台 -->