From bbb1eea766c79834a6dc09033337177ab36fb0cc Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Mon, 5 Feb 2024 16:38:12 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20table=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E6=8E=92=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableModule/index.jsx                         |  3 +++
 .../OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx |  2 ++
 .../OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx      | 12 +-----------
 .../OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx        |  2 ++
 .../OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx     |  2 ++
 src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx   |  3 ++-
 src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx |  2 ++
 src/pages/SystemMgm/AdminMgm/index.scss                      | 11 ++++++++++-
 src/pages/SystemMgm/AdminMgm/loadable.jsx                    |  2 ++
 src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx |  1 +
 src/pages/SystemMgm/RoleMgm/index.scss                       | 11 ++++++++++-
 src/pages/SystemMgm/RoleMgm/loadable.jsx                     |  2 ++
 src/pages/SystemMgm/SystemLog/index.scss                     |  3 +++
 13 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index 37e9198..944075a 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -1144,9 +1144,12 @@ const TableModule = forwardRef((props, ref) => {
             <Table
               rowSelection={rowSelection}
               rowKey={rowKey}
+              className="yisa-table-scroll"
               columns={getNewColumns()}
               dataSource={tableData}
+              scroll={{ y: "calc(100% - 50px)" }}
               pagination={false}
+
               locale={locale}
             />
           </div>
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
index 3f0d019..ebe5b8e 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
@@ -302,11 +302,13 @@ function LiftUpPoleRecord(props) {
                         <Table
                             bordered
                             // className='yisa-table'
+                            className="table yisa-table-scroll"
                             dataSource={resultData.data}
                             columns={
                                 handleColumns()
                             }
                             pagination={false}
+                            scroll={{ y: "calc(100% - 50px)" }}
                             loading={ajaxLoading}
                         />
                         <Pagination
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx
index 3a69942..2ca3139 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx
@@ -24,17 +24,6 @@ function PlateChangeMgm() {
     const [total, setTotal] = useState(0);
     const columns = [
         {
-            title: "序号",
-            dataIndex: "index",
-            key: "index",
-            align: "center",
-            fixed: "right",
-            // render: (text, record, index) => index + 1,
-            render: (_, record, index) => {
-                return formData.pn ? index + 1 + (formData.pn - 1) * formData.page_size : index + 1
-            }
-        },
-        {
             title: "车场名称",
             dataIndex: "road_name",
             key: "road_name",
@@ -209,6 +198,7 @@ function PlateChangeMgm() {
     return (
         <>
             <TableModule
+                showSerial={true}
                 columns={columns}
                 tableData={resultData}
                 formSearch={formSearch}
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
index 0d0aa6b..a9a345e 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
@@ -583,11 +583,13 @@ function ZombieCarCleanRecord(props) {
                             bordered
                             // className='yisa-table'
                             dataSource={resultData.data}
+                            className="table yisa-table-scroll"
                             columns={
                                 handleColumns()
                             }
                             // rowSelection={rowSelection}
                             pagination={false}
+                            scroll={{ y: "calc(100% - 50px)" }}
                             loading={ajaxLoading}
                         />
                         <Pagination
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
index ef8c14b..bd637b7 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
@@ -291,12 +291,14 @@ function ChargeRulesMgm() {
           <TableModule
             ref={childRef}
             columns={columns}
+            className="table yisa-table-scroll"
             tableData={tableData}
             formSearch={formSearch}
             total={total}
             search={fetch}
             initFormData={initFormData}
             isExport={false}
+            scroll={{ y: "calc(100% - 50px)" }}
             pageName={'chargeRulesMgm'}
             rightButtonGroup={[addItem()]}
           />
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
index 539900c..09c4425 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
@@ -649,11 +649,12 @@ function OutSegment() {
         >
           <div className="table-wrap">
             <Table
-              // className="yisa-table"
+              className="table yisa-table-scroll"
               columns={columns}
               dataSource={tableData}
               pagination={false}
               rowKey={(record) => record.id}
+              scroll={{ y: "calc(100% - 50px)" }}
             />
           </div>
           <div>
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx
index ff70e13..f6b27d3 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx
@@ -198,6 +198,7 @@ function ZombieCarMgm() {
         ref={tableRef}
         columns={columns}
         tableData={tableData}
+        className="table yisa-table-scroll"
         formSearch={formSearch}
         total={total}
         rowKey={"id"}
@@ -207,6 +208,7 @@ function ZombieCarMgm() {
         search={fetch}
         rightButtonGroup={[cleanZomCarComponent()]}
         initFormData={initFormData}
+        scroll={{ y: "calc(100% - 50px)" }}
         exportUrl="/PMS/api/bpm/offroad/export_zomcar"
       />
       <Modal
diff --git a/src/pages/SystemMgm/AdminMgm/index.scss b/src/pages/SystemMgm/AdminMgm/index.scss
index ba22a84..42c79c4 100644
--- a/src/pages/SystemMgm/AdminMgm/index.scss
+++ b/src/pages/SystemMgm/AdminMgm/index.scss
@@ -79,7 +79,9 @@ $color-primary: var(--color-primary);
       }
     }
   }
-
+.yisa-table-scroll {
+  height: calc(100% - 50px);
+}
   .paid-result {
     width: 100%;
     height: 800px;
@@ -88,6 +90,13 @@ $color-primary: var(--color-primary);
     margin-left: 17px;
     .result {
       padding: 25px;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      .cc-result-flow {
+        flex: 1;
+        min-height: 0;
+      }
       .font {
         font-family:
           Microsoft YaHei,
diff --git a/src/pages/SystemMgm/AdminMgm/loadable.jsx b/src/pages/SystemMgm/AdminMgm/loadable.jsx
index 1416b79..117da59 100644
--- a/src/pages/SystemMgm/AdminMgm/loadable.jsx
+++ b/src/pages/SystemMgm/AdminMgm/loadable.jsx
@@ -742,6 +742,8 @@ function AdminMgm(props) {
                             columns={
                                 handleColumns()
                             }
+                            className="table yisa-table-scroll"
+                            scroll={{ y: "calc(100% - 50px)" }}
                             pagination={false}
                             loading={ajaxLoading}
                         />
diff --git a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
index c734248..8bc0e83 100644
--- a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
+++ b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
@@ -540,6 +540,7 @@ function BusinessConf(props) {
                             columns={
                                 handleColumns()
                             }
+                            scroll={{ y: "calc(100% - 50px)" }}
                             pagination={false}
                             loading={ajaxLoading}
                         />
diff --git a/src/pages/SystemMgm/RoleMgm/index.scss b/src/pages/SystemMgm/RoleMgm/index.scss
index edeb7f7..369d323 100644
--- a/src/pages/SystemMgm/RoleMgm/index.scss
+++ b/src/pages/SystemMgm/RoleMgm/index.scss
@@ -83,7 +83,9 @@ $color-primary: var(--color-primary);
       }
     }
   }
-
+  .yisa-table-scroll {
+    height: calc(100% - 50px);
+  }
   .paid-result {
     width: 100%;
     height: 800px;
@@ -92,6 +94,13 @@ $color-primary: var(--color-primary);
     margin-left: 17px;
     .result {
       padding: 25px;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      .cc-result-flow {
+        flex: 1;
+        min-height: 0;
+      }
       .font {
         font-family:
           Microsoft YaHei,
diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx
index 3083e72..a93cf1e 100644
--- a/src/pages/SystemMgm/RoleMgm/loadable.jsx
+++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx
@@ -621,6 +621,8 @@ function RoleMgm(props) {
                             columns={
                                 handleColumns()
                             }
+                            className="table yisa-table-scroll"
+                            scroll={{ y: "calc(100% - 50px)" }}
                             pagination={false}
                             loading={ajaxLoading}
                         />
diff --git a/src/pages/SystemMgm/SystemLog/index.scss b/src/pages/SystemMgm/SystemLog/index.scss
index 797c19f..9ae3a7b 100644
--- a/src/pages/SystemMgm/SystemLog/index.scss
+++ b/src/pages/SystemMgm/SystemLog/index.scss
@@ -117,6 +117,9 @@ $color-primary: var(--color-primary);
     background: var(--color-user-list-bg);
     border-top-left-radius: 20px;
     box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08);
+    .yisa-table-scroll {
+      height: calc(100% - 1px);
+    }
     .result {
       height: 100%;
       display: flex;