From eb458d952822aaa477e32556e72a21a53a0df5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 2 Aug 2022 10:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Activity/Activity.js | 2 +-
 src/forge/DevOps/Index.jsx     | 6 +++---
 src/forge/DevOps/ops.scss      | 1 +
 src/forge/Main/Index.scss      | 2 +-
 src/forge/Merge/merge.js       | 2 +-
 src/forge/Order/Milepost.js    | 2 +-
 src/forge/Order/order.js       | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js
index 2f3a84e85..1525cb499 100644
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@@ -135,7 +135,7 @@ class Activity extends Component{
     const fourth_per =issues_count > 0 ?`${parseFloat(open_issues_count/issues_count).toFixed(2)*100}%` :"50%";
     
     return(
-      <div className="main">
+      <div className="main mt20">
         
         <div className="normalBox">
           <div class="normalBox-title">概览</div>
diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx
index 2f05d13aa..e9084307f 100644
--- a/src/forge/DevOps/Index.jsx
+++ b/src/forge/DevOps/Index.jsx
@@ -32,12 +32,12 @@ const Params = Loadable({
 })
 
 export default ((props)=>{
-  const {jianmu_devops} = props
+  const {jianmu_devops} = props;
 
   return(
-    <WhiteBack className="opsPanel">
+    <WhiteBack className="opsPanel main">
       {/* 嵌入devops */}
-      <iframe title={`devopsIframe`} src={`https://ci-v3.test.jianmuhub.com/oauth2/authorize?code=${jianmu_devops}`} id={`devopsIframe`} frameBorder="0" name={`devopsIframe`} width="100%" height={600}></iframe>
+      {jianmu_devops && <iframe title={`devopsIframe`} src={`https://ci-v3.test.jianmuhub.com/oauth2/authorize?code=${jianmu_devops}`} id={`devopsIframe`} frameBorder="0" name={`devopsIframe`} width="100%" height={600}></iframe>}
       {/* 旧引擎页面 */}
       {/* <Switch {...props}>
         <Route path="/:owner/:projectsId/devops/params"
diff --git a/src/forge/DevOps/ops.scss b/src/forge/DevOps/ops.scss
index 94838095d..bc24d49f9 100644
--- a/src/forge/DevOps/ops.scss
+++ b/src/forge/DevOps/ops.scss
@@ -2,6 +2,7 @@
 {
   margin:20px auto;
   width: 1200px;
+  min-height: 500px;
   // 开始激活页面
   .activatePanel{
     display: flex;
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index bc55705f2..f4b5fe8ec 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -122,7 +122,7 @@
   max-width: 1200px;
   margin: 0 auto;
   .panelmenu{
-    padding-top:30px;
+    padding-top:20px;
     .depotBtn{
       .mr-5{
         margin-right: -5px;
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index f10f3bc3c..172bfdbc4 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -247,7 +247,7 @@ class merge extends Component {
       </Menu>
     );
     return (
-      <div className="main" style={{padding:"0px"}}>
+      <div className="main mt20" style={{padding:"0px"}}>
         <div className="topWrapper" style={{borderBottom:"none",padding:"20px"}}>
           <div className="target-detail-search">
             <Search
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index de4378408..442852b6e 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -168,7 +168,7 @@ class Milepost extends Component {
 
     return (
       <Spin spinning={spinings}>
-        <div className="main" style={{minHeight:"400px"}}>
+        <div className="main mt20" style={{minHeight:"400px"}}>
           <div style={{ display: this.state.display }}>
             <div className="tagdiv" >
               <span>里程碑{data && data.issue_tags_count}已创建</span>
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 2ed7b7683..86f2cc868 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -651,7 +651,7 @@ class order extends Component {
       begin, end, checkedValue, all,search
     } = this.state;
     return (
-      <div className="main" style={{padding:"0px"}}>
+      <div className="main mt20" style={{padding:"0px"}}>
         <div style={{padding:"10px 20px 0px 20px"}}>
         <div className="topWrapper" style={{ paddingTop: "10px" }}>
           <ul className="topWrapper_type">