mirror of
https://github.com/marking-hack/fronted.git
synced 2024-11-10 19:06:35 +03:00
add hack solve
This commit is contained in:
parent
c282491166
commit
115a205c12
1779
package-lock.json
generated
1779
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
@ -10,8 +10,13 @@
|
||||||
"@types/node": "^16.18.20",
|
"@types/node": "^16.18.20",
|
||||||
"@types/react": "^18.0.29",
|
"@types/react": "^18.0.29",
|
||||||
"@types/react-dom": "^18.0.11",
|
"@types/react-dom": "^18.0.11",
|
||||||
|
"antd": "^5.3.2",
|
||||||
|
"axios": "^1.3.4",
|
||||||
|
"chart.js": "^4.2.1",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
|
"react-chartjs-2": "^5.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
|
"react-router-dom": "^6.9.0",
|
||||||
"react-scripts": "5.0.1",
|
"react-scripts": "5.0.1",
|
||||||
"typescript": "^4.9.5",
|
"typescript": "^4.9.5",
|
||||||
"web-vitals": "^2.1.4"
|
"web-vitals": "^2.1.4"
|
||||||
|
|
38
src/App.css
38
src/App.css
|
@ -1,38 +0,0 @@
|
||||||
.App {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.App-logo {
|
|
||||||
height: 40vmin;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-reduced-motion: no-preference) {
|
|
||||||
.App-logo {
|
|
||||||
animation: App-logo-spin infinite 20s linear;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.App-header {
|
|
||||||
background-color: #282c34;
|
|
||||||
min-height: 100vh;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
font-size: calc(10px + 2vmin);
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.App-link {
|
|
||||||
color: #61dafb;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes App-logo-spin {
|
|
||||||
from {
|
|
||||||
transform: rotate(0deg);
|
|
||||||
}
|
|
||||||
to {
|
|
||||||
transform: rotate(360deg);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,9 +0,0 @@
|
||||||
import React from 'react';
|
|
||||||
import { render, screen } from '@testing-library/react';
|
|
||||||
import App from './App';
|
|
||||||
|
|
||||||
test('renders learn react link', () => {
|
|
||||||
render(<App />);
|
|
||||||
const linkElement = screen.getByText(/learn react/i);
|
|
||||||
expect(linkElement).toBeInTheDocument();
|
|
||||||
});
|
|
39
src/App.tsx
39
src/App.tsx
|
@ -1,24 +1,29 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import logo from './logo.svg';
|
import {RouterProvider} from 'react-router-dom'
|
||||||
import './App.css';
|
import {Tabs} from 'antd';
|
||||||
|
import { ShopList } from './pages/ShopList';
|
||||||
|
import router from './router';
|
||||||
|
import { Analytics } from './pages/Analytics';
|
||||||
|
import 'antd/dist/reset.css';
|
||||||
|
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
<div className="App">
|
<div className="App" style={{padding: 20}}>
|
||||||
<header className="App-header">
|
<Tabs
|
||||||
<img src={logo} className="App-logo" alt="logo" />
|
items={[
|
||||||
<p>
|
{
|
||||||
Edit <code>src/App.tsx</code> and save to reload.
|
'label': 'Магазины',
|
||||||
</p>
|
'key': '1',
|
||||||
<a
|
'children': <ShopList></ShopList>
|
||||||
className="App-link"
|
},
|
||||||
href="https://reactjs.org"
|
{
|
||||||
target="_blank"
|
'label': 'Аналитика',
|
||||||
rel="noopener noreferrer"
|
'key': '2',
|
||||||
>
|
'children': <Analytics></Analytics>
|
||||||
Learn React
|
}
|
||||||
</a>
|
]}
|
||||||
</header>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
83
src/client/index.tsx
Normal file
83
src/client/index.tsx
Normal file
|
@ -0,0 +1,83 @@
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
const origin = 'https://dev2.akarpov.ru/api/'
|
||||||
|
|
||||||
|
|
||||||
|
export const getShops = async () => {
|
||||||
|
const data = (await axios.get(origin + '?page=1&page_size=10')).data;
|
||||||
|
const products = {} as any
|
||||||
|
for (var i = 0; i < data.results.length; ++i) {
|
||||||
|
products[data.results[i].id_sp] = await getShopProducts(data.results[i].id_sp)
|
||||||
|
}
|
||||||
|
const shops = data.results.map((e: any) => {
|
||||||
|
return {
|
||||||
|
name: e.id_sp,
|
||||||
|
postal_code: e.postal_code,
|
||||||
|
products_amount: 10,
|
||||||
|
key: e.id_sp,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return {
|
||||||
|
shops, products
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getShopProducts = async (shop_id: string) => {
|
||||||
|
const data = (await axios.get(origin + shop_id + '?page=1&page_size=10')).data;
|
||||||
|
return data.results.map((e: any) => {
|
||||||
|
return {
|
||||||
|
name: e.name,
|
||||||
|
amount: e.current_amount,
|
||||||
|
key: e.gtin
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getRegions = async () => {
|
||||||
|
return (await axios.get(origin + 'regions/')).data;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getSales = async (region_id: number) => {
|
||||||
|
const data = (await axios.get(origin + 'regions/' + region_id.toString() + '/sales')).data;
|
||||||
|
var answer = {} as any;
|
||||||
|
data.map((e: any) => {
|
||||||
|
if (answer.hasOwnProperty(e.type_operation)) {
|
||||||
|
answer[e.type_operation] += e.cnt;
|
||||||
|
} else {
|
||||||
|
answer[e.type_operation] = e.cnt
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return answer;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getTransactions = async (region_id: number) => {
|
||||||
|
const data = (await axios.get(origin + 'regions/' + region_id.toString() + '/trsansactions')).data;
|
||||||
|
var answer = {} as any
|
||||||
|
data.map((e: any) => {
|
||||||
|
if (answer.hasOwnProperty(e.sender_region_code)) {
|
||||||
|
answer[e.sender_region_code] += e.cnt
|
||||||
|
} else {
|
||||||
|
answer[e.sender_region_code] = e.cnt
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return answer;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getPredict = async (shop_id: string, product_id: string) => {
|
||||||
|
const data = {
|
||||||
|
"date": "2023-03-26",
|
||||||
|
"shops": [
|
||||||
|
{
|
||||||
|
"id_sp": shop_id,
|
||||||
|
"items": [
|
||||||
|
product_id
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
const res = (await axios.post(
|
||||||
|
origin + 'predict',
|
||||||
|
data
|
||||||
|
)).data;
|
||||||
|
return res.shops[0].items[0].predicted_volume
|
||||||
|
}
|
60
src/elements/TheBar/index.tsx
Normal file
60
src/elements/TheBar/index.tsx
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
import React from 'react';
|
||||||
|
import {
|
||||||
|
Chart as ChartJS,
|
||||||
|
CategoryScale,
|
||||||
|
LinearScale,
|
||||||
|
BarElement,
|
||||||
|
Title,
|
||||||
|
Tooltip,
|
||||||
|
Legend,
|
||||||
|
} from 'chart.js';
|
||||||
|
import { Bar } from 'react-chartjs-2';
|
||||||
|
|
||||||
|
ChartJS.register(
|
||||||
|
CategoryScale,
|
||||||
|
LinearScale,
|
||||||
|
BarElement,
|
||||||
|
Title,
|
||||||
|
Tooltip,
|
||||||
|
Legend
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
interface ITheBar {
|
||||||
|
labels: string[],
|
||||||
|
prices: number[],
|
||||||
|
predictedPrices: number[]
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const TheBar: React.FC<ITheBar> = (props) => {
|
||||||
|
const options = {
|
||||||
|
responsive: true,
|
||||||
|
plugins: {
|
||||||
|
legend: {
|
||||||
|
position: 'top' as const,
|
||||||
|
},
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: 'Предсказание продаж',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const data = {
|
||||||
|
labels: props.labels,
|
||||||
|
datasets: [
|
||||||
|
{
|
||||||
|
label: 'Текущие продажи',
|
||||||
|
data: props.prices,
|
||||||
|
backgroundColor: 'rgba(255, 99, 132, 0.5)',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Предсказание продаж на месяц',
|
||||||
|
data: props.predictedPrices,
|
||||||
|
backgroundColor: 'rgba(53, 162, 235, 0.5)',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
return <Bar options={options} data={data} />;
|
||||||
|
}
|
|
@ -2,7 +2,6 @@ import React from 'react';
|
||||||
import ReactDOM from 'react-dom/client';
|
import ReactDOM from 'react-dom/client';
|
||||||
import './index.css';
|
import './index.css';
|
||||||
import App from './App';
|
import App from './App';
|
||||||
import reportWebVitals from './reportWebVitals';
|
|
||||||
|
|
||||||
const root = ReactDOM.createRoot(
|
const root = ReactDOM.createRoot(
|
||||||
document.getElementById('root') as HTMLElement
|
document.getElementById('root') as HTMLElement
|
||||||
|
@ -12,8 +11,3 @@ root.render(
|
||||||
<App />
|
<App />
|
||||||
</React.StrictMode>
|
</React.StrictMode>
|
||||||
);
|
);
|
||||||
|
|
||||||
// If you want to start measuring performance in your app, pass a function
|
|
||||||
// to log results (for example: reportWebVitals(console.log))
|
|
||||||
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
|
||||||
reportWebVitals();
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
|
|
Before Width: | Height: | Size: 2.6 KiB |
143
src/pages/Analytics/index.tsx
Normal file
143
src/pages/Analytics/index.tsx
Normal file
|
@ -0,0 +1,143 @@
|
||||||
|
import {
|
||||||
|
Chart as ChartJS,
|
||||||
|
CategoryScale,
|
||||||
|
LinearScale,
|
||||||
|
BarElement,
|
||||||
|
Title,
|
||||||
|
Tooltip,
|
||||||
|
Legend,
|
||||||
|
} from 'chart.js';import { Bar } from "react-chartjs-2";
|
||||||
|
import {Select} from 'antd';
|
||||||
|
|
||||||
|
import react from 'react'
|
||||||
|
import { getRegions, getSales, getTransactions } from '../../client';
|
||||||
|
|
||||||
|
ChartJS.register(
|
||||||
|
CategoryScale,
|
||||||
|
LinearScale,
|
||||||
|
BarElement,
|
||||||
|
Title,
|
||||||
|
Tooltip,
|
||||||
|
Legend
|
||||||
|
);
|
||||||
|
|
||||||
|
export const Analytics: react.FC = () => {
|
||||||
|
const fetched = react.useRef(false);
|
||||||
|
const [regions, setRegions] = react.useState([]);
|
||||||
|
const [options, setOptions] = react.useState([]);
|
||||||
|
const [sales, setSales] = react.useState([]);
|
||||||
|
const [transactionOptions, setTransactionOptions] = react.useState([]);
|
||||||
|
const [transaction, setTransactions] = react.useState([]);
|
||||||
|
|
||||||
|
var dataCirculation = {
|
||||||
|
labels: options,
|
||||||
|
datasets: [
|
||||||
|
{
|
||||||
|
label: '',
|
||||||
|
data: sales,
|
||||||
|
backgroundColor: ['rgba(255, 99, 132, 0.5)']
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
var optionsCirculation = {
|
||||||
|
responsive: true,
|
||||||
|
maintainAspectRatio: false,
|
||||||
|
scales: {
|
||||||
|
yAxes: [{
|
||||||
|
ticks: {
|
||||||
|
beginAtZero:true
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
},
|
||||||
|
plugins: {
|
||||||
|
title: {
|
||||||
|
text: 'Перемещение товара между участниками',
|
||||||
|
display: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var dataReplace = {
|
||||||
|
labels: transactionOptions,
|
||||||
|
datasets: [
|
||||||
|
{
|
||||||
|
label: '',
|
||||||
|
data: transaction,
|
||||||
|
backgroundColor: ['rgba(255, 99, 132, 0.5)']
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
var optionsReplace = {
|
||||||
|
responsive: true,
|
||||||
|
maintainAspectRatio: false,
|
||||||
|
scales: {
|
||||||
|
yAxes: [{
|
||||||
|
ticks: {
|
||||||
|
beginAtZero:true
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
},
|
||||||
|
plugins: {
|
||||||
|
title: {
|
||||||
|
text: 'Вывод товара из оборота',
|
||||||
|
display: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!fetched.current) {
|
||||||
|
fetched.current = true;
|
||||||
|
getRegions().then((e) => {
|
||||||
|
setRegions(e);
|
||||||
|
});
|
||||||
|
// getSales(1).then((e) => {
|
||||||
|
// var opts = [];
|
||||||
|
// var values = []
|
||||||
|
// for (var opt in e) {
|
||||||
|
// opts.push(opt);
|
||||||
|
// values.push(e[opt])
|
||||||
|
// }
|
||||||
|
// setOptions(opts as any);
|
||||||
|
// setSales(values as any);
|
||||||
|
// });
|
||||||
|
}
|
||||||
|
|
||||||
|
return <div className='chart__container'>
|
||||||
|
<Select style={{width: 400}} onSelect={(value) => {
|
||||||
|
getSales(value).then((e) => {
|
||||||
|
var opts = [];
|
||||||
|
var values = []
|
||||||
|
for (var opt in e) {
|
||||||
|
opts.push(opt);
|
||||||
|
values.push(e[opt])
|
||||||
|
}
|
||||||
|
setTransactionOptions(opts as any);
|
||||||
|
setTransactions(values as any);
|
||||||
|
});
|
||||||
|
getTransactions(value).then((e) => {
|
||||||
|
var opts = [];
|
||||||
|
var values = []
|
||||||
|
for (var opt in e) {
|
||||||
|
opts.push(opt);
|
||||||
|
values.push(e[opt])
|
||||||
|
}
|
||||||
|
setOptions(opts as any);
|
||||||
|
setSales(values as any);
|
||||||
|
})
|
||||||
|
}}>
|
||||||
|
{
|
||||||
|
regions.map((e: any) => {
|
||||||
|
return <Select.Option value={e.code}>
|
||||||
|
{e.name}
|
||||||
|
</Select.Option>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</Select>
|
||||||
|
<div style={{height: 400}}>
|
||||||
|
<Bar data={dataCirculation} options={optionsCirculation as any}></Bar>
|
||||||
|
</div>
|
||||||
|
<div style={{height: 400}}>
|
||||||
|
<Bar data={dataReplace} options={optionsReplace as any}></Bar>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
105
src/pages/ShopList/index.tsx
Normal file
105
src/pages/ShopList/index.tsx
Normal file
|
@ -0,0 +1,105 @@
|
||||||
|
import react, { useEffect, useState } from 'react'
|
||||||
|
import './style.css'
|
||||||
|
import {Table, Collapse, Input, Typography} from 'antd'
|
||||||
|
import {shopColumns, productColumns, productPredictionColumns} from './tableConfig'
|
||||||
|
import { getPredict, getShops } from '../../client'
|
||||||
|
import { TheBar } from '../../elements/TheBar'
|
||||||
|
|
||||||
|
|
||||||
|
export const ShopList: react.FC = () => {
|
||||||
|
|
||||||
|
const [predict, setPredict] = useState(false);
|
||||||
|
const [shopData, setShopData] = useState([]);
|
||||||
|
const [productData, setProductsData] = useState({} as any);
|
||||||
|
const [selectedShops, setSelectedShops] = useState([] as any);
|
||||||
|
const [selectedProducts, setSelectedProducts] = useState({} as any);
|
||||||
|
|
||||||
|
const fetched = react.useRef(false);
|
||||||
|
|
||||||
|
if (!shopData.length && !fetched.current) {
|
||||||
|
fetched.current = true;
|
||||||
|
getShops().then((e) => {
|
||||||
|
setShopData(e.shops);
|
||||||
|
setProductsData(e.products);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return <div className='shop-list__container'>
|
||||||
|
<div className="shop__content">
|
||||||
|
{/* <div className='date__container'>
|
||||||
|
<Typography.Text strong>На какой промежуток</Typography.Text>
|
||||||
|
<Input type='date' style={{width: 200}}></Input>
|
||||||
|
</div> */}
|
||||||
|
<div>
|
||||||
|
<Typography.Text strong style={{marginBottom: '10px'}}>Выберите товары</Typography.Text>
|
||||||
|
<Table
|
||||||
|
columns={shopColumns}
|
||||||
|
rowSelection={{
|
||||||
|
type: 'checkbox',
|
||||||
|
onChange: (selectedRowKeys: React.Key[]) => {
|
||||||
|
var products = selectedProducts;
|
||||||
|
selectedRowKeys.map((e) => {
|
||||||
|
if (!products.hasOwnProperty(e)) {
|
||||||
|
products[e] = []
|
||||||
|
}
|
||||||
|
})
|
||||||
|
setSelectedProducts(products);
|
||||||
|
setSelectedShops(selectedRowKeys.map((e) => e.toString()))
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
expandable={{
|
||||||
|
expandedRowRender: (record) => {
|
||||||
|
var columns = productColumns;
|
||||||
|
var data = productData[(record as any).key];
|
||||||
|
if (predict) {
|
||||||
|
columns = productPredictionColumns;
|
||||||
|
}
|
||||||
|
return <Table
|
||||||
|
columns={columns}
|
||||||
|
rowSelection={{
|
||||||
|
type: 'checkbox',
|
||||||
|
onChange: async (selected) => {
|
||||||
|
var products = selectedProducts;
|
||||||
|
var shopProducts = []
|
||||||
|
for (var i = 0; i < selected.length; ++i) {
|
||||||
|
console.log(selected[i].toString(), (record as any).key)
|
||||||
|
shopProducts.push({
|
||||||
|
product: selected[i].toString(),
|
||||||
|
volume: await getPredict((record as any).key, selected[i].toString())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
products[(record as any).key] = shopProducts;
|
||||||
|
setSelectedProducts(products);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
dataSource={data}
|
||||||
|
></Table>
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
dataSource={shopData}
|
||||||
|
></Table>
|
||||||
|
</div>
|
||||||
|
{
|
||||||
|
selectedShops.length ?
|
||||||
|
<Collapse>
|
||||||
|
{
|
||||||
|
selectedShops.map((e: string) => {
|
||||||
|
var predictedPrices = selectedProducts[e].map((e: any) => e.volume);
|
||||||
|
var labels = selectedProducts[e].map((e: any) => e.product)
|
||||||
|
var prices = productData[e].filter((ee: any) => labels.includes(ee.key)).map((e: any) => e.amount)
|
||||||
|
console.log(predictedPrices, labels, prices);
|
||||||
|
return <Collapse.Panel header={e} key={e}>
|
||||||
|
<TheBar
|
||||||
|
predictedPrices={predictedPrices}
|
||||||
|
labels={labels}
|
||||||
|
prices={prices}
|
||||||
|
/>
|
||||||
|
</Collapse.Panel>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</Collapse> : <></>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
13
src/pages/ShopList/style.css
Normal file
13
src/pages/ShopList/style.css
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
.shop-list__container{
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
.date__container{
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.shop__content{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 20px;
|
||||||
|
}
|
45
src/pages/ShopList/tableConfig.tsx
Normal file
45
src/pages/ShopList/tableConfig.tsx
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
import {Input} from 'antd'
|
||||||
|
|
||||||
|
const shopColumns = [
|
||||||
|
{
|
||||||
|
title: 'Название',
|
||||||
|
dataIndex: 'name',
|
||||||
|
key: 'name'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Почтовый индекс',
|
||||||
|
dataIndex: 'postal_code',
|
||||||
|
key: 'postal_code'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Количество товаров',
|
||||||
|
dataIndex: 'products_amount',
|
||||||
|
key: 'products_amount'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
const productColumns = [
|
||||||
|
{
|
||||||
|
title: 'Название',
|
||||||
|
dataIndex: 'name',
|
||||||
|
key: 'name'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Количество',
|
||||||
|
dataIndex: 'amount',
|
||||||
|
key: 'amount',
|
||||||
|
render: (text: string) => {
|
||||||
|
return <Input value={text} style={{width: 100}} type='number'></Input>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
const productPredictionColumns = productColumns.concat([
|
||||||
|
{
|
||||||
|
title: 'Предсказанное количество',
|
||||||
|
dataIndex: 'predict_amount',
|
||||||
|
key: 'predict_amount'
|
||||||
|
}
|
||||||
|
])
|
||||||
|
|
||||||
|
export {shopColumns, productColumns, productPredictionColumns};
|
1
src/react-app-env.d.ts
vendored
1
src/react-app-env.d.ts
vendored
|
@ -1 +0,0 @@
|
||||||
/// <reference types="react-scripts" />
|
|
|
@ -1,15 +0,0 @@
|
||||||
import { ReportHandler } from 'web-vitals';
|
|
||||||
|
|
||||||
const reportWebVitals = (onPerfEntry?: ReportHandler) => {
|
|
||||||
if (onPerfEntry && onPerfEntry instanceof Function) {
|
|
||||||
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
|
|
||||||
getCLS(onPerfEntry);
|
|
||||||
getFID(onPerfEntry);
|
|
||||||
getFCP(onPerfEntry);
|
|
||||||
getLCP(onPerfEntry);
|
|
||||||
getTTFB(onPerfEntry);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default reportWebVitals;
|
|
14
src/router.tsx
Normal file
14
src/router.tsx
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
import {
|
||||||
|
createBrowserRouter
|
||||||
|
} from 'react-router-dom';
|
||||||
|
import { ShopList } from './pages/ShopList';
|
||||||
|
|
||||||
|
|
||||||
|
const router = createBrowserRouter([
|
||||||
|
{
|
||||||
|
path: '/index',
|
||||||
|
element: <ShopList></ShopList>
|
||||||
|
}
|
||||||
|
])
|
||||||
|
|
||||||
|
export default router;
|
|
@ -1,5 +0,0 @@
|
||||||
// jest-dom adds custom jest matchers for asserting on DOM nodes.
|
|
||||||
// allows you to do things like:
|
|
||||||
// expect(element).toHaveTextContent(/react/i)
|
|
||||||
// learn more: https://github.com/testing-library/jest-dom
|
|
||||||
import '@testing-library/jest-dom';
|
|
Loading…
Reference in New Issue
Block a user