Commit 9d4878eb authored by 陈前坚's avatar 陈前坚

perf: style

parent c6f2ade2
...@@ -143,7 +143,7 @@ const UserManage = () => { ...@@ -143,7 +143,7 @@ const UserManage = () => {
dataIndex: 'loginName', dataIndex: 'loginName',
key: 'loginName', key: 'loginName',
fixed: 'left', fixed: 'left',
width: 100, // width: 100,
render: item => ( render: item => (
<div <div
ref={r => { ref={r => {
...@@ -158,7 +158,7 @@ const UserManage = () => { ...@@ -158,7 +158,7 @@ const UserManage = () => {
title: '用户姓名', title: '用户姓名',
dataIndex: 'userName', dataIndex: 'userName',
key: 'userName', key: 'userName',
width: 100, // width: 100,
render: item => ( render: item => (
<div <div
ref={r => { ref={r => {
...@@ -173,7 +173,7 @@ const UserManage = () => { ...@@ -173,7 +173,7 @@ const UserManage = () => {
title: '所在机构', title: '所在机构',
dataIndex: 'OUName', dataIndex: 'OUName',
key: 'OUName', key: 'OUName',
width: 150, width: 230,
filters: orgFilters, filters: orgFilters,
onFilter: (value, record) => record.OUName === value, onFilter: (value, record) => record.OUName === value,
}, },
...@@ -181,14 +181,14 @@ const UserManage = () => { ...@@ -181,14 +181,14 @@ const UserManage = () => {
title: '手机号码', title: '手机号码',
dataIndex: 'phone', dataIndex: 'phone',
key: 'phone', key: 'phone',
width: 120, width: 150,
ellipsis: true, ellipsis: true,
}, },
{ {
title: '钉钉账户', title: '钉钉账户',
dataIndex: 'ddid', dataIndex: 'ddid',
key: 'ddid', key: 'ddid',
width: 100, width: 150,
render: record => { render: record => {
if (record) { if (record) {
return ( return (
...@@ -206,7 +206,7 @@ const UserManage = () => { ...@@ -206,7 +206,7 @@ const UserManage = () => {
title: '微信账户', title: '微信账户',
dataIndex: 'wxid', dataIndex: 'wxid',
key: 'wxid', key: 'wxid',
width: 100, width: 140,
render: record => { render: record => {
if (record) { if (record) {
return ( return (
...@@ -224,7 +224,7 @@ const UserManage = () => { ...@@ -224,7 +224,7 @@ const UserManage = () => {
title: '操作', title: '操作',
key: 'action', key: 'action',
fixed: 'right', fixed: 'right',
width: 210, width: 250,
align: 'center', align: 'center',
render: record => ( render: record => (
<Space size="middle"> <Space size="middle">
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
// display: block; display: block;
} }
} }
.ant-pagination-prev,.ant-pagination-next{ .ant-pagination-prev,.ant-pagination-next{
......
...@@ -203,7 +203,7 @@ const SiteManage = () => { ...@@ -203,7 +203,7 @@ const SiteManage = () => {
itemRole.title = itemRole.visibleTitle || ''; itemRole.title = itemRole.visibleTitle || '';
itemRole.key = itemRole.visibleTitle + itemRole.visibleValue || ''; itemRole.key = itemRole.visibleTitle + itemRole.visibleValue || '';
itemRole.groupflag = itemRole.visibleTitle; itemRole.groupflag = itemRole.visibleTitle;
itemRole.icon = mulu ? <UnorderedListOutlined /> : ''; // itemRole.icon = mulu ? <UnorderedListOutlined /> : '';
itemRole.roleList.map(i => { itemRole.roleList.map(i => {
i.title = i.roleName; i.title = i.roleName;
i.key = i.roleID; i.key = i.roleID;
...@@ -308,7 +308,7 @@ const SiteManage = () => { ...@@ -308,7 +308,7 @@ const SiteManage = () => {
return ( return (
<PageContainer> <PageContainer>
<Row gutter={0}> <Row gutter={0}>
<Col span={mulu ? 5 : 0}> <Col span={mulu ? 4 : 0}>
<Card className={styles.cardBox}> <Card className={styles.cardBox}>
<Spin <Spin
tip="loading...." tip="loading...."
...@@ -356,27 +356,27 @@ const SiteManage = () => { ...@@ -356,27 +356,27 @@ const SiteManage = () => {
confirmModal={groupModal} confirmModal={groupModal}
/> />
</Card> </Card>
<div> {/* <div>
{mulu && ( {mulu && (
<Tooltip title="隐藏角色栏" className={styles.hide}> <Tooltip title="隐藏角色栏" className={styles.hide}>
<DoubleLeftOutlined onClick={() => handleHide()} /> <DoubleLeftOutlined onClick={() => handleHide()} />
</Tooltip> </Tooltip>
)} )}
</div> </div> */}
</Col> </Col>
<Col span={mulu ? 0 : 1}> {/* <Col span={mulu ? 0 : 1}>
{/* {mulu && ( {mulu && (
<Tooltip title="隐藏角色栏" className={styles.hide}> <Tooltip title="隐藏角色栏" className={styles.hide}>
<DoubleLeftOutlined onClick={() => handleHide()} /> <DoubleLeftOutlined onClick={() => handleHide()} />
</Tooltip> </Tooltip>
)} */} )}
{!mulu && ( {!mulu && (
<Tooltip title="显示角色栏" className={styles.hide}> <Tooltip title="显示角色栏" className={styles.hide}>
<DoubleRightOutlined onClick={() => handleHide()} /> <DoubleRightOutlined onClick={() => handleHide()} />
</Tooltip> </Tooltip>
)} )}
</Col> </Col> */}
<Col span={mulu ? 19 : 23}> <Col span={mulu ? 20 : 23}>
<Card style={{ marginBottom: '10px', minWidth: '870px' }}> <Card style={{ marginBottom: '10px', minWidth: '870px' }}>
<Row align="middle"> <Row align="middle">
<Col span={1}>搜索</Col> <Col span={1}>搜索</Col>
......
.cardBox{ .cardBox{
min-height: calc(100vh - 80px); min-height: calc(100vh - 74px);
max-height: calc(100vh - 80px); max-height: calc(100vh - 74px);
overflow-y: scroll; overflow-y: scroll;
margin-right: 20px; margin-right: 10px;
} }
.ant-tree-node-content-wrapper-open{ .ant-tree-node-content-wrapper-open{
display: flex; display: flex;
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
} }
.cardBoxR{ .cardBoxR{
min-width: 870px; min-width: 870px;
min-height: calc(100vh - 172px); min-height: calc(100vh - 158px);
max-height: calc(100vh - 172px); max-height: calc(100vh - 158px);
overflow-y: scroll; overflow-y: scroll;
} }
:global{ :global{
...@@ -58,3 +58,6 @@ ...@@ -58,3 +58,6 @@
vertical-align: 0.125em; vertical-align: 0.125em;
color:#1890FF; color:#1890FF;
} }
.ant-card-body {
padding: 20px 10px;
}
...@@ -237,7 +237,7 @@ const SiteManage = () => { ...@@ -237,7 +237,7 @@ const SiteManage = () => {
return ( return (
<PageContainer> <PageContainer>
<Row> <Row>
<Col span={mulu ? 5 : 0}> <Col span={mulu ? 4 : 0}>
<Card <Card
className={classnames({ className={classnames({
[styles.cardBox]: true, [styles.cardBox]: true,
...@@ -271,33 +271,32 @@ const SiteManage = () => { ...@@ -271,33 +271,32 @@ const SiteManage = () => {
confirmModal={editModal} confirmModal={editModal}
/> />
</Card> </Card>
<div> {/* <div>
{mulu && ( {mulu && (
<Tooltip title="隐藏站点" className={styles.hide}> <Tooltip title="隐藏站点" className={styles.hide}>
<DoubleLeftOutlined onClick={() => handleHide()} /> <DoubleLeftOutlined onClick={() => handleHide()} />
</Tooltip> </Tooltip>
)} )}
{/* {!mulu && ( {!mulu && (
<Tooltip title="显示站点" className={styles.hide}> <Tooltip title="显示站点" className={styles.hide}>
<DoubleRightOutlined onClick={() => handleHide()} /> <DoubleRightOutlined onClick={() => handleHide()} />
</Tooltip> </Tooltip>
)} */} )}
</div> </div> */}
</Col> </Col>
<Col span={mulu ? 0 : 1}> {/* <Col span={mulu ? 0 : 1}>
{/* {mulu && ( {mulu && (
<Tooltip title="隐藏站点" className={styles.hide}> <Tooltip title="隐藏站点" className={styles.hide}>
<DoubleLeftOutlined onClick={() => handleHide()} /> <DoubleLeftOutlined onClick={() => handleHide()} />
</Tooltip> </Tooltip>
)} */} )}
{!mulu && ( {!mulu && (
<Tooltip title="显示站点" className={styles.hide}> <Tooltip title="显示站点" className={styles.hide}>
<DoubleRightOutlined onClick={() => handleHide()} /> <DoubleRightOutlined onClick={() => handleHide()} />
</Tooltip> </Tooltip>
)} )}
</Col> </Col> */}
<Col span={mulu ? 20 : 23}>
<Col span={mulu ? 19 : 23}>
<Card style={{ marginBottom: '10px', minWidth: '600px' }}> <Card style={{ marginBottom: '10px', minWidth: '600px' }}>
<Row align="middle"> <Row align="middle">
<Col span={1}>搜索</Col> <Col span={1}>搜索</Col>
......
.cardBox{ .cardBox{
min-height: calc(100vh - 80px); min-height: calc(100vh - 74px);
max-height: calc(100vh - 80px); max-height: calc(100vh - 74px);
overflow: auto; overflow: auto;
margin-right: 20px; margin-right: 10px;
} }
.siteTitle{ .siteTitle{
font-size: 16px; font-size: 16px;
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.cardBoxR{ .cardBoxR{
min-height: calc(100vh - 172px); min-height: calc(100vh - 158px);
max-height: calc(100vh - 172px); max-height: calc(100vh - 158px);
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