Commit ecbf51d8 authored by tianfen's avatar tianfen

fix: 修改横向滚动条

parent 24791fbc
Pipeline #22332 skipped with stages
import { PageContainer } from '@ant-design/pro-layout'; import { PageContainer } from '@ant-design/pro-layout';
import React from 'react'; import React from 'react';
import './index.less';
const BasePageContainer = props => { const BasePageContainer = props => {
const { children, ...rest } = props; const { children, ...rest } = props;
......
.ant-pro-basicLayout-content .ant-pro-page-container{
margin:0
}
.ant-pro-page-container-children-content{
margin:0
}
.ant-layout .ant-layout-content{
margin: 0px !important;
}
\ No newline at end of file
...@@ -158,7 +158,7 @@ const SiteManage = props => { ...@@ -158,7 +158,7 @@ const SiteManage = props => {
}; };
if (name) params = { ...params, name }; if (name) params = { ...params, name };
groupUserPagingList(params).then(res => { groupUserPagingList(params).then(res => {
if (res.code === 0) { if (res.code === 0 && res.data) {
let { list } = res.data; let { list } = res.data;
// 还原选择的数据 // 还原选择的数据
if (selectList.length > 0) { if (selectList.length > 0) {
...@@ -182,6 +182,9 @@ const SiteManage = props => { ...@@ -182,6 +182,9 @@ const SiteManage = props => {
handleShowModal('loading', false); handleShowModal('loading', false);
setdataList(lodash.cloneDeep(list)); setdataList(lodash.cloneDeep(list));
setTotal(res.data.TotalCount); setTotal(res.data.TotalCount);
} else {
handleShowModal('loading', false);
setdataList(lodash.cloneDeep([]));
} }
}); });
}; };
...@@ -375,8 +378,6 @@ const SiteManage = props => { ...@@ -375,8 +378,6 @@ const SiteManage = props => {
}; };
return ( return (
<PageContainer> <PageContainer>
{/* <Row>
<Col span={mulu ? 4 : 0}> */}
<div className={styles.content}> <div className={styles.content}>
<Card <Card
className={classnames({ className={classnames({
...@@ -573,8 +574,6 @@ const SiteManage = props => { ...@@ -573,8 +574,6 @@ const SiteManage = props => {
</div> </div>
</div> </div>
</div> </div>
{/* </Col>
</Row> */}
</PageContainer> </PageContainer>
); );
}; };
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.cardBoxR{ .cardBoxR{
min-height: calc(100vh - 200px); min-height: calc(100vh - 210px);
max-height: calc(100vh - 200px); max-height: calc(100vh - 210px);
min-width: 600px; min-width: 600px;
overflow-y: scroll; overflow-y: scroll;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment