样式修改

src/pages/assetmangement_assetgrouping/AssetGrouping.js

@@ -2,7 +2,7 @@ import {Col, Form, Row, Select, Tree, Input, Button, Pagination, Space, Table} f
 import Title from '../homepage/compontent/title'
 import styles from '../assetmangement_assetgrouping/AssetGrouping.less'
 import {PlusOutlined, SearchOutlined, SyncOutlined} from "@ant-design/icons";
-import {useState} from "react";
+import {useEffect, useState} from "react";
 const {Search} = Input
 
 const mockData = [
@@ -81,7 +81,9 @@ const AssetGroupTable=()=>{
     const [selectedRowKeys, setSelectedRowKeys] = useState([]);
     const [currentPage, setCurrentPage] = useState(1);
     const [pageSize, setPageSize] = useState(10); // 可根据需求调整默认每页条数
-
+    useEffect(() => {
+        fetchAssetGroupData(currentPage, pageSize);
+    }, [currentPage,pageSize]);
     // 表格列配置
     const columns = [
         {
@@ -147,14 +149,14 @@ const AssetGroupTable=()=>{
     const onPageChange = (page) => {
         setCurrentPage(page);
         // 对接接口：请求第page页数据
-        fetchAssetGroupData(page, pageSize);
+        // fetchAssetGroupData(page, pageSize);
     };
 
     const onPageSizeChange = (current, size) => {
-        setCurrentPage(current);
+        setCurrentPage(1);
         setPageSize(size);
         // 对接接口：请求第current页、每页size条数据
-        fetchAssetGroupData(current, size);
+        // fetchAssetGroupData(current, size);
     };
 
     // 模拟接口请求函数（实际开发中替换为真实接口调用）
@@ -200,7 +202,7 @@ const AssetGroupTable=()=>{
                 <Pagination
                     current={currentPage}
                     pageSize={pageSize}
-                    total={mockData.length} // 实际场景中替换为接口返回的total
+                    total={85} // 实际场景中替换为接口返回的total
                     onChange={onPageChange}
                     onShowSizeChange={onPageSizeChange}
                     showSizeChanger
@@ -293,7 +295,7 @@ const AssetGrouping = () => {
                         </Row>
                     </div>
                 </Row>
-                <Row style={{marginTop:'20px'}}>
+                <Row style={{margin:'30px 0'}}>
                     <AssetGroupTable ></AssetGroupTable>
                 </Row>
             </Col>

src/pages/assetmangement_assetlist/AssetList.js

@@ -6,7 +6,7 @@ import AssetTable from "@/pages/assetmangement_assetlist/compontent/table";
 const {Search}= Input
 const AssetList = ()=>{
     return(
-        <div style={{padding:'20px',overflowY:'auto',}}>
+        <div style={{padding:'20px'}}>
             <Row justify={'space-between'}>
                 <Col>
                     <Title title={'查询条件'}></Title>
@@ -52,7 +52,7 @@ const AssetList = ()=>{
                     </Row>
                 </div>
             </Row>
-            <Row style={{marginTop:'20px'}}>
+            <Row style={{margin:'30px 0'}}>
                 <AssetTable></AssetTable>
             </Row>
 

src/pages/assetmangement_assetlist/AssetList.less

@@ -28,4 +28,5 @@
   height: 36px;
   width:88px;
   border-color:#d9d9d9 ;
+  background-color: #E5B7B733;
 }

src/pages/assetmangement_assetlist/compontent/table.js

@@ -118,20 +118,21 @@ const mockData = [
 const AssetTable = () => {
     // 分页状态
     const [currentPage, setCurrentPage] = useState(1);
-    const [pageSize, setPageSize] = useState(10);
-    const [total, setTotal] = useState(mockData.length); // 实际项目中由接口返回总条数
+    const [pageSize, setPageSize] = useState(5);
+    const [total, setTotal] = useState(85); // 实际项目中由接口返回总条数
+    const [loading, setLoading] = useState(false);
     // 表格数据（实际项目中由接口请求赋值）
     const [dataSource, setDataSource] = useState(mockData);
 
     // 接口请求函数（实际项目中替换为真实接口逻辑）
-    const fetchAssetData = async (page = 1, size = 10) => {
+    const fetchAssetData = async (page , size ) => {
         try {
             // 模拟接口请求，实际替换为：
             // const res = await axios.get('/api/assets', { params: { page, size } });
             // setDataSource(res.data.list);
             // setTotal(res.data.total);
-            setCurrentPage(page);
-            setPageSize(size);
+            console.log(page,size)
+
         } catch (error) {
             console.error('获取资产数据失败：', error);
         }
@@ -139,17 +140,29 @@ const AssetTable = () => {
 
     // 组件挂载时初始化数据
     useEffect(() => {
-        fetchAssetData(currentPage, pageSize);
-    }, [currentPage, pageSize]);
+        const timer=setTimeout(()=>{
+            fetchAssetData(currentPage, pageSize);
+        },0)
+        return ()=>{
+            clearTimeout(timer);
+        }
+    }, [currentPage,pageSize]);
 
+    useEffect(()=>{
+        setCurrentPage(1);
+    }, [pageSize]);
     // 处理分页变更
     const handlePageChange = (page) => {
-        fetchAssetData(page, pageSize);
+            console.log(page)
+            setCurrentPage(page);
     };
 
     // 处理页大小变更
-    const handleShowSizeChange = (current, size) => {
-        fetchAssetData(current, size);
+    const handleShowSizeChange = (_, size) => {
+            console.log(1)
+            // setCurrentPage(1);
+            setPageSize(size);
+            setLoading(true);
     };
 
     // 表格列配置

src/pages/homepage/HomePage.less

@@ -1,6 +1,7 @@
 .homepage{
   background: rgb(240, 247, 247);
   height: 93vh;
+  padding:0 0 30px 0;
   .homepage-title{
     padding:5px 30px;
     background: rgba(255, 255, 255, 0.4);