From e36de76f555b4f08e114049c98bb46714d378974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Wed, 12 Oct 2022 16:15:20 +0800
Subject: [PATCH] =?UTF-8?q?style:=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84tabs,=E8=B0=83=E7=A0=94=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/projectadd/open.png | Bin 0 -> 273 bytes
 src/views/projectcenter/TaskPage.vue  |  40 ++++++++++++++++----------
 src/views/research/ResearchManage.vue |  20 ++++++++-----
 3 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 src/assets/images/projectadd/open.png

diff --git a/src/assets/images/projectadd/open.png b/src/assets/images/projectadd/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..aab6f4d27d231c94e346fea759490a8f996e7371
GIT binary patch
literal 273
zcmV+s0q*{ZP)<h;3K|Lk000e1NJLTq000UA000RH1^@s63#Ppj00001b5ch_0Itp)
z=>Px#%Sl8*R47w@&M`~Fa1h4f-`fV;Q7B!N;?}7{!Kska>`v~D5d08b3WA@(C4np*
zI&~~AhO8YOL`PjLPKsmVm4Cq?)q2}|_uO#;2vR#L3NEP8=Zix`6ZjCkVl3^2nMSF#
z%92N*<(BqTDnGV9V)YMlqkH*N^El=Sqq7f7T*(cGiJciN{(=V24Ug^?y7Cjd0WNoN
zi3qY#Sq0DMcJTH|4xD~tiOF54YnLnN!XUAB9d3ahBF@G{NcIc5hP%9e=OmBx@birg
X1{pX^ab8;D00000NkvXXu0mjfr0H;;

literal 0
HcmV?d00001

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f30e0755..914cd585 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -11,7 +11,7 @@
             <div class="fort">起止时间：2022-07-21 00:00至2020-10-21 00:00</div>
         </div>
         <div class="right">
-            <div class="end">
+            <div class="end" style="margin-right: 5px">
                 <div style="margin-top: 20px;margin-left: 10px">
                     <img class="endimg" src="../../assets/images/projectadd/ending.png"/>
                     <span class="endtext">结束项目</span>
@@ -39,23 +39,23 @@
                 </div>
                 </div>
             </div>
-            <div class="end">
+            <router-link to="/projectmanage" class="end">
                  <div style="margin-top: 20px;margin-left: 10px;margin-right:30px">
                     <img class="ending" src="../../assets/images/leveladd/back.png" />
                     <span class="endtext" style="color:#4EA6FF">返回</span>
                 </div>
-            </div>
+            </router-link>
         </div>
     </div>
-    <div class="split"></div>
+    <div class="split" style="flex-shrink: 0;"></div>
     <div class="content">
         <a-tabs class="tab"
             v-model:activeKey="activeKey"
             size="large"
-            :tabBarStyle="{ marginLeft: '10px' }">
-            <a-tab-pane key="2" tab="概览">Content of Tab Pane 1</a-tab-pane>
-            <a-tab-pane key="1" tab="任务" force-render>
-            
+            :tabBarStyle="{ marginLeft: '10px',marginTop: '5px' }">
+            <a-tab-pane key="1" tab="概览"><div class="split"></div></a-tab-pane>
+            <a-tab-pane key="2" tab="任务" force-render>
+                <div class="split"></div>
                 <div class="onerow">
                     <div class="taskmain">任务大纲</div>
                     <button class="btn">批量面授报名</button>
@@ -65,7 +65,7 @@
                     </div>
                 </div>
                 <div class="stage">
-                    <span class="stageimg"><img src="../../assets/images/projectadd/close.png"/></span>
+                    <span class="stageimg"><img src="../../assets/images/projectadd/open.png"/></span>
                     <span class="stagename">阶段1腾飞班阶级1</span>
                 </div>
                 <div class="course">
@@ -333,21 +333,27 @@
     }
     .content {
         //display: flex;
-        margin: 0 37px;
+        //margin: 0 37px;
+        .ant-tabs-nav-wrap {
+            margin-left: 30px;
+        }
         .onerow {
-            width: 100%;
+            //width: 100%;
             display: flex;
             height: 40px;
             position: relative;
-            //margin-top: 5xp;
+            margin-top: 15px;
+            margin-left: 38px;
+            //margin-right: 38px;
             .taskmain {
                 font-size: 18px;
+                padding-top: 7px;
                 color: #000000;
             }
             .btn {
                 position: absolute;
                 top: 0;
-                right: 110px;
+                right: 168px;
                 background-color: #409EFF;
                 width: 130px;
                 height: 40px;
@@ -358,7 +364,7 @@
             }
             .edit {
                 position: absolute;
-                right: 0;
+                right: 48px;
                 top: 0;
                 color: #409EFF;
                 width: 100px;
@@ -391,6 +397,8 @@
             background-color: #EFF4FC;
             align-items: center;
             margin-top: 20px;
+            margin-left: 38px;
+            margin-right: 38px;
             .stageimg {
                 margin-left: 31px;
             }
@@ -402,11 +410,13 @@
             }
         }
         .course {
-            width: 100%;
+            //width: 100%;
             display: flex;
             flex-wrap: wrap;
             align-items: center;
             padding: 10px;
+            margin-left: 38px;
+            margin-right: 38px;
             //margin: 0 12px;
             border: 1px solid #F2F6FC;
             .first {  
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 3b94a282..2f6b43e1 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -69,7 +69,9 @@
         @expand="expandTable"
         :pagination="false"
       />
-      <div class="pa">
+      
+    </div>
+    <div class="pa">
         <a-pagination
           showSizeChanger="true"
           showQuickJumper="true"
@@ -79,7 +81,6 @@
           :total="tableDataTotal"
           class="pagination"
         />
-      </div>
     </div>
     <!-- 表格 -->
     <div :class="out ? 'out' : 'unout'">
@@ -354,6 +355,7 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
+  //align-items: center;
   position: relative;
   // position: relative;
   .filter {
@@ -451,6 +453,7 @@ export default {
   .tableBox {
     margin: 20px 38px 30px ;
     display: flex;
+    flex: 1;
     //position: relative;
     flex-direction: column;
     
@@ -463,17 +466,20 @@ export default {
       > td {
       background: #f6f9fd;
     }
-    .pa {
-      left: 0;
+    
+  }
+  .pa {
       width: 100%;
       // height: 20px;
       // background-color: red;
       display: flex;
       justify-content: center;
       //position: absolute;
-      //bottom: 20px;
+      margin-bottom: 20px;
+      .pagination {
+        margin-bottom: 20px;
+      }
     }
-  }
   .out {
     display: block;
     position: absolute;
@@ -540,7 +546,7 @@ export default {
             border-radius: 5px;
             // height: 120%;
             width: 100%;
-            height: 40px;
+            height: 30px;
           }
         }
       }