Commit 945a7369 authored by baixian's avatar baixian

优化

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