From e839da89d82dd6fc65079ebe490044d8e8223e83 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: Thu, 27 Oct 2022 11:30:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=84=E5=91=98=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E6=8A=BD=E5=B1=89=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98,?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=97=A0=E6=95=B0=E6=8D=AE=E7=9A=84=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/MemberList.vue     |  3 ++-
 src/components/drawers/StuAdd.vue         |  4 ++--
 src/components/drawers/SubsetManage.vue   |  7 ++++---
 src/views/projectcenter/ProjectManage.vue | 17 ++++++++++-------
 src/views/projectcenter/TaskPage.vue      |  1 +
 src/views/research/ManagePage.vue         |  8 +++++++-
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 7e08f8fa..cc142a0a 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -120,9 +120,10 @@
           <button class="btn btn2" @click="closeModal">确定</button>
         </div>
       </a-modal>
+      <stu-add v-model:Stuvisible="Stuvisible" />
     </div>
   </a-drawer>
-  <stu-add v-model:Stuvisible="Stuvisible" />
+  
 </template>
 
 <script>
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index 0d856116..07cf3448 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -3,7 +3,7 @@
     :visible="Stuvisible"
     class="drawerStyle stuadd"
     placement="right"
-    width="60%"
+    width="70%"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -1048,7 +1048,7 @@ export default {
 <style lang="scss">
 .stuadd {
   .drawerMain {
-    min-width: 540px;
+    min-width: 600px;
     margin: 0px 32px 0px 32px;
     // overflow-y: scroll;
     display: flex;
diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue
index 9737ca43..f271587b 100644
--- a/src/components/drawers/SubsetManage.vue
+++ b/src/components/drawers/SubsetManage.vue
@@ -3,7 +3,7 @@
     :visible="Svisible"
     class="drawerStyle subset"
     placement="right"
-    width="70%"
+    width="50%"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -54,9 +54,10 @@
         <button class="btn2">确定</button>
       </div>
     </div>
+    <!-- 创建小组抽屉 -->
+    <add-group v-model:Avisible="Avisible" />
   </a-drawer>
-  <!-- 创建小组抽屉 -->
-  <add-group v-model:Avisible="Avisible" />
+  
 </template>
 
 <script>
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 56ec8e2d..1cce8990 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -45,14 +45,17 @@
             style="width: 270px"
           />
         </div>
-        <div class="btnn btn1">
-          <div class="search"></div>
-          <div class="btnText">搜索</div>
-        </div>
-        <div class="btn btn2">
-          <div class="search"></div>
-          <div class="btnText">重置</div>
+        <div style="display: flex;margin-bottom: 20px">
+          <div class="btnn btn1">
+            <div class="search"></div>
+            <div class="btnText">搜索</div>
+          </div>
+          <div class="btn btn2">
+            <div class="search"></div>
+            <div class="btnText">重置</div>
+          </div>
         </div>
+        
       </div>
       <div class="btns">
         <div class="btn btn3" @click="showModal1">
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 73a5ab30..60d7c9dd 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2229,6 +2229,7 @@ export default {
     };
     const tostudent = () => {
       state.activeKey = "3";
+      state.activeKey1 = "8";
     };
     const showModal = () => {
       state.pubproject = true;
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index 30ede176..4a5d4025 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -51,7 +51,7 @@
           :data-source="dataSource"
           :loading="tableDataTotal === -1 ? true : false"
           expandRowByClick="true"
-          :scroll="{ x: 1500, y: 800 }"
+          :scroll="{ x: 1500}"
           @expand="expandTable"
           :pagination="false"
         />
@@ -108,31 +108,37 @@ export default {
         columns: [
           {
             title: '姓名',
+            width: 50,
             dataIndex: 'name',
             key: 'name',
           },
           {
             title: '部门',
+            width: 50,
             dataIndex: 'department',
             key: 'department',
           },
           {
+            width: 50,
             title: '岗位',
             dataIndex: 'post',
             key: 'post',
           },
           {
             title: '项目',
+            width: 50,
             dataIndex: 'project',
             key: 'project',
           },
           {
             title: '学习路径',
+            width: 50,
             dataIndex: 'learning',
             key: 'learning',
           },
           {
             title: '提交时间',
+            width: 50,
             dataIndex: 'submit',
             key: 'submit',
           },