From d83267108233567d483053f5de9bb48ce84f1870 Mon Sep 17 00:00:00 2001 From: chenqiang Date: Tue, 2 Jan 2024 16:58:21 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=91=A8=E8=BD=AC=E7=8E=87=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingOverview/index.scss | 4 +- .../ParkingOverview/loadable.jsx | 70 +++++++++++++--------- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss index 6931230..1a59baa 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss @@ -531,7 +531,7 @@ $color-primary : var(--color-primary); .tfff { display: flex; flex-direction: column; - justify-content: space-between; + // justify-content: space-between; } .fsagsxf { @@ -543,7 +543,7 @@ $color-primary : var(--color-primary); .topcarlv { display: flex; - justify-content: space-between; + justify-content: space-around; padding: 0 20px; .tpph { diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 570c554..764b4de 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -1743,7 +1743,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { GetRevenueAnalysis(RoadSelect, "1"); if (CarRoad[CarShow]?.type == 2) { setRoadturn(true); - GetrateRank("1"); + GetrateRank(RoadSelect, "1"); GetincomeType(RoadSelect, "1"); GetOverviewData(RoadSelect); } else { @@ -2135,7 +2135,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { ? "实时收入占比" : RoadSelect == "2" ? "路段收费率排行榜" - : "路段周转TOP3"} + : "车场周转率TOP3"} {CarRoad[CarShow]?.type != 2 ? ( @@ -2160,33 +2160,45 @@ const ParkingOverview = connect(function mapStateToProps(state) { {CarRoad[CarShow]?.type == 1 ? (
-
- {/* */} - TOP2 -

- {RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[1]?.rate || 0} -

-
{Cartop[1]?.name || ""}
-
-
- {/* */} - TOP1 -

- {RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[0]?.rate || 0} -

-
{Cartop[0]?.name || ""}
-
-
- {/* */} - TOP3 -

- {RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[2]?.rate || 0} -

-
{Cartop[2]?.name || ""}
-
+ {Cartop[1]?.name && ( +
+ {/* */} + TOP2 +

+ {RoadSelect == 3 ? "周转率" : "收费率"} + {Cartop[1]?.rate || 0} +

+
+ {Cartop[1]?.name || ""} +
+
+ )} + {Cartop[0]?.name && ( +
+ {/* */} + TOP1 +

+ {RoadSelect == 3 ? "周转率" : "收费率"} + {Cartop[0]?.rate || 0} +

+
+ {Cartop[0]?.name || ""} +
+
+ )} + {Cartop[2]?.name && ( +
+ {/* */} + TOP3 +

+ {RoadSelect == 3 ? "周转率" : "收费率"} + {Cartop[2]?.rate || 0} +

+
+ {Cartop[2]?.name || ""} +
+
+ )}
) : (