Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/views/projectcenter/ProjectManage.vue

@@ -163,6 +163,7 @@ const columns = [
     key: "operation",
     width: 300,
     align: "center",
+    fixed: "right",
   },
 ];
 

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>
+            </router-link>
         </div>
     </div>
-    </div>
+    <div class="split" style="flex-shrink: 0;"></div>
-    <div class="split"></div>
     <div class="content">
         <a-tabs class="tab"
             v-model:activeKey="activeKey"
             size="large"
-            :tabBarStyle="{ marginLeft: '10px' }">
+            :tabBarStyle="{ marginLeft: '10px',marginTop: '5px' }">
-            <a-tab-pane key="2" tab="概览">Content of Tab Pane 1</a-tab-pane>
+            <a-tab-pane key="1" tab="概览"><div class="split"></div></a-tab-pane>
-            <a-tab-pane key="1" tab="任务" force-render>
+            <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 {  

src/views/research/ResearchManage.vue

@@ -69,6 +69,8 @@
         @expand="expandTable"
         :pagination="false"
       />
+      
+    </div>
     <div class="pa">
         <a-pagination
           showSizeChanger="true"
@@ -80,7 +82,6 @@
           class="pagination"
         />
     </div>
-    </div>
     <!-- 表格 -->
     <div :class="out ? 'out' : 'unout'">
       <div class="top">
@@ -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,15 +466,18 @@ export default {
       > td {
       background: #f6f9fd;
     }
+    
+  }
   .pa {
-      left: 0;
       width: 100%;
       // height: 20px;
       // background-color: red;
       display: flex;
       justify-content: center;
       //position: absolute;
-      //bottom: 20px;
+      margin-bottom: 20px;
+      .pagination {
+        margin-bottom: 20px;
       }
     }
   .out {
@@ -540,7 +546,7 @@ export default {
             border-radius: 5px;
             // height: 120%;
             width: 100%;
-            height: 40px;
+            height: 30px;
           }
         }
       }