diff --git a/client/src/components/timeline.js b/client/src/components/timeline.js index 55edce2..fb8636e 100644 --- a/client/src/components/timeline.js +++ b/client/src/components/timeline.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import "../style/timeline.css"; import { Chrono } from "react-chrono"; -import { Row, Col, Select, Button, Divider, Card, Typography, Image, Spin } from "antd"; +import { Row, Col, Select, Button, Divider, Card, Typography, Image, Spin, Pagination } from "antd"; import axios from 'axios'; import instance from "../module/instance"; @@ -33,21 +33,26 @@ const Timeline = () => { return dateA > dateB ? 1 : -1; }; + const getData = async () => { let nums = [] + let datas = [] + let cinfos = [] + if (yearval === '2019') { setdata([]) await instance.get('/cluster') - .then(response => { - let ordered = [] - ordered = response.data.clusterInfo - ordered.sort(date_ascending) - setcInfo(ordered) - ordered.map(x=>nums.push(x.cId)) + .then(response => { + let ordered = []; + ordered = response.data.clusterInfo; + ordered.sort(date_ascending); + setcInfo(ordered); + ordered.map(x => nums.push(x.cId)); + cinfos = ordered; }) // SUCCESS .catch(response => { console.log(response) }); // ERROR @@ -55,7 +60,7 @@ const Timeline = () => { setdata([]) } - console.log(nums) + console.log(cinfos) const results = nums.reduce((prevPrms, num) => ( prevPrms.then(async prevRes => { @@ -65,32 +70,32 @@ const Timeline = () => { ), Promise.resolve([])) results.then(response => { - console.log(response) + + // temp=response + // temp.map((x)=>datas.push(x)) setdata(response) }) - // await instance.get('/news/?cId=' + i) - // .then(response => { setdata(data => [...data, response.data.newsInfo]) }) // SUCCESS - // .catch(response => { console.log(response) }); // ERROR - - - } useEffect(() => { getData() - }, [yearval]); + useEffect(() => { + SetData() + }, [data]); + useEffect(() => { - data.length>0? setbtndisable(false):setbtndisable(true) + data.length > 0 ? setbtndisable(false) : setbtndisable(true) }, [data]); const SetData = () => { + console.log('change') if (yearval !== '0') { console.log(data) @@ -109,7 +114,7 @@ const Timeline = () => { title: temptitle, img: cloud, articles: data[i].data.newsInfo, - date:date + date: date }; tempitem.push(temp); @@ -150,7 +155,7 @@ const Timeline = () => { {/*