diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js index 1f79fe9..43a6a58 100644 --- a/src/containers/analysis/history/AnalysisHistoryContainer.js +++ b/src/containers/analysis/history/AnalysisHistoryContainer.js @@ -240,32 +240,6 @@ export const AnalysisHistoryContainer = props => { search1: '', groupId: searchData.groupId }); -<<<<<<< HEAD -======= - - useEffect(() => { - setParams({ - ...params, - stDate: '', - endDate: '', - search1: '', - groupId: searchData.groupId - }); - }, [searchData.groupId]); - - - useEffect(() => { - if (data) return; - }, [searchParams]); - - const onKeyPress = e => { - if (e.key == 'Enter') { - handlerSearch(); - } - }; ->>>>>>> 7b04365e79a46f1e9cf6d47485e22c3241da7b01 - - // useEffect(() => { }, [params]); const handlerSearch = () => { if (!params.stDate || !params.endDate) {