diff --git a/docker/deploy.md b/docker/deploy.md index 7ab5e3b..09e83a4 100644 --- a/docker/deploy.md +++ b/docker/deploy.md @@ -34,7 +34,7 @@ docker run -d -p 3001:80 -p 3002:443 --network task-manager --restart unless-sto scp -r cert/ root@121.36.71.28:/usr/local/software/nginx-1.28.0/ -scp -r out/ root@121.36.71.28:/usr/share/nginx/html +scp -r outd/ root@121.36.71.28:/usr/share/nginx/html cp -rf ./* ../ diff --git a/src/ui/task/project/TreeTablePro.tsx b/src/ui/task/project/TreeTablePro.tsx index 011f567..02ae92a 100644 --- a/src/ui/task/project/TreeTablePro.tsx +++ b/src/ui/task/project/TreeTablePro.tsx @@ -32,7 +32,7 @@ const TreeTablePro: React.FC = (props: { joinId?: string }) => { // 树子集是否参与过滤 const [filterChecked, setFilterChecked] = React.useState(true); // 页码信息 - const [current, setCurrent] = React.useState(1); + const [currentPage, setCurrentPage] = React.useState(1); const [pageSize, setPageSize] = React.useState(10); const {taskState: state} = useContext(LocalContext); // 获取路径参数pid @@ -283,7 +283,7 @@ const TreeTablePro: React.FC = (props: { joinId?: string }) => { const response1 = await getTaskTreeResultAPI({ pageSize: params.pageSize ? params.pageSize : pageSize, - pageNumber: params.current ? params.pageNumber : current, + pageNumber: params.current ? params.current : currentPage, data: search }) @@ -309,11 +309,11 @@ const TreeTablePro: React.FC = (props: { joinId?: string }) => { rowKey="id" rowClassName={(record, i) => (i % 2 === 1 ? "even" : "odd")} pagination={{ - current: current, + current: currentPage, pageSize: pageSize, onChange: (current, pageSize) => { console.log('onChange', current, pageSize) - setCurrent(current) + setCurrentPage(current) setPageSize(pageSize) } }}