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;

src/pages/pipeline/record/detailsStore.tsx

@@ -327,12 +327,12 @@ const Details: FC = () => {
               </span>
               <span>{detail?.pipeline_name}</span>
               <a
-                href={`${ settings.common.main_site_url }/${owner}/${repo}`}
+                href={`${ settings.current_main_site_url }/${owner}/${repo}`}
               >
                 {owner}/{repo}
               </a>
               <a
-                href={`${ settings.common.main_site_url }/${owner}/${repo}/tree/${detail?.branch}`}
+                href={`${ settings.current_main_site_url }/${owner}/${repo}/tree/${detail?.branch}`}
               >
                 <i className="iconfont icon-a-fenzhi1 font12 mr5"></i>
                 {detail?.branch}

src/pages/pipeline/record/index.less

@@ -54,7 +54,6 @@ div[class~='headTitle'] {
   width: 100%;
   flex: 1;
   min-height: 700px;
-  max-height: calc(100vh - 220px);
   ul{
     width: 30%;
     li{
@@ -77,8 +76,6 @@ div[class~='headTitle'] {
     border-radius: 8px;
     flex: 1;
     color: #fff;
-    display: flex;
-    flex-direction: column;
     .workHead{
       padding:16px 20px;
       border-bottom: 1px solid #22222a;
@@ -106,7 +103,6 @@ div[class~='headTitle'] {
       background: #000;
       color: #fff;
       padding:15px 15px;
-      overflow-y: auto;
       // div[class~="ant-tree-treenode"]:hover{
       //   background-color: #3b3c48;
       //   border-radius: 3px;