diff --git a/src/components/map/MapComponent.tsx b/src/components/map/MapComponent.tsx index 2a6d993..7becc23 100644 --- a/src/components/map/MapComponent.tsx +++ b/src/components/map/MapComponent.tsx @@ -65,5 +65,5 @@ export default function MapContainer() { amap.setFitView(); }; - return
; + return
; } diff --git a/src/pages/user/move.tsx b/src/pages/user/move.tsx index 7161277..6e38a54 100644 --- a/src/pages/user/move.tsx +++ b/src/pages/user/move.tsx @@ -1,9 +1,11 @@ import MapContainer from "@/components/map/MapComponent"; import MapUtl from "@/components/map/mapUtil"; -import { Button, Modal } from "antd"; +import { Button, message, Modal } from "antd"; +import { inject, observer } from "mobx-react"; import { useState } from "react"; -const Move = () => { +const Move = (props) => { + const { usrStore, id } = props; const [isOpen, setOpen] = useState(false); return ( <> @@ -18,11 +20,13 @@ const Move = () => { { setOpen(false); }} @@ -32,7 +36,21 @@ const Move = () => { type="dashed" size="small" onClick={() => { - MapUtl.polyline([[116.478935,39.997761],[116.478939,39.997825],[116.478912,39.998549],[116.478912,39.998549],[116.478998,39.998555],[116.478998,39.998555],[116.479282,39.99856],[116.479658,39.998528],[116.480151,39.998453],[116.480784,39.998302],[116.480784,39.998302],[116.481149,39.998184],[116.481573,39.997997],[116.481863,39.997846],[116.482072,39.997718],[116.482362,39.997718],[116.483633,39.998935],[116.48367,39.998968],[116.484648,39.999861]]) + usrStore.getSite(id).then((res) => { + let data: any = []; + if (res.data && res.data.record) { + res.data.record.forEach((element) => { + data.push([element.long, element.lat]); + }); + if (data.length === 0) { + message.info("暂无轨迹数据"); + return; + } + if (data.length > 0) { + MapUtl.polyline(data); + } + } + }); }} > 查看轨迹信息 @@ -44,4 +62,6 @@ const Move = () => { ); }; -export default Move; + +// getSite +export default inject("usrStore")(observer(Move)); diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index b307a0c..7c0027d 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -113,7 +113,7 @@ const User = (props: Store) => { > 编辑 - +