Merge branch 'pipeline' into osredm

src/layouts/header.tsx

@@ -2,7 +2,7 @@ import React, { FC, useEffect, useState } from 'react';
 import styles from './index.less';
 import { Dispatch, connect, useModel, } from 'umi';
 import {  Dropdown , Avatar , Menu } from 'antd';
-import logo from '@/assets/image/logo.png'
+import logo from '@/assets/image/hslogo.png';
 
 
 const Header: FC= ({}) => {
@@ -35,7 +35,8 @@ const Header: FC= ({}) => {
     <div className={`alignCenterJSB ${styles.headerBox}`}>
       {/* <img src={logo} alt="" className={ styles.logo } /> */}
       <div className='alignCenterJSB'>   
-        <img src={logo} alt="" style={{width: '35px'}} />
+        {/* <img src={logo} alt="" style={{width: '35px'}} /> */}
+        <a href={ settings.common.main_site_url } className='alignCenter'><img src={logo} height={48} className='mr20'/></a>
         <span className='font32 whiteText YouSheBiaoTiHei ml15'>{settings?.name}</span>
       </div>
       <div>

src/layouts/index.less

@@ -11,7 +11,7 @@
 
 
 .headerBox{
-  height: 62px;
+  height: 7vh;
   background-color: @header-back-color;
   padding: 0 30px;
   min-height: 50px;