Commit 945a7369 authored by baixian's avatar baixian

优化

parent 80fe75e1
...@@ -84,7 +84,7 @@ class SjdMenu extends React.Component { ...@@ -84,7 +84,7 @@ class SjdMenu extends React.Component {
menus, defaultMenu, collapsed, guideStep, guideShow, userPermission, role, menus, defaultMenu, collapsed, guideStep, guideShow, userPermission, role,
} = this.props; } = this.props;
const menuItemStyle = { const menuItemStyle = {
fontSize: '13px', fontSize: '14px',
height: '40px', height: '40px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
...@@ -93,7 +93,7 @@ class SjdMenu extends React.Component { ...@@ -93,7 +93,7 @@ class SjdMenu extends React.Component {
paddingLeft: '5px', paddingLeft: '5px',
}; };
const fontSize = { const fontSize = {
fontSize: '13px', fontSize: '14px',
}; };
return ( return (
<Layout> <Layout>
...@@ -109,12 +109,13 @@ class SjdMenu extends React.Component { ...@@ -109,12 +109,13 @@ class SjdMenu extends React.Component {
zIndex: 100, zIndex: 100,
}} }}
className={`${SjdMenuStyle.menusider} menusider`} className={`${SjdMenuStyle.menusider} menusider`}
width={173} width={168}
> >
<UserGuide /> <UserGuide />
<div> <div>
{/* <div className={collapsed ? SjdMenuStyle.collapsedlogo : SjdMenuStyle.uncollapsedlogo} onClick={this.goHome} /> */} {/* <div className={collapsed ? SjdMenuStyle.collapsedlogo : SjdMenuStyle.uncollapsedlogo} onClick={this.goHome} /> */}
<div className={SjdMenuStyle.uncollapsedlogo}> <div className={SjdMenuStyle.uncollapsedlogo}>
<img className={SjdMenuStyle.logoImg} src={`${__IMGCDN__}newMenu/logo.png`} alt="" />
{ {
collapsed === false && collapsed === false &&
<Icon <Icon
...@@ -140,7 +141,6 @@ class SjdMenu extends React.Component { ...@@ -140,7 +141,6 @@ class SjdMenu extends React.Component {
<div className={SjdMenuStyle.menuicon} style={defaultMenu == ele.id ? { width: ele.style.width, height: ele.style.height, backgroundImage: `url(${ele.activeurl})` } : { width: ele.style.width, height: ele.style.height, backgroundImage: `url(${ele.notactiveurl})` }} /> <div className={SjdMenuStyle.menuicon} style={defaultMenu == ele.id ? { width: ele.style.width, height: ele.style.height, backgroundImage: `url(${ele.activeurl})` } : { width: ele.style.width, height: ele.style.height, backgroundImage: `url(${ele.notactiveurl})` }} />
<Icon type="right" style={{ width: 0, minWidth: 'initial', visibility: 'hidden' }} /> <Icon type="right" style={{ width: 0, minWidth: 'initial', visibility: 'hidden' }} />
<span>{ele.name}</span> <span>{ele.name}</span>
<span className="iconfont icon-beijian-line-"></span>
</Menu.Item> </Menu.Item>
) )
) : ) :
......
...@@ -19,19 +19,25 @@ ...@@ -19,19 +19,25 @@
right: -43px; right: -43px;
} }
.uncollapsedlogo { .uncollapsedlogo {
height: 42px; //height: 42px;
width: 54px; //width: 54px;
margin: 11px auto; //margin: 11px auto;
background: url('@{imagesroot}common/qxlogo.png') no-repeat; //background: url('@{imagesroot}newMenu/newLogo.png') no-repeat;
background-size: 100% 100%; //background-size: 100% 100%;
display: block; height: 48px;
display: flex;
align-items: center;
justify-content: center;
.logoImg {
height: 24px;
}
position: relative; position: relative;
} }
.collapsedlogo { .collapsedlogo {
height: 45px; height: 45px;
width: 45px; width: 45px;
margin: 16px auto 35px; margin: 16px auto 35px;
background: url('@{imagesroot}qxlogo4.png') no-repeat; background: url('@{imagesroot}newMenu/newLogo.png') no-repeat;
border-radius: 50%; border-radius: 50%;
background-size: 100% 100%; background-size: 100% 100%;
display: block; display: block;
...@@ -61,7 +67,6 @@ ...@@ -61,7 +67,6 @@
.ant-menu-item { .ant-menu-item {
font-size: 14px; font-size: 14px;
line-height: 40px; line-height: 40px;
border-left: 5px solid transparent;
font-family:PingFangSC-Regular,PingFang SC; font-family:PingFangSC-Regular,PingFang SC;
font-weight:400; font-weight:400;
color: #B3B9BF; color: #B3B9BF;
...@@ -119,4 +124,8 @@ ...@@ -119,4 +124,8 @@
.ant-menu-dark .ant-menu-item:hover > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-item-active > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-active > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-open > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-selected > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-title:hover > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-item:hover > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-item-active > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-active > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-open > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-selected > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-title:hover > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-item:hover > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-item-active > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-active > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-open > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-selected > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-title:hover > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-item:hover > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-item-active > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-active > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-open > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-selected > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-title:hover > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before { .ant-menu-dark .ant-menu-item:hover > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-item-active > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-active > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-open > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-selected > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-title:hover > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-item:hover > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-item-active > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-active > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-open > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-selected > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-submenu-title:hover > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::after, .ant-menu-dark .ant-menu-item:hover > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-item-active > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-active > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-open > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-selected > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-title:hover > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-item:hover > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-item-active > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-active > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-open > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-selected > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before, .ant-menu-dark .ant-menu-submenu-title:hover > .ant-menu-submenu-title:hover > .ant-menu-submenu-arrow::before {
background: #B3B9BF; background: #B3B9BF;
} }
.ant-menu-dark .ant-menu-inline.ant-menu-sub {
background: #fff;
box-shadow: none;
}
} }
...@@ -73,7 +73,7 @@ class SjdIndex extends React.Component { ...@@ -73,7 +73,7 @@ class SjdIndex extends React.Component {
let paddingRight = 20; let paddingRight = 20;
let paddingLeft = 20; let paddingLeft = 20;
if (screenIsBig) { if (screenIsBig) {
contentMarginLeft = !collapsed ? 173 : 80; contentMarginLeft = !collapsed ? 168 : 80;
} else { } else {
contentMarginLeft = 0; contentMarginLeft = 0;
paddingRight = 10; paddingRight = 10;
...@@ -91,7 +91,7 @@ class SjdIndex extends React.Component { ...@@ -91,7 +91,7 @@ class SjdIndex extends React.Component {
onClose={this.onClose} onClose={this.onClose}
placement="left" placement="left"
bodyStyle={{ padding: 0 }} bodyStyle={{ padding: 0 }}
width={173} width={168}
> >
<SjdMenu /> <SjdMenu />
</Drawer> </Drawer>
...@@ -109,7 +109,7 @@ class SjdIndex extends React.Component { ...@@ -109,7 +109,7 @@ class SjdIndex extends React.Component {
zIndex: 100, zIndex: 100,
}} }}
className={SjdIndexStyle.menusider} className={SjdIndexStyle.menusider}
width={173} width={168}
> >
<SjdMenu /> <SjdMenu />
</Sider> </Sider>
......
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