From 3114c1c6f1036d0437341b2ac49db557c5f8f413 Mon Sep 17 00:00:00 2001 From: sanguu Date: Tue, 20 Sep 2022 17:03:16 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=ED=98=84=ED=99=A9(=EA=B2=80=EC=83=89=EB=82=A0=EC=A7=9C=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=EC=88=98=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/history/AnalysisHistorySearch.js | 27 ++++++++----------- .../history/AnalysisHistoryContainer.js | 14 +++++++++- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/components/analysis/history/AnalysisHistorySearch.js b/src/components/analysis/history/AnalysisHistorySearch.js index 30d23c1d..61553e8b 100644 --- a/src/components/analysis/history/AnalysisHistorySearch.js +++ b/src/components/analysis/history/AnalysisHistorySearch.js @@ -13,20 +13,15 @@ import { } from 'reactstrap'; export const AnalysisHistorySearch = props => { - const [isClick, setIsClick] = useState(1); - const [dateType, setDateType] = useState(1); + useEffect(() => { props.setParams({ ...props.params, - stDate: moment().subtract(dateType, 'day').format('YYYY-MM-DD') + stDate: moment().subtract(props.dateType, 'day').format('YYYY-MM-DD') }); - }, [dateType,props.params.groupId]); + }, [props.dateType,props.params.groupId]); - const handlerClickDate = val => { - setDateType(val); - setIsClick(val); - }; @@ -89,32 +84,32 @@ export const AnalysisHistorySearch = props => { diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js index c55aa4ab..c56b0a7a 100644 --- a/src/containers/analysis/history/AnalysisHistoryContainer.js +++ b/src/containers/analysis/history/AnalysisHistoryContainer.js @@ -35,6 +35,10 @@ export const AnalysisHistoryContainer = props => { const { joinList, joinListCount } = useSelector(state => state.groupState); const { user } = useSelector(state => state.authState, shallowEqual); + const [isClick, setIsClick] = useState(1); + const [dateType, setDateType] = useState(1); + + const handleGroupSelect = ({ groupId, groupNm, groupAuthCd }) => { // 권한 상관 없이 모두 조회 가능 const param = searchData; @@ -247,10 +251,15 @@ export const AnalysisHistoryContainer = props => { stDate: moment(val[0]).format('YYYY-MM-DD'), endDate: moment(val[1]).format('YYYY-MM-DD'), }); - + setIsClick(0) } } }; + const handlerClickDate = val => { + setDateType(val); + setIsClick(val); + }; + return ( @@ -274,6 +283,9 @@ export const AnalysisHistoryContainer = props => { params={params} onKeyPress={onKeyPress} setParams={setParams} + isClick={isClick} + dateType={dateType} + handlerClickDate={handlerClickDate} />