From 9976fa6b77f39a2e088f1742a3f62864a3c1513a Mon Sep 17 00:00:00 2001 From: xingjx Date: Thu, 4 Jan 2024 22:53:35 +0800 Subject: [PATCH] =?UTF-8?q?fix():bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingBusinessAly/CarTypeAly/loadable.jsx | 7 +++---- .../ParkingBusinessAly/NightParkStat/loadable.jsx | 7 +++---- .../ParkingBusinessAly/ParkTurnoverAly/loadable.jsx | 7 +++---- .../ParkingBusinessAly/ParkUsageAly/loadable.jsx | 7 +++---- .../ParkingBusinessAly/ParkingAlyDuration/loadable.jsx | 7 +++---- .../ParkingBusinessAly/ParkingAlyOverview/loadable.jsx | 7 +++---- .../ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx | 7 +++---- .../ParkingBusinessAly/ParkingAlyReport/loadable.jsx | 7 +++---- .../ParkingBusinessAly/ParkingLiveData/loadable.jsx | 7 +++---- .../ParkingBusinessAly/TemporaryParkStat/loadable.jsx | 7 +++---- .../OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx | 2 +- 11 files changed, 31 insertions(+), 41 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx index 7e26989..0dd664f 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx @@ -77,17 +77,16 @@ function CarTypeAly() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) useEffect(() => { getSelectList(); @@ -377,7 +376,7 @@ function CarTypeAly() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx index 47a26cb..4e68858 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx @@ -119,17 +119,16 @@ function NightParkStat() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) useEffect(() => { getSelectList(); @@ -312,7 +311,7 @@ function NightParkStat() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx index 3df2f68..d50677b 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx @@ -103,17 +103,16 @@ function ParkTurnoverAly() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) useEffect(() => { getSelectList(); @@ -345,7 +344,7 @@ function ParkTurnoverAly() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx index 2142b4c..7848b36 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx @@ -102,17 +102,16 @@ function ParkUsageAly() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) useEffect(() => { getSelectList(); @@ -290,7 +289,7 @@ function ParkUsageAly() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx index 60d3529..41bc28f 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx @@ -245,17 +245,16 @@ function ParkingAlyDuration() { // getData() // }, [pageInfo]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) useEffect(() => { getSelectList(); @@ -619,7 +618,7 @@ function ParkingAlyDuration() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx index 0754890..f158149 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx @@ -96,17 +96,16 @@ function ParkingAlyOverview() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) const [tabKey, setTabKey] = useState("1"); const columns = [ @@ -429,7 +428,7 @@ function ParkingAlyOverview() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx index aeb1d17..2ae89b4 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx @@ -75,17 +75,16 @@ function ParkingAlyPeriod() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) useEffect(() => { getSelectList(); @@ -423,7 +422,7 @@ function ParkingAlyPeriod() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx index 6d4e1da..5910f9a 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx @@ -82,17 +82,16 @@ function ParkingAlyReport() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) const columns = [ { @@ -256,7 +255,7 @@ function ParkingAlyReport() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx index 2767bc3..d829876 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx @@ -78,17 +78,16 @@ function ParkingLiveData() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) useEffect(() => { getSelectList(); @@ -355,7 +354,7 @@ function ParkingLiveData() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx index 9ea5e2a..42e3d6f 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx @@ -78,17 +78,16 @@ function TemporaryParkStat() { } }, [isAjax]) useEffect(() => { - if (show.length > 0) { + if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, - show: show + show: show.length > 0 ? show : [] }) } else { setSessionTabList({ ...formData, }) } - }, [formData, show]) useEffect(() => { getSelectList(); @@ -290,7 +289,7 @@ function TemporaryParkStat() { ...formData, area_id: '', }); - setShow(''); + setShow(1); return } let last = option[option.length - 1]; diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx index 1783a66..595ce44 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx @@ -61,7 +61,7 @@ function ConfigParking(props) { { label: "计费规则管理", key: "8", - children: , + children: , }, { label: "收费员管理",