diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss index d6ac85c..6e47301 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss @@ -47,13 +47,13 @@ $color-primary : var(--color-primary); justify-content: center; align-items: flex-start; color: #ffffff; - z-index: 1000; + z-index: 900; background: url("../../../assets/images/equip/home/pvhome_header.png") no-repeat; cursor: pointer; } .input_h { - z-index: 1000; + z-index: 900; position: absolute; top: 90px; left: 380px; @@ -83,7 +83,7 @@ $color-primary : var(--color-primary); } .select_modals { - z-index: 1000; + z-index: 900; position: absolute; top: 133px; left: 380px; @@ -149,7 +149,7 @@ $color-primary : var(--color-primary); } .show_c { - z-index: 1000; + z-index: 900; position: absolute; top: 70px; left: 749px; @@ -204,7 +204,7 @@ $color-primary : var(--color-primary); } .left_content { - z-index: 1000; + z-index: 900; position: absolute; top: 44px; left: 100px; @@ -254,7 +254,7 @@ $color-primary : var(--color-primary); } .left_home { - z-index: 1000; + z-index: 900; position: absolute; top: 90px; left: 50px; @@ -322,7 +322,7 @@ $color-primary : var(--color-primary); .right_ssdf { width: 168px; height: 270px; - z-index: 1000; + z-index: 900; position: absolute; bottom: 38px; @@ -408,7 +408,7 @@ $color-primary : var(--color-primary); } .r_xd { - z-index: 1000; + z-index: 900; width: max-content; height: 30px; position: absolute; @@ -419,7 +419,7 @@ $color-primary : var(--color-primary); } .r_xld { - z-index: 1000; + z-index: 900; width: 30px; height: 30px; position: absolute; @@ -451,7 +451,7 @@ $color-primary : var(--color-primary); } .right_home { - z-index: 1001; + z-index: 901; position: absolute; top: 90px; right: 50px; @@ -654,7 +654,7 @@ $color-primary : var(--color-primary); } .pk_footer { - z-index: 1000; + z-index: 900; position: absolute; bottom: 0%; width: 100%; diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 8faf02d..5b00585 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -60,7 +60,6 @@ const ParkingOverview = connect(function mapStateToProps(state) { }; })((props) => { const navigate = useNavigate(); - let selectedIndex = ""; let hoveredIndex = ""; //地图数据展示is const MapS = [ @@ -877,6 +876,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { // 从 option.series 中读取重新渲染扇形所需的参数,将是否选中取反。 // 准备重新渲染扇形所需的参数 let option = RightTwo; + console.log(option); let isSelected; let isHovered; let startRatio; @@ -943,6 +943,35 @@ const ParkingOverview = connect(function mapStateToProps(state) { setRightTwo(option); } }, + globalout: (params) => { + // 从 option.series 中读取重新渲染扇形所需的参数,将是否选中取反。 + // 准备重新渲染扇形所需的参数 + let option = RightTwo; + if (hoveredIndex !== "") { + // 从 option.series 中读取重新渲染扇形所需的参数,将是否高亮设置为 true。 + let isSelected = option.series[hoveredIndex].pieStatus.selected; + let isHovered = false; + let k = option.series[hoveredIndex].pieStatus.k; + let startRatio = option.series[hoveredIndex].pieData.startRatio; + let endRatio = option.series[hoveredIndex].pieData.endRatio; + + // 对当前点击的扇形,执行取消高亮操作(对 option 更新) + option.series[hoveredIndex].parametricEquation = getParametricEquation( + startRatio, + endRatio, + isSelected, + isHovered, + k, + option.series[hoveredIndex].pieData.value + ); + option.series[hoveredIndex].pieStatus.hovered = isHovered; + + // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空 + hoveredIndex = ""; + } + // 使用更新后的 option,渲染图表 + setRightTwo(option); + }, // 其他事件处理程序也可以在这里添加 }; const getRingOption = ( @@ -2025,7 +2054,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { ) : (