Browse Source

비행 이력 현황(날짜 버그 수정)

pull/2/head
sanguu 2 years ago
parent
commit
f024bc5542
  1. 12
      src/components/analysis/history/AnalysisHistorySearch.js
  2. 6
      src/containers/analysis/history/AnalysisHistoryContainer.js

12
src/components/analysis/history/AnalysisHistorySearch.js

@ -15,7 +15,8 @@ import {
export const AnalysisHistorySearch = props => { export const AnalysisHistorySearch = props => {
useEffect(() => { useEffect(() => {
if(props.isClick!=0){ if (props.isClick != -1) {
props.setParams({ props.setParams({
...props.params, ...props.params,
stDate: moment().subtract(props.dateType, 'day').format('YYYY-MM-DD'), stDate: moment().subtract(props.dateType, 'day').format('YYYY-MM-DD'),
@ -23,14 +24,7 @@ export const AnalysisHistorySearch = props => {
groupId: props.searchData.groupId groupId: props.searchData.groupId
}); });
} }
else{
props.setParams({
...props.params,
stDate: '',
endDate: '',
groupId: props.searchData.groupId
});
}
}, [props.dateType, props.isClick]); }, [props.dateType, props.isClick]);

6
src/containers/analysis/history/AnalysisHistoryContainer.js

@ -26,8 +26,8 @@ export const AnalysisHistoryContainer = props => {
state => state.analysisHistoryState state => state.analysisHistoryState
); );
const initSearchData = { const initSearchData = {
stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'), //stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'),
endDate: moment().subtract(0, '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'), // 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'), // endDate: moment().set({ 'h': 23, 'm': 59, 's': 59 }).format('YYYY-MM-DD HH:mm:ss'),
groupId: '' groupId: ''
@ -42,7 +42,7 @@ export const AnalysisHistoryContainer = props => {
const { joinList, joinListCount } = useSelector(state => state.groupState); const { joinList, joinListCount } = useSelector(state => state.groupState);
const { user } = useSelector(state => state.authState, shallowEqual); const { user } = useSelector(state => state.authState, shallowEqual);
const [isClick, setIsClick] = useState(0); const [isClick, setIsClick] = useState(-1);
const [dateType, setDateType] = useState(1); const [dateType, setDateType] = useState(1);
const [modal, setModal] = useState({ const [modal, setModal] = useState({

Loading…
Cancel
Save