fix(): table滚动条排查

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>

src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx

@@ -69,13 +69,13 @@ function PileMonitor() {
   };
   //历史处理的表头
   const columns = [
-    {
-      title: "序号",
-      dataIndex: "id",
-      key: "id",
-      align: "center",
-      render: (text, record, index) => index + 1,
-    },
+    // {
+    //   title: "序号",
+    //   dataIndex: "id",
+    //   key: "id",
+    //   align: "center",
+    //   render: (text, record, index) => index + 1,
+    // },
     {
       title: "设备名称",
       dataIndex: "device_name",
@@ -170,6 +170,7 @@ function PileMonitor() {
         tableData={tableData}
         formSearch={formSearch}
         pagename="电桩监控"
+        showSerial={true}
         // mandatory={['plate','berth_id']}
         // mandatory_name={['车牌号或泊位号']}
         pageName={'pileMonitor'}

src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx

@@ -100,7 +100,9 @@ function LiftUpPoleRecord(props) {
     const deployListColumns = [
         {
             title: '序号',
-            render: (text, record, index) => index + 1,
+            render: (_, record, index) => {
+                return formData.pn ? index + 1 + (formData.pn - 1) * formData.page_size : index + 1
+            }
         },
         {
             title: '车场名称',
@@ -300,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

src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx

@@ -24,14 +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,
-        },
-        {
             title: "车场名称",
             dataIndex: "road_name",
             key: "road_name",
@@ -206,6 +198,7 @@ function PlateChangeMgm() {
     return (
         <>
             <TableModule
+                showSerial={true}
                 columns={columns}
                 tableData={resultData}
                 formSearch={formSearch}

src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx

@@ -29,7 +29,10 @@ function SpecialReleaseMgm() {
         //     key: "index",
         //     align: "center",
         //     fixed: "right",
-        //     render: (text, record, index) => index + 1,
+        //     // render: (text, record, index) => index + 1,
+        //     render: (_, record, index) => {
+        //         return formData.pn ? index + 1 + (formData.pn - 1) * formData.page_size : index + 1
+        //     }
         // },
         {
             title: "车场名称",

src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx

@@ -146,7 +146,10 @@ function ZombieCarCleanRecord(props) {
         {
             title: '序号',
             dataIndex: 'info_id',
-            render: (text, record, index) => <div>{text}</div>
+            // render: (text, record, index) => <div>{text}</div>
+            render: (_, record, index) => {
+                return formData.pn ? index + 1 + (formData.pn - 1) * formData.page_size : index + 1
+            }
         },
         {
             title: '车场名称',
@@ -580,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

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()]}
           />

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>

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

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,

src/pages/SystemMgm/AdminMgm/loadable.jsx

@@ -305,7 +305,10 @@ function AdminMgm(props) {
     const deployListColumns = [
         {
             title: '序号',
-            render: (text, record, index) => index + 1,
+            // render: (text, record, index) => index + 1,
+            render: (_, record, index) => {
+                return formData.pn ? index + 1 + (formData.pn - 1) * formData.page_size : index + 1
+            }
         },
         {
             title: '登录用户名',
@@ -739,6 +742,8 @@ function AdminMgm(props) {
                             columns={
                                 handleColumns()
                             }
+                            className="table yisa-table-scroll"
+                            scroll={{ y: "calc(100% - 50px)" }}
                             pagination={false}
                             loading={ajaxLoading}
                         />

src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx

@@ -199,9 +199,12 @@ function BusinessConf(props) {
     const deployListColumns = [
         {
             title: "序号",
+            // render: (_, record, index) => {
+            //     return index + 1;
+            // },
             render: (_, record, index) => {
-                return index + 1;
-            },
+                return formData.pn ? index + 1 + (formData.pn - 1) * formData.page_size : index + 1
+            }
         },
         {
             title: '配置项',
@@ -537,6 +540,7 @@ function BusinessConf(props) {
                             columns={
                                 handleColumns()
                             }
+                            scroll={{ y: "calc(100% - 50px)" }}
                             pagination={false}
                             loading={ajaxLoading}
                         />

src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx

@@ -51,8 +51,11 @@ function HotCbdConf() {
         {
             title: "序号",
             align: "center",
-            render : (_,record, index)=>{
-                return <span>{index + 1}</span>
+            // render : (_,record, index)=>{
+            //     return <span>{index + 1}</span>
+            // }
+            render: (_, record, index) => {
+                return pageData.pn ? index + 1 + (pageData.pn - 1) * pageData.page_size : index + 1
             }
         },
         {

src/pages/SystemMgm/BusinessConfig/PageConf/loadable.jsx

@@ -22,7 +22,7 @@ function PageConf() {
             align: "center",
             render:(_,record, index)=>{
                 return index + 1
-            }
+            },
         },
         {
             title: "数据项名称",

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,

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}
                         />

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;