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) => { 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) {
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 ( <> 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() { >
record.id} + scroll={{ y: "calc(100% - 50px)" }} />
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" /> 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;