diff --git a/labs/lab5/src/App.jsx b/labs/lab5/src/App.jsx index 6587242..f194b2d 100644 --- a/labs/lab5/src/App.jsx +++ b/labs/lab5/src/App.jsx @@ -4,14 +4,16 @@ import buildings from './data.js'; import './CSS/App.css' import Chart from './components/Chart.jsx' import Task from './Task.jsx' + + function App() { const [count, setCount] = useState(0) - + const [filteredData, setFilteredData] = useState(buildings); return (

Самые высокие здания и сооружения

- - + +
{/* */} ) diff --git a/labs/lab5/src/components/ChartDraw.jsx b/labs/lab5/src/components/ChartDraw.jsx index c7f5b26..dd7a8ea 100644 --- a/labs/lab5/src/components/ChartDraw.jsx +++ b/labs/lab5/src/components/ChartDraw.jsx @@ -6,7 +6,7 @@ function drawGraph(data, keyX, drawMin, drawMax, graphtype) { // значения по оси ОХ // создаем массив для построения графика - console.log(keyX) + // console.log(keyX) if(keyX=="Год"){ data = d3.sort(data, (x,y)=>Number(x["labelX"])-Number(y["labelX"])); } @@ -145,7 +145,7 @@ const ChartDraw = (props) => { .attr("width", boundsWidth) .attr("height", boundsHeight) .style("fill", "lightgrey"); - console.log(props) + // console.log(props) drawGraph(props.data,props.ox,props.minMax[0],props.minMax[1],Number(props.graphType)) }); diff --git a/labs/lab5/src/components/Table.jsx b/labs/lab5/src/components/Table.jsx index 364af6a..2cbf08d 100644 --- a/labs/lab5/src/components/Table.jsx +++ b/labs/lab5/src/components/Table.jsx @@ -13,7 +13,10 @@ const Table = (props) => { const [activePage, setActivePage] = useState("1"); const [dataTable, setDataTable] = useState(props.data); - const updateDataTable = (value) => setDataTable(value); + const updateDataTable = (value) => { + props.setFilteredDataCallback(value); + setDataTable(value); + }; const changeActive = (event) => { setActivePage(event.target.innerHTML);