diff --git a/src/assets/images/equip/home/lb.png b/src/assets/images/equip/home/lb.png new file mode 100644 index 0000000..44f3877 Binary files /dev/null and b/src/assets/images/equip/home/lb.png differ diff --git a/src/assets/images/equip/home/nd.png b/src/assets/images/equip/home/nd.png new file mode 100644 index 0000000..02a75c8 Binary files /dev/null and b/src/assets/images/equip/home/nd.png differ diff --git a/src/assets/images/equip/home/nz.png b/src/assets/images/equip/home/nz.png new file mode 100644 index 0000000..3fb376d Binary files /dev/null and b/src/assets/images/equip/home/nz.png differ diff --git a/src/assets/images/equip/home/pvhome_header.png b/src/assets/images/equip/home/pvhome_header.png index f88e39a..868b801 100644 Binary files a/src/assets/images/equip/home/pvhome_header.png and b/src/assets/images/equip/home/pvhome_header.png differ diff --git a/src/assets/images/equip/home/pvhome_title.png b/src/assets/images/equip/home/pvhome_title.png index c63ea9c..e66cdab 100644 Binary files a/src/assets/images/equip/home/pvhome_title.png and b/src/assets/images/equip/home/pvhome_title.png differ diff --git a/src/assets/images/equip/home/rd.png b/src/assets/images/equip/home/rd.png new file mode 100644 index 0000000..5ed6e08 Binary files /dev/null and b/src/assets/images/equip/home/rd.png differ diff --git a/src/assets/images/equip/home/st.png b/src/assets/images/equip/home/st.png new file mode 100644 index 0000000..872822a Binary files /dev/null and b/src/assets/images/equip/home/st.png differ diff --git a/src/assets/images/equip/home/topr.png b/src/assets/images/equip/home/topr.png new file mode 100644 index 0000000..d90f920 Binary files /dev/null and b/src/assets/images/equip/home/topr.png differ diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss index 4f1e883..9a3feab 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss @@ -12,10 +12,10 @@ $color-primary : var(--color-primary); .pkh_title { display: flex; font-size: 16px; - padding: 6px 0 0 44px; align-items: center; width: 100%; - height: 50px; + padding: 0 0 0px 26px; + height: 40px; background: url("../../../assets/images/equip/home/pvhome_title.png"); i { @@ -55,36 +55,42 @@ $color-primary : var(--color-primary); .input_h { z-index: 1000; position: absolute; - top: 70px; + top: 90px; left: 380px; width: 340px; height: 34px; - background: #1e2635; - border: 1px solid #a9c6ff; + background: #01050e; + // border: 1px solid #a9c6ff; border-radius: 2px; display: flex; overflow: hidden; .serdd { - width: 18px; + width: 33px; height: 100%; + justify-content: center; + font-size: 22px; cursor: pointer; color: #A9C6FF; display: flex; z-index: 1001; align-items: center; } + + .ant-select:not(.ant-select-customize-input) .ant-select-selector { + border: none; + } } .select_modals { z-index: 1000; position: absolute; top: 133px; - left: 392px; + left: 380px; width: 340px; height: 414px; background: #01050e; - border: 1px solid #a9c6ff; + // border: 1px solid #a9c6ff; border-radius: 2px; display: flex; padding: 20px 18px 20px 20px; @@ -200,8 +206,8 @@ $color-primary : var(--color-primary); .left_content { z-index: 1000; position: absolute; - top: 22px; - left: 50px; + top: 44px; + left: 100px; display: flex; align-items: center; width: max-content; @@ -212,15 +218,16 @@ $color-primary : var(--color-primary); display: flex; justify-content: center; align-items: center; - width: 50px; - height: 50px; - margin-right: 6px; + width: 40px; + height: 40px; + // margin-right: 6px; border-radius: 50%; - border: #127bfc 4px solid; + background: url("@/assets/images/equip/home/lb.png"); + // border: #75DDFF 4px solid; margin-bottom: 0%; - font-size: 20px; - color: #127bfc; - background: #01050e; + // font-size: 20px; + // color: #75DDFF; + // background: #01050e; } div { @@ -231,10 +238,10 @@ $color-primary : var(--color-primary); .left_home { z-index: 1000; position: absolute; - top: 70px; + top: 90px; left: 50px; width: 320px; - height: 89%; + height: 84%; background: #01050e; display: flex; flex-direction: column; @@ -397,8 +404,9 @@ $color-primary : var(--color-primary); width: 30px; height: 30px; position: absolute; - top: 20px; - right: 30px; + top: 10px; + background: url("../../../assets/images/equip/home/nz.png"); + right: 20px; cursor: pointer; .anticon { @@ -414,8 +422,8 @@ $color-primary : var(--color-primary); i { position: absolute; - right: 0; - top: 0; + right: -2px; + top: 9px; width: 10px; height: 10px; border-radius: 50%; @@ -426,10 +434,10 @@ $color-primary : var(--color-primary); .right_home { z-index: 1000; position: absolute; - top: 70px; + top: 90px; right: 50px; width: 320px; - height: 90%; + height: 87%; background: #01050e; display: flex; flex-direction: column; @@ -508,7 +516,7 @@ $color-primary : var(--color-primary); } p { - border: #127bfc 1px solid; + border: #75DDFF 1px solid; border-radius: 4px; font-size: 14px; text-align: center; @@ -577,19 +585,36 @@ $color-primary : var(--color-primary); // font-size: 18px; p { + width: 45px; + height: 28px; z-index: 1; - // border: #127bfc 1px solid; + // border: #75DDFF 1px solid; margin-bottom: 0%; padding: 2px; + + img { + position: absolute; + width: 100%; + left: 0; + // height: 100%; + } } - span { - width: 100%; - height: 100%; - position: absolute; - transform: skew(-20deg); + .sfy { + + padding: 0 0 0px 7px; + background: url("../../../assets/images/equip/home/topr.png") 100% 100%; + + } + + .dad { + font-size: 14px; + font-weight: 600; + padding-left: 6px; + white-space: nowrap; } + } .nor { @@ -839,7 +864,7 @@ $color-primary : var(--color-primary); cursor: pointer; p { - background: #127bfc; + background: #75DDFF; } } } diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 1402274..d2ad956 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -39,11 +39,11 @@ import "./index.scss"; import Btckd from "@/assets/images/equip/home/bottom_checked.png"; import Pkhl from "@/assets/images/equip/home/pkhome_left.png"; import Pkhr from "@/assets/images/equip/home/pkhome_right.png"; -import Lf1 from "@/assets/images/equip/home/left_1.png"; -import Lf2 from "@/assets/images/equip/home/left_2.png"; +import st from "@/assets/images/equip/home/st.png"; +import nd from "@/assets/images/equip/home/nd.png"; import Lf3 from "@/assets/images/equip/home/left_3.png"; import Lf4 from "@/assets/images/equip/home/left_4.png"; -import Lf5 from "@/assets/images/equip/home/left_5.png"; +import rd from "@/assets/images/equip/home/rd.png"; import Lf6 from "@/assets/images/equip/home/left_6.png"; import Lf7 from "@/assets/images/equip/home/left_7.png"; import Lf8 from "@/assets/images/equip/home/ldzs.png"; @@ -84,13 +84,15 @@ const ParkingOverview = connect(function mapStateToProps(state) { const cokd = [ { color: "rgba(234, 234, 33,.6)", - show: "", + img: st, }, { color: "rgba(222, 206, 206,.6)", + img: nd, }, { color: "rgba(203, 122, 41,.6)", + img: rd, }, ]; //右侧时间选择 @@ -727,7 +729,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { { // name: 'Access From', type: "pie", - radius: ["60%", "70%"], + radius: ["50%", "70%"], avoidLabelOverlap: false, label: { show: false, @@ -747,10 +749,10 @@ const ParkingOverview = connect(function mapStateToProps(state) { }, ], grid: { - x: 50, - y: 55, - x2: 70, - y2: 20, + x: 20, + y: 25, + x2: 20, + y2: 50, }, }); }; @@ -977,7 +979,11 @@ const ParkingOverview = connect(function mapStateToProps(state) { } }; crtimer.onclose = function () { - GetCar(); + try { + GetCar(); + } catch (error) { + console.log(error); + } }; }; //获取quyu @@ -1318,9 +1324,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { // onClick={() => { // navigate("/nav"); // }} - > - 西海岸新区停车信息管理平台 - + >
停车业务概览
@@ -1502,9 +1506,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { )} {
-

- -

+

{/* */}

{Text}
} @@ -1568,7 +1570,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { // } }} > - + {/* */} {HoShow ? : ""}
@@ -1600,18 +1602,20 @@ const ParkingOverview = connect(function mapStateToProps(state) { return (
-

No.{index + 1}

- +

+ {CarRoad[CarShow]?.type == 2 ? ( + `No.${index + 1}` + ) : cokd[index]?.img ? ( + + ) : ( + `No.${index + 1}` + )} +

{ele.name || "--"} - {}{" "} {CarRoad[CarShow]?.type == 2 ? ele.rate || 0 : `${ele.paid_amount || 0}元`} @@ -1620,6 +1624,7 @@ const ParkingOverview = connect(function mapStateToProps(state) {