From 57d2524f37872a4540fed5962204d7150a15b6c4 Mon Sep 17 00:00:00 2001 From: chenqiang Date: Fri, 1 Dec 2023 11:44:20 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E8=BD=A6=E5=9C=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MapComponets/ParkingViewMarkers/index.jsx | 42 ++++++++++++---------- .../ParkingOverview/loadable.jsx | 2 ++ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/components/MapComponets/ParkingViewMarkers/index.jsx b/src/components/MapComponets/ParkingViewMarkers/index.jsx index dde7a2b..d55c4b6 100644 --- a/src/components/MapComponets/ParkingViewMarkers/index.jsx +++ b/src/components/MapComponets/ParkingViewMarkers/index.jsx @@ -13,6 +13,7 @@ function Markers(props) { iconAnchor = [15, 20], // 图片偏移量 tooltipKey = "name", // 提示信息的key // contentCb, // 生成弹窗显示内容方法事件 + mover = false, clickCb, // 点击事件 } = props; var Mapmove = new AMap.Marker({ content: " ", map: map }); @@ -128,27 +129,30 @@ function Markers(props) { _massLayer.on("click", function (e) { clickCb(e.data.option); }); - _massLayer.on("mouseover", function (e) { - console.log(e); - Mapmove.setPosition(e.data.lnglat); - Mapmove.setLabel({ - content: `${e.data.name} (${e.data?.option?.userTotal}/${e.data?.option?.berthTotal})`, + if (mover) { + _massLayer.on("mouseover", function (e) { + console.log(e); + Mapmove.setPosition(e.data.lnglat); + Mapmove.setLabel({ + content: `${e.data.name} (${e.data?.option?.userTotal}/${e.data?.option?.berthTotal})`, + }); + // if (position) { + // Mapmove.setContent( + // '
' + + // position + + // '
' + + // "
" + // ); + // Mapmove.setPosition(position); + // // map.add(Mapmove); + // } }); - // if (position) { - // Mapmove.setContent( - // '
' + - // position + - // '
' + - // "
" - // ); - // Mapmove.setPosition(position); - // // map.add(Mapmove); - // } - }); - _massLayer.on("mouseout", function () { - // map.remove(Mapmove); - }); + _massLayer.on("mouseout", function () { + map.remove(Mapmove); + }); + } + // setMassLayer(_massLayer); _massLayer.setMap(map); }; diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 00a4c6f..f1d0acc 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -1064,6 +1064,7 @@ function ParkingOverview() { ); }; useEffect(() => { + setLeftCar(false); setDaySel("1"); setDaySet("1"); setDaySes("1"); @@ -1364,6 +1365,7 @@ function ParkingOverview() { iconAnchor={[15, 20]} // 图片偏移量 tooltipKey={"name"} // 提示信息的key // contentCb, // 生成弹窗显示内容方法事件 + mover={true} clickCb={(ele) => { ClickMap(ele); }} // 点击事件