From 1fcd299abc3df937ec3fe1d4ad4ade487ab37402 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 14 Feb 2023 01:18:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=8E=A5=E5=85=A5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=91=98=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                        |  14 +-
 src/components/drawers/MemberList.vue    | 140 ++++--
 src/components/drawers/SubsetManage.vue  |  24 +-
 src/components/student/CommonStudent.vue | 516 +++++++++++++++--------
 src/views/projectcenter/TaskPage.vue     |  13 +-
 5 files changed, 473 insertions(+), 234 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index 2a055cc5..c1fe47a4 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-11 16:22:43
+ * @LastEditTime: 2023-02-13 23:09:53
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -65,7 +65,7 @@ export const setConfig = (obj) => http.post("/admin/router/setConfig", obj);
 //获取学员列表
 export const getStudent = (obj) => http.post("/admin/router/studentList", obj);
 //获取路径图详情-包含关卡及任务列表
-export const getRouterDetail = (routerId,useTask) =>
+export const getRouterDetail = (routerId, useTask) =>
     http.get("/admin/router/detail", {
         params: {
             routerId: routerId,
@@ -224,4 +224,12 @@ export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/
 //分组
 export const changeGroupByStudentId = (obj) => http.post('/admin/student/changeGroupByStudentId', obj)
 //导入小组
-export const importGroup = (uuid) => http.post('/admin/studentGroup/importGroup/{pid}', { params: { uuid: uuid } })
\ No newline at end of file
+export const importGroup = (uuid) => http.post('/admin/studentGroup/importGroup/{pid}', { params: { uuid: uuid } })
+//添加小组学员
+export const addGroupMember = (obj) => http.post('/admin/studentGroup/addGroupMember', obj)
+//获取小组成员
+export const groupMemberList = (obj) => http.post('/admin/studentGroup/groupMemberList', obj)
+//删除小组成员
+export const delGroupStudent = (obj) => http.post('/admin/studentGroup/delStudent', obj)
+//随机分组
+export const randomGroup = (obj, projectId) => http.post(`/admin/studentGroup/randomGroup/${projectId}`, obj)
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 8bfa6830..843a3833 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -38,10 +38,33 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1" @click="showStuAdd" style="margin-right: 20px">
+          <!-- <div
+            class="btn btn1"
+            @click="showStuAdd"
+            style="margin-right: 20px; color: #fff"
+          >
             <div class="img1"></div>
+            
             <div class="wz">添加组员</div>
-          </div>
+          </div> -->
+          <CommonStudent
+            :type="1"
+            title="添加组员"
+            @finash="submitCall"
+            :isGroup="true"
+            :id="projectId"
+            :groupId="chooseGroupId"
+            :groupName="chooseGroupName"
+          >
+            <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
+              <template #icon
+                ><img
+                  style="margin-right: 10px"
+                  src="../../assets/images/courseManage/add0.png"
+              /></template>
+              添加组员
+            </a-button></CommonStudent
+          >
           <div class="btn btn2" @click="showModal">
             <div class="img3"></div>
             <div class="wz">批量删除</div>
@@ -148,32 +171,31 @@
         </div>
       </a-modal>
       <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
-      <add-group-members
+      <!-- <add-group-members
         v-model:AGMembers="Stuvisible"
         :chooseGroupId="chooseGroupId"
         :projectId="projectId"
         @getStuPro="getStu"
-      />
+      /> -->
     </div>
   </a-drawer>
 </template>
 
 <script>
-import { toRefs, reactive } from "vue";
+import { toRefs, reactive, watch } from "vue";
 // import StuAdd from "./StuAdd.vue";
-import {
-  // getProjStu,
-  removeGroupStudent,
-  groupMemberList,
-} from "../../api/indexProjStu";
+// import { getProjStu } from "../../api/indexProjStu";
+import { groupMemberList, delGroupStudent } from "@/api/index1";
 import { toDate } from "../../api/method";
 import { message } from "ant-design-vue";
-import AddGroupMembers from "./AddGroupMembers.vue";
+// import AddGroupMembers from "./AddGroupMembers.vue";
+import CommonStudent from "@/components/student/CommonStudent";
 export default {
   name: "MemberList",
   components: {
     // StuAdd,
-    AddGroupMembers,
+    // AddGroupMembers,
+    CommonStudent,
   },
   props: {
     Lvisible: {
@@ -184,6 +206,10 @@ export default {
       type: Number,
       default: null,
     },
+    chooseGroupName: {
+      type: String,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
@@ -224,7 +250,7 @@ export default {
           dataIndex: "name",
           key: "name",
           width: 40,
-          align: "left",
+          align: "center",
           className: "h head",
         },
         {
@@ -272,6 +298,8 @@ export default {
           },
         },
       ],
+      addAuthList: [], //学员
+      authClassify: 3,
     });
     const closeDrawer = () => {
       ctx.emit("update:Lvisible", false);
@@ -295,7 +323,7 @@ export default {
         studentIds: state.selectedRows,
       };
 
-      removeGroupStudent(obj)
+      delGroupStudent(obj)
         .then((res) => {
           console.log(res, "删除成功");
           message.success("删除成功");
@@ -329,9 +357,9 @@ export default {
           group: value.groupName, //小组名
           studentId: value.studentId, //学生id
           currentStageId: value.currentStageId, //当前关卡id
-          name: value.name, //用户名
-          bum: value.userInfoBo.deptName, //部门
-          gangw: value.userInfoBo.jobName, //岗位
+          name: value.studentName, //用户名
+          bum: value.studentDepartName, //部门
+          gangw: value.studentJobName, //岗位
           completeStageCnt: value.completeStageCnt, //当前完成阶段数
           totalStageCnt: value.totalStageCnt, //总阶段数
           progress: value.completeStageCnt + "/" + value.totalStageCnt,
@@ -344,8 +372,9 @@ export default {
     };
     //获取组员列表
     const getStu = (obj) => {
+      console.log("获取学员");
       let objf = obj || {
-        studentName: "",
+        studentName: state.name,
         pageNo: state.currentPage,
         pageSize: 10,
         pid: props.projectId,
@@ -357,7 +386,8 @@ export default {
         if (res.data.code === 200) {
           state.total = res.data.data.total;
           state.tableDataTotal = res.data.data.total;
-          let arr = res.data.data.rows;
+          let arr = res.data.data.records;
+          console.log("获取小组学员", arr);
           getTableDataList(arr);
         }
         // let leng = res.data.data.rows.length;
@@ -410,33 +440,31 @@ export default {
     };
     //学员搜索
     const searchStu = () => {
-      let obj = {
-        deptIds: [], //部门
-        groupName: "",
-        name: state.name,
-        pageNo: state.currentPage,
-        pageSize: 10,
-        projectId: props.projectId,
-        topFlag: "",
-      };
+      // let obj = {
+      //   studentName: state.name,
+      //   pageNo: state.currentPage,
+      //   pageSize: 10,
+      //   pid: props.projectId,
+      //   groupId: props.chooseGroupId, //暂时写死
+      // };
       //重新获取列表
-      getStu(obj);
+      getStu();
     };
     //重置
     const resetSearch = () => {
       state.name = null;
-      let obj = {
-        deptIds: [], //部门
-        groupName: "",
-        name: "",
-        pageNo: 1,
-        pageSize: 10,
-        projectId: props.projectId,
-        groupId: props.chooseGroupId,
-        topFlag: "",
-      };
+      // let obj = {
+      //   deptIds: [], //部门
+      //   groupName: "",
+      //   name: "",
+      //   pageNo: 1,
+      //   pageSize: 10,
+      //   projectId: props.projectId,
+      //   groupId: props.chooseGroupId,
+      //   topFlag: "",
+      // };
       //重新获取列表
-      getStu(obj);
+      getStu();
     };
     const deleteOne = (id) => {
       // console.log(id, "fewfew");
@@ -459,7 +487,7 @@ export default {
         studentIds: state.selectedRows,
       };
       console.log("删除小组学员obj", obj);
-      removeGroupStudent(obj)
+      delGroupStudent(obj)
         .then((res) => {
           state.deone = false;
           console.log(res, "单个删除成功");
@@ -473,6 +501,35 @@ export default {
       state.selectedRows = [];
     };
 
+    //添加学员
+    watch(
+      () => state.addAuthList,
+      (res) => {
+        console.log("res", res, state.addAuthList);
+        // let obj = {
+        //   deptList: res[1],
+        //   groupList: res[2],
+        //   projectId: state.projectId,
+        //   studentList: res[0],
+        //   projectGroupId: 0,
+        // };
+        // console.log("obj", obj);
+        // state.loading = true;
+        // api
+        //   .addStudentProject(obj)
+        //   .then((res) => {
+        //     console.log("添加学员成功", res);
+        //     message.success("添加学员成功");
+        //     getStu();
+        //   })
+        //   .catch((err) => {
+        //     console.log("添加学员失败", err);
+        //   });
+      }
+    );
+    function submitCall(flag) {
+      flag && getStu();
+    }
     return {
       ...toRefs(state),
       closeDrawer,
@@ -491,6 +548,7 @@ export default {
       deleteOne,
       closedeleone,
       yesdele,
+      submitCall,
     };
   },
 };
diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue
index 6e22a16d..6d3be939 100644
--- a/src/components/drawers/SubsetManage.vue
+++ b/src/components/drawers/SubsetManage.vue
@@ -39,14 +39,14 @@
         <div>
           <div class="groupin" v-for="(value, index) in groupNum2" :key="index">
             <a-input
-              v-model:value="value.name"
+              v-model:value="value.groupName"
               style="border-radius: 8px; height: 40px"
             />
             <a-input-number
               :min="1"
               :precision="0"
               style="width: 64px; height: 40px; border-radius: 8px"
-              v-model:value="peopleNum"
+              v-model:value="value.capacity"
             />
             <span style="margin-left: 3px">人</span>
             <div class="delete" @click="deleteGroup(value)">删除</div>
@@ -72,6 +72,7 @@
 import { reactive, toRefs } from "vue";
 import AddGroup from "./AddGroup.vue";
 import { message } from "ant-design-vue";
+import { randomGroup } from "@/api/index1";
 export default {
   name: "SubsetManage",
   components: { AddGroup },
@@ -80,6 +81,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    projectId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -116,8 +121,8 @@ export default {
       for (let i = 0; i < state.groupNum; i++) {
         let obj = {
           key: i,
-          name: "",
-          number: state.peopleNum,
+          groupName: "",
+          capacity: state.peopleNum,
         };
         arr.push(obj);
       }
@@ -135,6 +140,17 @@ export default {
     //添加小组
     const addGroup = () => {
       console.log("state.groupNum2", state.groupNum2);
+      let obj = {
+        pid: props.projectId,
+        randomGroups: state.groupNum2,
+      };
+      randomGroup(obj, props.projectId)
+        .then((res) => {
+          console.log("随机分组结果", res);
+        })
+        .catch((err) => {
+          console.log("随机分组失败", err);
+        });
     };
 
     return {
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 03f951a3..72b77989 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -3,97 +3,136 @@
 <template>
   <div class="CommonStudent">
     <a-drawer
-        :visible="visiable"
-        class="drawerStyle ProjCheckship CommonStudent"
-        placement="right"
-        width="60%"
+      :visible="visiable"
+      class="drawerStyle ProjCheckship CommonStudent"
+      placement="right"
+      width="60%"
     >
       <div class="drawerMain" id="ProjCheckship" style="">
         <div class="header">
           <div class="headerTitle">
-            {{ {1: "添加学员", 2: "添加学员", 3: "添加学员"}[type] || title }}
+            {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || title }}
           </div>
           <img
-              style="width: 29px; height: 29px; cursor: pointer"
-              src="../../assets/images/basicinfo/close.png"
-              @click="closeDrawer"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
           />
         </div>
         <div style="display: flex; overflow-x: auto; overflow-y: auto">
           <div class="tabs" style="min-width: 800px">
             <a-tabs v-model:activeKey="activeKey">
+              <!-- <a-tab-pane v-if="isGroup" :key="4" tab="项目内学员">
+                <div :style="{ height: screenHeight - 235 + 'px' }">
+                  <div>
+                    <a-form-item label="姓名：">
+                      <a-input
+                        v-model:value="proStudentName"
+                        style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                      <a-button
+                        type="primary"
+                        @click="searchAudi"
+                        style="margin-left: 20px; border-radius: 4px"
+                      >
+                        <template #icon>
+                          <SearchOutlined />
+                        </template>
+                        搜索
+                      </a-button>
+                      <a-button
+                        @click="resetAudienceInfo"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置
+                      </a-button>
+                    </a-form-item>
+                  </div>
+                  <div class="tableBox tabb">
+                    <a-table
+                      style="border: 1px solid #f2f6fe; width: 800px"
+                      row-key="id"
+                      :columns="stuColumns"
+                      :data-source="projectList"
+                      :loading="projectListTotal"
+                      :pagination="projectPagination"
+                      :row-selection="projectRowSelection"
+                    />
+                  </div>
+                </div>
+              </a-tab-pane> -->
               <a-tab-pane :key="1" tab="快速选人">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab1">
                     <a-form-item label="姓名">
                       <a-input
-                          v-model:value="nameSearch.keyword"
-                          style="width: 270px; height: 40px; border-radius: 8px"
-                          placeholder="请输入姓名"
-                          @change="peopleName"
+                        v-model:value="nameSearch.keyword"
+                        style="width: 270px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                        @change="peopleName"
                       />
                       <a-button
-                          type="primary"
-                          @click="onSearchStu"
-                          style="margin-left: 20px; border-radius: 4px"
+                        type="primary"
+                        @click="onSearchStu"
+                        style="margin-left: 20px; border-radius: 4px"
                       >
                         <template #icon>
-                          <SearchOutlined/>
+                          <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
                       <a-button
-                          @click="resetStu"
-                          style="margin-left: 20px; border-radius: 4px"
-                      >重置
+                        @click="resetStu"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置
                       </a-button>
                     </a-form-item>
                   </div>
                   <div
-                      class="chooseLeft"
-                      style="display: grid; grid-template-columns: 250px auto"
+                    class="chooseLeft"
+                    style="display: grid; grid-template-columns: 250px auto"
                   >
                     <div
-                        :style="{
+                      :style="{
                         height: screenHeight - 180 + 'px',
                         overflowY: 'auto',
                       }"
-                        style="border: 1px solid #f0f0f0"
+                      style="border: 1px solid #f0f0f0"
                     >
                       <div class="tree" style="margin: 10px 4px 220px 10px">
                         <a-tree
-                            allow-clear
-                            tree-default-expand-all
-                            :tree-data="treeData"
-                            :loading="orgLoading"
-                            :load-data="onLoadData"
-                            v-model:selectedKeys="stuTreeSelectKeys"
-                            v-model:expandedKeys="stuTreeExpandedKeys"
-                            :fieldNames="{
+                          allow-clear
+                          tree-default-expand-all
+                          :tree-data="treeData"
+                          :loading="orgLoading"
+                          :load-data="onLoadData"
+                          v-model:selectedKeys="stuTreeSelectKeys"
+                          v-model:expandedKeys="stuTreeExpandedKeys"
+                          :fieldNames="{
                             children: 'treeChildList',
                             key: 'id',
                             title: 'name',
                             value: 'name',
                           }"
-                            @select="stuStuOrgSelect"
+                          @select="stuStuOrgSelect"
                         >
                         </a-tree>
                       </div>
                     </div>
                     <div
-                        class="tableBox tabb"
-                        style="
+                      class="tableBox tabb"
+                      style="
                         margin: 0px 4px 120px 10px;
                         border: 1px solid #f0f0f0;
                       "
                     >
                       <a-table
-                          :columns="stuColumns"
-                          :data-source="stuData"
-                          :pagination="stuPagination"
-                          :loading="stuLoading"
-                          row-key="id"
-                          :row-selection="stuRowSelection"
+                        :columns="stuColumns"
+                        :data-source="stuData"
+                        :pagination="stuPagination"
+                        :loading="stuLoading"
+                        row-key="id"
+                        :row-selection="stuRowSelection"
                       />
                     </div>
                   </div>
@@ -104,43 +143,42 @@
                   <div class="tab2">
                     <a-form-item label="组织：">
                       <a-input
-                          v-model:value="searchOrgName.keyword"
-                          style="width: 230px; height: 40px; border-radius: 8px"
-                          placeholder="请输入组织"
+                        v-model:value="searchOrgName.keyword"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
                       />
                       <a-button
-                          type="primary"
-                          @click="searchOrg"
-                          style="margin-left: 20px; border-radius: 4px"
+                        type="primary"
+                        @click="searchOrg"
+                        style="margin-left: 20px; border-radius: 4px"
                       >
                         <template #icon>
-                          <SearchOutlined/>
+                          <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
                       <a-button
-                          @click="resetOrg"
-                          style="margin-left: 20px; border-radius: 4px"
-                      >重置
-                      </a-button
-                      >
+                        @click="resetOrg"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置
+                      </a-button>
                     </a-form-item>
                   </div>
                   <div class="boeTree">
                     <a-tree
-                        :tree-data="searchOrgName.keyword ? orgData : treeOrgData"
-                        @select="onOrgSelectChange"
-                        :loading="orgOrgLoading"
-                        :load-data="onLoadOrgData"
-                        :fieldNames="{
+                      :tree-data="searchOrgName.keyword ? orgData : treeOrgData"
+                      @select="onOrgSelectChange"
+                      :loading="orgOrgLoading"
+                      :load-data="onLoadOrgData"
+                      :fieldNames="{
                         children: 'treeChildList',
                         key: 'id',
                         title: 'name',
                         value: 'name',
                       }"
-                        row-key="id"
-                        :row-selection="orgRowSelection"
-                        multiple
+                      row-key="id"
+                      :row-selection="orgRowSelection"
+                      multiple
                     >
                     </a-tree>
                   </div>
@@ -151,36 +189,36 @@
                   <div>
                     <a-form-item label="受众名称：">
                       <a-input
-                          v-model:value="audienceName.keyword"
-                          style="width: 260px; height: 40px; border-radius: 8px"
-                          placeholder="请输入受众名称"
+                        v-model:value="audienceName.keyword"
+                        style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入受众名称"
                       />
                       <a-button
-                          type="primary"
-                          @click="searchAudi"
-                          style="margin-left: 20px; border-radius: 4px"
+                        type="primary"
+                        @click="searchAudi"
+                        style="margin-left: 20px; border-radius: 4px"
                       >
                         <template #icon>
-                          <SearchOutlined/>
+                          <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
                       <a-button
-                          @click="resetAudienceInfo"
-                          style="margin-left: 20px; border-radius: 4px"
-                      >重置
+                        @click="resetAudienceInfo"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置
                       </a-button>
                     </a-form-item>
                   </div>
                   <div class="tableBox tabb">
                     <a-table
-                        style="border: 1px solid #f2f6fe;width:800px"
-                        row-key="id"
-                        :columns="audiColums"
-                        :data-source="audiData"
-                        :loading="audiLoading"
-                        :pagination="auditPagination"
-                        :row-selection="auditRowSelection"
+                      style="border: 1px solid #f2f6fe; width: 800px"
+                      row-key="id"
+                      :columns="audiColums"
+                      :data-source="audiData"
+                      :loading="audiLoading"
+                      :pagination="auditPagination"
+                      :row-selection="auditRowSelection"
                     />
                   </div>
                 </div>
@@ -193,7 +231,10 @@
                 <div class="already">已选</div>
               </div>
             </div>
-            <div :style="{ 'max-height': screenHeight - 235 + 'px' }" style="overflow-y: auto">
+            <div
+              :style="{ 'max-height': screenHeight - 235 + 'px' }"
+              style="overflow-y: auto"
+            >
               <div class="selecteds">
                 <div class="person">快速选人</div>
                 <div v-for="(item, i) in selectsData.studentList">
@@ -213,72 +254,78 @@
                   </div>
                 </div>
                 <div
-                    v-if="!person && selectsData.studentList.length > 10"
-                    class="ifsw"
+                  v-if="!person && selectsData.studentList.length > 10"
+                  class="ifsw"
                 >
                   <div @click="person = !person" class="“sw”">查看更多></div>
                 </div>
                 <div
-                    v-if="person && selectsData.studentList.length > 10"
-                    class="ifsw"
+                  v-if="person && selectsData.studentList.length > 10"
+                  class="ifsw"
                 >
                   <div @click="person = !person" class="sw">收起&lt;</div>
                 </div>
               </div>
               <div v-if="!selectStu" class="selecteds">
                 <div class="dept">添加组织</div>
-                <div v-for="(item,i) in selectsData.deptList">
-                  <div v-if="i<11">
+                <div v-for="(item, i) in selectsData.deptList">
+                  <div v-if="i < 11">
                     <div class="chose1">
-                      <div class="span"> {{ item.name }}</div>
+                      <div class="span">{{ item.name }}</div>
                       <div class="ch1" @click="orgDel(i)"></div>
                     </div>
                   </div>
                   <div v-else>
                     <div v-if="dept">
                       <div class="chose1">
-                        <div class="span"> {{ item.name }}</div>
+                        <div class="span">{{ item.name }}</div>
                         <div class="ch1" @click="orgDel(i)"></div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <div v-if="!dept && selectsData.deptList.length >10" class="ifsw">
-                  <div @click="dept = !dept" class=“sw”>查看更多></div>
+                <div
+                  v-if="!dept && selectsData.deptList.length > 10"
+                  class="ifsw"
+                >
+                  <div @click="dept = !dept" class="“sw”">查看更多></div>
                 </div>
-                <div v-if="dept && selectsData.deptList.length >10" class="ifsw">
-                  <div @click="dept = !dept" class="sw"> 收起&lt;</div>
+                <div
+                  v-if="dept && selectsData.deptList.length > 10"
+                  class="ifsw"
+                >
+                  <div @click="dept = !dept" class="sw">收起&lt;</div>
                 </div>
               </div>
               <!--受众-->
-             <div v-if="!selectStu" class="selecteds">
-               <div class="group">受众关联</div>
-               <div v-for="(item, i) in selectsData.groupList">
-                 <div v-if="i < 11">
-                   <div class="chose2">
-                     <div class="span">{{ item.audienceName }}</div>
-                     <div class="ch2" @click="AuditDel(i)"></div>
-                   </div>
-                 </div>
-                 <div v-else>
-                   <div v-if="group">
-                     <div class="chose2">
-                       <div class="span">{{ item.audienceName }}</div>
-                       <div class="ch2" @click="AuditDel(i)"></div>
-                     </div>
-                   </div>
-                 </div>
-               </div>
-               <div
-                   v-if="!group && selectsData.groupList.length > 10"
-                   class="ifsw"
-               >
-                 <div @click="group = !group" class="“sw”">查看更多></div>
-               </div>
-               <div v-if="group && selectsData.groupList > 10" class="ifsw">
-                 <div @click="group = !group" class="sw">收起&lt;</div>
-               </div>
-             </div>
+              <div v-if="!selectStu" class="selecteds">
+                <div class="group">受众关联</div>
+                <div v-for="(item, i) in selectsData.groupList">
+                  <div v-if="i < 11">
+                    <div class="chose2">
+                      <div class="span">{{ item.audienceName }}</div>
+                      <div class="ch2" @click="AuditDel(i)"></div>
+                    </div>
+                  </div>
+                  <div v-else>
+                    <div v-if="group">
+                      <div class="chose2">
+                        <div class="span">{{ item.audienceName }}</div>
+                        <div class="ch2" @click="AuditDel(i)"></div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  v-if="!group && selectsData.groupList.length > 10"
+                  class="ifsw"
+                >
+                  <div @click="group = !group" class="“sw”">查看更多></div>
+                </div>
+                <div v-if="group && selectsData.groupList > 10" class="ifsw">
+                  <div @click="group = !group" class="sw">收起&lt;</div>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -291,13 +338,13 @@
     <a-button @click="openDrawer" type="link"><slot></slot></a-button>
   </div>
   <a-modal
-      :style="{padding: 0,position: relative,right: '-20%'}"
-      :closable="true"
-      :visible="stageVisible"
-      :footer="null"
-      centered="true"
-      @ok="handleStageOk"
-      wrapClassName="changeModal"
+    :style="{ padding: 0, position: relative, right: '-20%' }"
+    :closable="true"
+    :visible="stageVisible"
+    :footer="null"
+    centered="true"
+    @ok="handleStageOk"
+    wrapClassName="changeModal"
   >
     <div class="con">
       <div class="header">
@@ -311,34 +358,34 @@
           <!-- <div class="cur">当前关卡：关卡2</div> -->
           <div class="select">
             <a-select
-                style="width: 400px"
-                :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
-                v-model:value="selectsData.stageId"
-                className="cus-select"
+              style="width: 400px"
+              :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
+              v-model:value="selectsData.stageId"
+              className="cus-select"
             >
               <a-select-option
-                  v-for="(item, i) in stageIds"
-                  :key="i"
-                  :value="item.id"
-              >{{ item.name || "默认" }}
+                v-for="(item, i) in stageIds"
+                :key="i"
+                :value="item.id"
+                >{{ item.name || "默认" }}
               </a-select-option>
             </a-select>
           </div>
           <span style="color: #999999; margin-left: 10px"
-          ><minus-circle-outlined/>已在其他关卡的学员，不会被添加到该关卡</span
+            ><minus-circle-outlined />已在其他关卡的学员，不会被添加到该关卡</span
           >
           <div class="btn" style="margin-top: 50px">
             <button
-                class="sameb btn1"
-                @click="closeChangeModal"
-                style="cursor: pointer"
+              class="sameb btn1"
+              @click="closeChangeModal"
+              style="cursor: pointer"
             >
               取消
             </button>
             <button
-                class="sameb btn2"
-                @click="handleStageOk"
-                style="cursor: pointer"
+              class="sameb btn2"
+              @click="handleStageOk"
+              style="cursor: pointer"
             >
               确定
             </button>
@@ -349,23 +396,27 @@
   </a-modal>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import {boeRequest, useBoeApi, useBoeApiPage} from "@/api/request";
+import { computed, defineEmits, defineProps, ref, watch } from "vue";
+import { boeRequest, useBoeApi, useBoeApiPage } from "@/api/request";
 import {
   AUDIENCE_LIST,
   ORG_CHILD_LIST,
   ORG_LIST,
   USER_LIST,
 } from "@/api/ThirdApi";
-import {saveStu} from "@/api/index1";
-
+import {
+  saveStu,
+  //  addGroupMember,
+  // getStuPage,
+} from "@/api/index1";
+// import { getProjStu } from "@/api/indexProjStu";
 const emit = defineEmits({});
 const props = defineProps({
   type: Number,
   id: String,
   title: {
     type: String,
-    default: '',
+    default: "",
   },
   clear: {
     type: Boolean,
@@ -383,12 +434,85 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  isGroup: {
+    type: Boolean,
+    default: false,
+  },
+  projectId: {
+    type: Number,
+    default: null,
+  },
+  groupId: {
+    type: Number,
+    default: null,
+  },
+  groupName: {
+    type: String,
+    default: null,
+  },
 });
+//获取项目学员
+// const procurrentPage = ref(1);
+// const projectList = ref([]);
+// const proStudentName = ref("");
+// const projectListTotal = ref(-1);
+// const projectPageSize = ref(10);
+// const projectSelectKeys = ref([]);
+// const projectPagination = computed(() => ({
+//   total: projectListTotal.value,
+//   showSizeChanger: false,
+//   current: procurrentPage.value,
+//   pageSize: projectPageSize.value,
+//   onChange: projectChangePagination,
+// }));
+// const projectRowSelection = computed(() => ({
+//   columnWidth: 20,
+//   selectedRowKeys: projectSelectKeys.value,
+//   onChange: onProjectSelectChange,
+//   preserveSelectedRowKeys: true,
+// }));
+// const getStu = () => {
+//   let obj = {
+//     studentName: proStudentName.value,
+//     pageNo: procurrentPage.value,
+//     pageSize: 10,
+//     projectId: props.projectId,
+//   };
+//   projectListTotal.value = -1;
+//   console.log("获取项目学员", obj);
+//   getStuPage(obj).then((res) => {
+//     console.log("获取项目学员", res);
+//     if (res.data.code === 200) {
+//       let arr = res.data.data.records;
+//       let array = [];
+//       arr.map((value) => {
+//         let obj = {
+//           id: value.id,
+//           realName: value.studentName,
+//           userNo: value.studentId,
+//           orgName: value.studentOrgName ? value.studentOrgName : "-",
+//           departName: value.studentDepartName ? value.studentDepartName : "-",
+//         };
+//         array.push(obj);
+//       });
+//       projectList.value = array;
+//       projectListTotal.value = res.data.data.total;
+//     }
+//   });
+// };
+// getStu();
+// const projectChangePagination = () => {};
+// function onProjectSelectChange(e, l) {
+//   console.log("eeeee", e, l);
+//   projectSelectKeys.value = e;
+//   selectsData.value.projectMemberList = l;
+// }
 
 const person = ref(false);
 // const dept =ref(false)
 const group = ref(false);
 const visiable = ref(false);
+// const activeKey = ref(props.isGroup ? 4 : 1);
 const activeKey = ref(1);
 const stageVisible = ref(false);
 const selectsData = ref({
@@ -411,10 +535,10 @@ const audienceName = ref({
   pageSize: 10,
 });
 const searchOrgName = ref({
-  keyword: '',
+  keyword: "",
   page: 1,
-  pageSize: 10
-})
+  pageSize: 10,
+});
 const stageIds = computed(() => props.stage);
 const {
   data: stuData,
@@ -430,25 +554,25 @@ const {
   totalPage: (res) => res.result.totalPage,
   total: (res) => res.result.totalElement,
 });
-const {
-  data: orgData,
-  fetch: searchOrg,
-} = useBoeApiPage(ORG_LIST, searchOrgName.value)
-const {data: treeData, loading: orgLoading} = useBoeApi(
-    ORG_LIST,
-    {keyword: ""},
-    {
-      init: true,
-      result: (res) => res.result.map((e) => ({...e, isLeaf: false})),
-    }
+const { data: orgData, fetch: searchOrg } = useBoeApiPage(
+  ORG_LIST,
+  searchOrgName.value
 );
-const {data: treeOrgData, loading: orgOrgLoading} = useBoeApi(
-    ORG_LIST,
-    {keyword: ""},
-    {
-      init: true,
-      result: (res) => res.result.map((e) => ({...e, isLeaf: false})),
-    }
+const { data: treeData, loading: orgLoading } = useBoeApi(
+  ORG_LIST,
+  { keyword: "" },
+  {
+    init: true,
+    result: (res) => res.result.map((e) => ({ ...e, isLeaf: false })),
+  }
+);
+const { data: treeOrgData, loading: orgOrgLoading } = useBoeApi(
+  ORG_LIST,
+  { keyword: "" },
+  {
+    init: true,
+    result: (res) => res.result.map((e) => ({ ...e, isLeaf: false })),
+  }
 );
 
 const {
@@ -462,7 +586,7 @@ const {
 } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
   init: true,
   result: (res) =>
-      res.result.audienceList.map((e) => ({...e, id: e.id + ""})),
+    res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
   totalPage: (res) => res.result.totalPage,
   total: (res) => res.result.totalElement,
 });
@@ -537,7 +661,7 @@ const auditSelectKeys = ref([]);
 const screenHeight = ref(document.body.clientHeight);
 //const screenWidth = ref(document.body.clientWidth);
 const stuRowSelection = computed(() => ({
-  type:props.selectOne?'radio':'checkbox',
+  type: props.selectOne ? "radio" : "checkbox",
   columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
   onChange: onStuSelectChange,
@@ -577,20 +701,20 @@ const closeDrawer = () => {
 };
 
 function onLoadData(treeNode) {
-  return boeRequest(ORG_CHILD_LIST, {keyword: "", orgId: treeNode.id}).then(
-      (r) => {
-        treeNode.dataRef.treeChildList = r.result.directChildList;
-        treeData.value = [...treeData.value];
-      }
+  return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
+    (r) => {
+      treeNode.dataRef.treeChildList = r.result.directChildList;
+      treeData.value = [...treeData.value];
+    }
   );
 }
 
 function onLoadOrgData(treeNode) {
-  return boeRequest(ORG_CHILD_LIST, {keyword: "", orgId: treeNode.id}).then(
-      (r) => {
-        treeNode.dataRef.treeChildList = r.result.directChildList;
-        treeOrgData.value = [...treeOrgData.value];
-      }
+  return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
+    (r) => {
+      treeNode.dataRef.treeChildList = r.result.directChildList;
+      treeOrgData.value = [...treeOrgData.value];
+    }
   );
 }
 
@@ -617,7 +741,7 @@ function stuStuOrgSelect(e) {
 
 function stuDel(i) {
   stuSelectKeys.value = stuSelectKeys.value.filter(
-      (e) => e !== selectsData.value.studentList[i].id
+    (e) => e !== selectsData.value.studentList[i].id
   );
   selectsData.value.studentList.splice(i, 1);
 }
@@ -628,7 +752,7 @@ function stuDel(i) {
 // }
 function AuditDel(i) {
   auditSelectKeys.value = auditSelectKeys.value.filter(
-      (e) => e !== selectsData.value.groupList[i].id
+    (e) => e !== selectsData.value.groupList[i].id
   );
   selectsData.value.groupList.splice(i, 1);
 }
@@ -690,7 +814,7 @@ const deleteDepSelect = () => {
 };
 //重置组织
 const resetOrg = () => {
-  searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
+  searchOrgName.value = { keyword: "", page: 1, pageSize: 10 };
 };
 //重置受众
 const resetAudienceInfo = () => {
@@ -725,15 +849,42 @@ function handleStageOk() {
   saveStu({
     targetId: props.id,
     type: props.type,
-    clear:props.clear,
+    clear: props.clear,
     deptIds: selectsData.value.deptList?.map((e) => e.id),
     stageId: selectsData.value.stageId,
     groupIds: selectsData.value.groupList?.map((e) => e.id),
     studentList: selectsData.value.studentList,
+    groupName: props.groupName,
+    groupId: props.groupId,
   }).then(() => {
     deleteDepSelect();
     emit("finash", true);
   });
+  // //添加小组学员
+  // if (props.isGroup) {
+  //   console.log("添加组员传参", selectsData.value, {
+  //     groupId: props.groupId,
+  //     pid: props.projectId,
+  //     groupName: props.groupName,
+  //     ids: selectsData.value.studentList?.map((e) => e.id),
+  //   });
+  //   addGroupMember({
+  //     groupId: props.groupId,
+  //     pid: props.projectId,
+  //     groupName: props.groupName,
+  //     studentIds: selectsData.value.studentList?.map((e) => e.id),
+  //   })
+  //     .then((res) => {
+  //       console.log("添加小组学员", res);
+  //       deleteDepSelect();
+  //       emit("finash", true);
+  //     })
+  //     .catch((err) => {
+  //       console.log("添加小组学员失败", err);
+  //     });
+  // } else {
+
+  // }
 }
 
 watch(visiable, () => {
@@ -746,6 +897,7 @@ watch(visiable, () => {
   nameSearch.value.departId = null;
   stuTreeExpandedKeys.value = [];
   stuTreeSelectKeys.value = [];
+  // activeKey.value = props.isGroup ? 4 : 1;
   activeKey.value = 1;
   selectsData.value = {
     stageId: "",
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 4d61e645..b0733092 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -803,7 +803,9 @@
                       </div>
                       <div
                         class="grofooter"
-                        @click="showMemberList(item.projectGroupId)"
+                        @click="
+                          showMemberList(item.projectGroupId, item.groupName)
+                        "
                       >
                         <div class="ftext">组员名单 ></div>
                         <!-- <div class="peoples">
@@ -1496,7 +1498,7 @@
     </a-modal>
 
     <!-- 学员（小组管理）创建小组抽屉 -->
-    <subset-manage v-model:Svisible="subsetVisivle" />
+    <subset-manage v-model:Svisible="subsetVisivle" :projectId="projectId" />
     <!-- 学员管理-添加学员抽屉 -->
     <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
     <!-- 添加学员抽屉 -->
@@ -1529,6 +1531,7 @@
     <member-list
       v-model:Lvisible="Lvisible"
       v-model:chooseGroupId="chooseGroupId"
+      v-model:chooseGroupName="chooseGroupName"
       v-model:projectId="projectId"
     />
     <!-- 面授学员抽屉 -->
@@ -2425,7 +2428,8 @@ export default {
       TaskFaceImpStuvisible: false, //批量面授报名
       valuestugn: "", //小组管理的输入的小组名称
       checkStuId: null, //要查看的学员id
-      chooseGroupId: null,
+      chooseGroupId: null, //选择的小组id
+      chooseGroupName: null, //选择的小组名称
       morFaceT: false, //批量面授报名按钮
       faceArr: [], //任务大纲列表所有name
       action: null,
@@ -3216,10 +3220,11 @@ export default {
       console.log("facestudent", state.facestudent);
     };
     //面授学员的弹窗
-    const showMemberList = (id) => {
+    const showMemberList = (id, name) => {
       state.Lvisible = true;
       console.log("ssdsdsdsd", id);
       state.chooseGroupId = id;
+      state.chooseGroupName = name;
     };
     //活动考勤的抽屉
     {