diff --git a/web/client/fonts/YouSheBiaoTiHei-2.ttf b/web/client/fonts/YouSheBiaoTiHei-2.ttf new file mode 100644 index 0000000..3729151 Binary files /dev/null and b/web/client/fonts/YouSheBiaoTiHei-2.ttf differ diff --git a/web/client/src/index.less b/web/client/src/index.less index 738e453..eb5fee5 100644 --- a/web/client/src/index.less +++ b/web/client/src/index.less @@ -66,4 +66,8 @@ body { .semi-portal-inner { position: fixed; -} \ No newline at end of file +} +@font-face { + font-family: 'icomoon';//这个可以任意取,但是应与后面相对应eg:yxingguang + src: url('../fonts/YouSheBiaoTiHei-2.ttf'); + } \ No newline at end of file diff --git a/web/client/src/layout/components/header/index.jsx b/web/client/src/layout/components/header/index.jsx index 4d1352a..86a2ff5 100644 --- a/web/client/src/layout/components/header/index.jsx +++ b/web/client/src/layout/components/header/index.jsx @@ -22,7 +22,7 @@ const Header = (props) => { } }} style={{ - height: 60, + height: 48, minWidth: 520, background: '#1D2343', backgroundSize: "100% 100%", @@ -32,10 +32,12 @@ const Header = (props) => { logo: ( ), - text: "", + // text: ( + //
运维管理系统
+ // ), }} footer={ <> @@ -70,18 +72,6 @@ const Header = (props) => { color: "white", }} > - - @@ -91,8 +81,6 @@ const Header = (props) => { left: 4, marginRight: 4, }}> -
你好!
-
{user && user.displayName}
} diff --git a/web/client/src/layout/components/header/index.less b/web/client/src/layout/components/header/index.less index 3143c50..96fb06e 100644 --- a/web/client/src/layout/components/header/index.less +++ b/web/client/src/layout/components/header/index.less @@ -8,4 +8,7 @@ .semi-navigation-item-selected{ background: none; } + .semi-navigation-item-text{ + overflow: inherit; + } } \ No newline at end of file diff --git a/web/client/src/layout/components/sider/index.jsx b/web/client/src/layout/components/sider/index.jsx index fce379d..96aacd8 100644 --- a/web/client/src/layout/components/sider/index.jsx +++ b/web/client/src/layout/components/sider/index.jsx @@ -51,7 +51,11 @@ const Sider = (props) => {