diff --git a/src/components/analysis/history/AnalysisHistorySearch.js b/src/components/analysis/history/AnalysisHistorySearch.js index f38f970..e6a618d 100644 --- a/src/components/analysis/history/AnalysisHistorySearch.js +++ b/src/components/analysis/history/AnalysisHistorySearch.js @@ -13,25 +13,19 @@ import { } from 'reactstrap'; export const AnalysisHistorySearch = props => { - + useEffect(() => { - if(props.isClick!=0){ - props.setParams({ - ...props.params, - stDate: moment().subtract(props.dateType, 'day').format('YYYY-MM-DD'), - endDate: moment().subtract(0, 'day').format('YYYY-MM-DD'), - groupId: props.searchData.groupId - }); - } - else{ + if (props.isClick != -1) { + props.setParams({ ...props.params, - stDate: '', - endDate: '', + stDate: moment().subtract(props.dateType, 'day').format('YYYY-MM-DD'), + endDate: moment().subtract(0, 'day').format('YYYY-MM-DD'), groupId: props.searchData.groupId }); } - }, [props.dateType,props.isClick]); + + }, [props.dateType, props.isClick]); return ( diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js index 43a6a58..dc2accb 100644 --- a/src/containers/analysis/history/AnalysisHistoryContainer.js +++ b/src/containers/analysis/history/AnalysisHistoryContainer.js @@ -26,8 +26,8 @@ export const AnalysisHistoryContainer = props => { state => state.analysisHistoryState ); const initSearchData = { - stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'), - endDate: moment().subtract(0, 'day').format('YYYY-MM-DD'), + //stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'), + //endDate: moment().subtract(0, 'day').format('YYYY-MM-DD'), // stDate: moment().set({ 'date': 1, 'h': 0, 'm': 0, 's': 0 }).format('YYYY-MM-DD HH:mm:ss'), // endDate: moment().set({ 'h': 23, 'm': 59, 's': 59 }).format('YYYY-MM-DD HH:mm:ss'), groupId: '' @@ -42,7 +42,7 @@ export const AnalysisHistoryContainer = props => { const { joinList, joinListCount } = useSelector(state => state.groupState); const { user } = useSelector(state => state.authState, shallowEqual); - const [isClick, setIsClick] = useState(0); + const [isClick, setIsClick] = useState(-1); const [dateType, setDateType] = useState(1); const [modal, setModal] = useState({