feat:合并

src/api/indexProjStu.js

@@ -0,0 +1,7 @@
+import http from "./config";
+
+//获取项目学员列表
+export const getProjStu = (obj) => http.post('/admin/project/studentList', obj)
+
+//删除学员
+export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj)

src/components/drawers/AddRef.vue

@@ -130,6 +130,14 @@ export default {
       type: Number,
       default: null,
     },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -174,7 +182,7 @@ export default {
     };
     const handleFinish = values => {
       console.log(values);
-      updateRef(props.workId)
+      updateRef(props.EditRefId)
     };
     const handleFinishFailed = errors => {
       console.log(errors);
@@ -287,12 +295,12 @@ export default {
             //学习路径的创建
             if (props.isStudy == 1) {
               let objj = {
-                chapterId: 36,
-                courseId: 0,
+                chapterId: props.isactive,
+                courseId: res.data.data.linkId,
                 duration: 0,
                 flag: true,
                 name: obj.linkName,
-                routerId: 92,
+                routerId: props.routerId,
                 routerTaskId: 0,
                 type: 7,
               };

src/views/learningpath/LevelAddDetail.vue

@@ -208,15 +208,15 @@
           <!-- 添加作业侧弹窗 -->
           <div>
             <add-homework
-            v-model:addhomeworkVisible="addhomeworkvisible"
-            :isLevel=true
-            @changeData="updateTableData"
-            v-model:isactive="isactive"
-            v-model:edit="edit"
-            v-model:routerId="routerId"
-            v-model:chooseStageId="chooseStageId"
-            v-model:EditWorkId="EditWorkId"
-            v-model:routerTaskId="routerTaskId"
+              v-model:addhomeworkVisible="addhomeworkvisible"
+              :isLevel="true"
+              @changeData="updateTableData"
+              v-model:isactive="isactive"
+              v-model:edit="edit"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:EditWorkId="EditWorkId"
+              v-model:routerTaskId="routerTaskId"
             />
           </div>
           <div class="lin"></div>
@@ -232,14 +232,15 @@
           <div>
             <add-test
               v-model:addtestVisible="addtestvisible"
-              :isLevel=true
+              :isLevel="true"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:edit="edit"
               v-model:routerId="routerId"
               v-model:chooseStageId="chooseStageId"
               v-model:EditTestId="EditTestId"
-              v-model:routerTaskId="routerTaskId"            />
+              v-model:routerTaskId="routerTaskId"
+            />
           </div>
           <div class="lin"></div>
         </div>
@@ -512,7 +513,13 @@
                             margin-right: 25px;
                             cursor: pointer;
                           "
-                          @click="decideType(element.lei, element.courseId,element.id)"
+                          @click="
+                            decideType(
+                              element.lei,
+                              element.courseId,
+                              element.id
+                            )
+                          "
                         >
                           编辑
                         </span>
@@ -1069,10 +1076,10 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
-      EditWorkId:"", // 要编辑的 workid 
+      EditWorkId: "", // 要编辑的 workid
       EditTestId: "",
-      routerTaskId:"",
-      stageId:"",
+      routerTaskId: "",
+      stageId: "",
       isStudy: 1,
       cC: false,
       value1: "",
@@ -1158,7 +1165,7 @@ export default {
       state.EditWorkId = id;
       state.routerTaskId = eleId;
     };
-    const showDrawerAddTest = (id,eleId) => {
+    const showDrawerAddTest = (id, eleId) => {
       state.addtestvisible = true;
       state.EditTestId = id;
       state.routerTaskId = eleId;
@@ -1209,7 +1216,7 @@ export default {
       GetRouterDetail(state.routerId)
         .then((res) => {
           state.level = res.data.data.chapterList;
-         if (state.level.length > 0) {
+          if (state.level.length > 0) {
             dataAssignment(state.level[0].chapterId);
             state.isactive = state.level[0].chapterId;
           }
@@ -1590,15 +1597,17 @@ export default {
       state.editID = "";
     };
     const deleteLevelTask = () => {
-      deleteStudyTask({ routerTaskIds: state.deleteID }).then((res) =>{
-      state.deleteModal = false
-      message.success('删除成功')
-      getDetail();
-      console.log("删除成功", res)
-      }).catch((err) =>{
-        message.error('删除失败');
-        console.log(err);
-      })
+      deleteStudyTask({ routerTaskIds: state.deleteID })
+        .then((res) => {
+          state.deleteModal = false;
+          message.success("删除成功");
+          getDetail();
+          console.log("删除成功", res);
+        })
+        .catch((err) => {
+          message.error("删除失败");
+          console.log(err);
+        });
     };
 
     const showDrawerAddLive = () => {
@@ -1728,10 +1737,10 @@ export default {
         showEditRefDrawer(id);
       } else if (type == "直播") {
         showEditLiveDrawer(id);
-      }else if (type == "作业") {
-        showDrawerAddHomework(id,eleId);
-      }else if (type == "考试") {
-        showDrawerAddTest(id,eleId);
+      } else if (type == "作业") {
+        showDrawerAddHomework(id, eleId);
+      } else if (type == "考试") {
+        showDrawerAddTest(id, eleId);
       }
     };
     return {

src/views/projectcenter/TaskAdd.vue

@@ -139,10 +139,10 @@
           </div>
           <!-- 添加作业侧弹窗 -->
           <div>
-            <add-homework 
-              v-model:addhomeworkVisible="addhomeworkvisible" 
+            <add-homework
+              v-model:addhomeworkVisible="addhomeworkvisible"
               @changeData="updateTableData"
-              :isLevel=false
+              :isLevel="false"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -162,15 +162,15 @@
           </div>
           <!-- 添加考试侧弹窗 -->
           <div>
-            <add-test 
-            v-model:addtestVisible="addtestvisible" 
-            @changeData="updateTableData"
-            :isLevel=false
-            v-model:edit="edit"
-            v-model:projectId="projectId"
-            v-model:chooseStageId="chooseStageId"
-            v-model:EditTestId="EditTestId"
-            v-model:projectTaskId="projectTaskId"
+            <add-test
+              v-model:addtestVisible="addtestvisible"
+              @changeData="updateTableData"
+              :isLevel="false"
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:EditTestId="EditTestId"
+              v-model:projectTaskId="projectTaskId"
             />
           </div>
           <!-- 添加考试侧弹窗 -->
@@ -209,7 +209,7 @@
           <div>
             <add-ref
               v-model:addrefVisible="addrefvisible"
-              :isLevel=false
+              :isLevel="false"
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -525,7 +525,13 @@
                               margin-right: 25px;
                               cursor: pointer;
                             "
-                            @click="decideType(element.lei, element.courseId,element.id)"
+                            @click="
+                              decideType(
+                                element.lei,
+                                element.courseId,
+                                element.id
+                              )
+                            "
                           >
                             编辑
                           </span>
@@ -778,42 +784,42 @@
     </a-modal>
     <!-- 移动任务到阶段 -->
     <a-modal
-        style="padding: 0"
-        :closable="sh"
-        v-model:visible="visiblene"
-        :footer="null"
-        centered="true"
-        wrapClassName="changeModal"
-      >
-        <div class="con">
-          <div class="header">
-            <div class="inhe">
-              <div class="mod"></div>
-              <div class="tz">选择任务移动到阶段</div>
+      style="padding: 0"
+      :closable="sh"
+      v-model:visible="visiblene"
+      :footer="null"
+      centered="true"
+      wrapClassName="changeModal"
+    >
+      <div class="con">
+        <div class="header">
+          <div class="inhe">
+            <div class="mod"></div>
+            <div class="tz">选择任务移动到阶段</div>
+          </div>
+        </div>
+        <div class="mid">
+          <div class="inher">
+            <div class="cur">已选中{{ selectRow.length }}个任务</div>
+            <div class="select">
+              <a-select
+                v-model:value="curLevel"
+                style="width: 100%"
+                placeholder="请选择关卡"
+                :options="projectNameList4"
+                @change="selectProjectName4"
+                allowClear
+                showSearch
+              ></a-select>
+            </div>
+            <div class="btn">
+              <button class="sameb btn1" @click="closeChangeModal">取消</button>
+              <button class="sameb btn2" @click="moveTask">确定</button>
             </div>
           </div>
-          <div class="mid">
-            <div class="inher">
-              <div class="cur">已选中{{selectRow.length}}个任务</div>
-              <div class="select">
-                <a-select
-                  v-model:value="curLevel"
-                  style="width: 100%"
-                  placeholder="请选择关卡"
-                  :options="projectNameList4"
-                  @change="selectProjectName4"
-                  allowClear
-                  showSearch
-                ></a-select>
-              </div>
-              <div class="btn">
-                <button class="sameb btn1" @click="closeChangeModal">取消</button>
-                <button class="sameb btn2" @click="moveTask">确定</button>
-              </div>
-            </div>
-          </div>
-        </div></a-modal
-      >
+        </div>
+      </div></a-modal
+    >
   </div>
 </template>
 
@@ -911,8 +917,10 @@ export default {
         : null,
       chooseStageId: null,
       edit: false,
+      // isRefEdit: 1, //外链编辑
+      // isLiveEdit: 1, //直播编辑
       isRefEdit: false, //外链编辑
-      isLiveEdit:false, //直播编辑
+      isLiveEdit: false, //直播编辑
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的id
       editDiscussId:null,//要编辑的讨论的id
@@ -1060,7 +1068,7 @@ export default {
       selectedRowKeys: [],
       valuesname: "",
       valuesnotice: "",
-      visiblene: false,//移动任务弹窗
+      visiblene: false, //移动任务弹窗
       confirmModal: false, //确认添加阶段弹窗
       cC: false,
       cancelModal: false, //确认取消阶段弹窗
@@ -1072,7 +1080,7 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
-      voteId:"", //删除投票id
+      voteId: "", //删除投票id
       deleteID: "",
       selectRow: [], //选择行
       curLevel: [], //阶段名称
@@ -1320,7 +1328,7 @@ export default {
             if (leng > 0) {
               //获取任务列表
               let arr = res.data.data.stageList[0].taskList;
-              console.log('任务列表',arr)
+              console.log("任务列表", arr);
               getTableData(arr);
             }
 
@@ -1329,10 +1337,10 @@ export default {
             //console.log(stagearr, 111111);
             if (stagearr.length > 0) {
               getStageData(stagearr);
-              stagearr.map(value => {
+              stagearr.map((value) => {
                 console.log(value);
                 arrlist.push();
-              })
+              });
             }
             //给阶段id赋初始值
             state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
@@ -1356,7 +1364,7 @@ export default {
     const changeVData = (data) => {
       console.log("8989", data);
       state.voteId = data.voteId;
-    }
+    };
     //数据变化
     const updateTableData = (data) => {
       console.log("添加数据", data);
@@ -1543,7 +1551,6 @@ export default {
         });
     };
 
-
     //删除评估测试
     const deleteInvistText = () => {
       let obj = {
@@ -1602,7 +1609,7 @@ export default {
       api
         .deleteTask(obj)
         .then((res) => {
-          console.log(res,'gggggggggggggggg');
+          console.log(res, "gggggggggggggggg");
           // deleteVoteText();
         })
         .catch((err) => {
@@ -1663,7 +1670,7 @@ export default {
     };
     const showChangeModal = () => {
       state.visiblene = true;
-    }
+    };
     const closeChangeModal = () => {
       state.visiblene = false;
     };
@@ -1760,21 +1767,21 @@ export default {
     const showDrawerAddCase = () => {
       state.addcasevisible = true;
     };
-    const showDrawerAddHomework = (id,eleId) => {
-      state.EditWorkId = id
+    const showDrawerAddHomework = (id, eleId) => {
+      state.EditWorkId = id;
       state.projectTaskId = eleId;
       state.addhomeworkvisible = true;
     };
-    const showDrawerAddTest = (id,eleId) => {
-      state.EditTestId = id
+    const showDrawerAddTest = (id, eleId) => {
+      state.EditTestId = id;
       state.projectTaskId = eleId;
       state.addtestvisible = true;
     };
     const showDrawerAddLive = () => {
       state.addlivevisible = true;
     };
-    const showDrawerAddRef = (id,eleId) => {
-      state.EditRefId = id
+    const showDrawerAddRef = (id, eleId) => {
+      state.EditRefId = id;
       state.projectTaskId = eleId;
       state.addrefvisible = true;
     };
@@ -1782,12 +1789,12 @@ export default {
       state.adddiscussvisible = true;
     };
     //打开编辑讨论的弹窗
-    const showEditAddDiscuss = (id,eleId)=>{
-      state.editDiscussId = id
+    const showEditAddDiscuss = (id, eleId) => {
+      state.editDiscussId = id;
       state.projectTaskId = eleId;
       state.adddiscussvisible = true;
-    }
-    const showDrawerAddActive = (id,eleId) => {
+    };
+    const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
       state.editActivityId = id;
       state.projectTaskId = eleId;
@@ -1886,10 +1893,11 @@ export default {
       console.log("任务id", id);
     };
     //打开编辑外链的弹窗
-    const showEditRefDrawer = (id) => {
+    const showEditRefDrawer = (id, eleId) => {
       state.addrefvisible = true;
       state.isRefEdit = true;
       state.EditRefId = id;
+      state.projectTaskId = eleId;
     };
     //打开编辑直播的弹窗
     const showEditLiveDrawer = (id) => {
@@ -1898,38 +1906,37 @@ export default {
       state.EditLiveId = id;
     };
     //打开测评的弹窗
-    const showEditEvalDrawer = (id,eleId) => {
-      console.log('222222222222222222222',id);
+    const showEditEvalDrawer = (id, eleId) => {
+      console.log("222222222222222222222", id);
       state.addevalvisible = true;
       state.projectTaskId = eleId;
       state.EditRefId = id;
       console.log(state.EditRefId);
     };
     //编辑的按钮
-    const decideType = (type, id,eleId) => {
+    const decideType = (type, id, eleId) => {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
-        showEditRefDrawer(id);
-      } 
-      else if (type == "直播") {
-        showEditLiveDrawer(id,eleId);
+        showEditRefDrawer(id, eleId);
+      } else if (type == "直播") {
+        showEditLiveDrawer(id, eleId);
       } else if (type == "测评") {
-        showEditEvalDrawer(id,eleId)
+        showEditEvalDrawer(id, eleId);
       } else if (type == "评估") {
-        showDrawerAddInvist(id,eleId);
+        showDrawerAddInvist(id, eleId);
       } else if (type == "投票") {
-        showDrawerAddVote(id,eleId);
+        showDrawerAddVote(id, eleId);
       } else if (type == "讨论") {
-        showEditAddDiscuss(id,eleId);
+        showEditAddDiscuss(id, eleId);
       } else if (type == "活动") {
-        showDrawerAddActive(id,eleId);
-      }else if (type == "作业") {
-        showDrawerAddHomework(id,eleId);
-      }else if (type == "考试") {
-        showDrawerAddTest(id,eleId);
+        showDrawerAddActive(id, eleId);
+      } else if (type == "作业") {
+        showDrawerAddHomework(id, eleId);
+      } else if (type == "考试") {
+        showDrawerAddTest(id, eleId);
       }
-    }
+    };
     return {
       ...toRefs(state),
       selectProjectName,

src/views/projectcenter/TaskPage.vue

@@ -317,12 +317,11 @@
                     </div>
                     <div class="type">
                       <div
-                        :class="
-                          item.flag == true ? 'typename1' : 'typename'
-                        "
+                        :class="item.flag == true ? 'typename1' : 'typename'"
                       >
                         <!-- {{ item.classify }}  -->
-                        <span v-if="item.flag">必修</span> <span v-else>选修</span>
+                        <span v-if="item.flag">必修</span>
+                        <span v-else>选修</span>
                       </div>
                     </div>
                     <div class="time">
@@ -341,7 +340,9 @@
                           trailColor="rgba(253, 209, 98, 0.2)"
                         />
                         <span class="progresstext" style="margin-left: 10px"
-                          >{{ (item.finishStuCnt/item.totalStuCnt)*100 }}%</span
+                          >{{
+                            (item.finishStuCnt / item.totalStuCnt) * 100
+                          }}%</span
                         >
                       </div>
                     </div>
@@ -479,7 +480,7 @@
                     >
                       <div class="groupname">小组名称：</div>
                       <a-input
-                        v-model:value="valuestug"
+                        v-model:value="valuestugroup"
                         placeholder="请输入小组名称"
                       />
                     </div>
@@ -495,6 +496,8 @@
                       <a-select
                         v-model:value="valuestub"
                         placeholder="请选择部门"
+                        :options="bum"
+                        @change="handleChangeBum"
                       />
                     </div>
                     <div
@@ -509,15 +512,16 @@
                         v-model:value="valuegood"
                         placeholder="是否为优秀学员"
                         :options="goodstuList"
+                        @change="handleChangeGood"
                       />
                     </div>
                   </div>
                   <div class="groupright">
-                    <div class="btn1">
+                    <div class="btn1" @click="searchStu">
                       <img src="../../assets/images/courseManage/search0.png" />
                       <span class="btn1text">搜索</span>
                     </div>
-                    <div class="btn2">
+                    <div class="btn2" @click="resetCancel">
                       <img src="../../assets/images/courseManage/reset1.png" />
                       <span class="btn2text">重置</span>
                     </div>
@@ -532,7 +536,7 @@
                     <img src="../../assets/images/courseManage/reset2.png" />
                     <span class="btn2text">导入学员</span>
                   </div>
-                  <div class="btn2">
+                  <div class="btn2" @click="showAllDelete">
                     <img src="../../assets/images/projectadd/delete.png" />
                     <span class="btn2text">批量删除</span>
                   </div>
@@ -542,14 +546,14 @@
                   <div class="xu">
                     <span class="yi">已选择</span>
                     <div style="width: 5px; display: inline-block"></div>
-                    <span class="th">2</span>
+                    <span class="th">{{ choosed }}</span>
                     <div style="width: 5px; display: inline-block"></div>
                     <span class="yi">项</span>
                     <span class="zon">列表选项总计：</span>
-                    <span class="yi">4</span>
+                    <span class="yi">{{ total }}</span>
                     <span class="yi">条</span>
                   </div>
-                  <div class="clear">清空</div>
+                  <div class="clear" @click="clearChooseStu">清空</div>
                 </div>
                 <div class="tab" style="margin: 20px 32px 30px 32px">
                   <a-table
@@ -1272,7 +1276,7 @@
     <!-- 删除学员弹窗 -->
     <div>
       <a-modal
-        v-model:visible="canclestu2"
+        v-model:visible="deleteOneStu"
         :footer="null"
         :closable="close"
         wrapClassName="canclestu1"
@@ -1290,10 +1294,10 @@
             </div>
             <div class="del_btnbox">
               <div class="del_btn btn1">
-                <div class="btnText" @click="closeModal4">取消</div>
+                <div class="btnText" @click="closeDeleteOne">取消</div>
               </div>
               <div class="del_btn btn2">
-                <div class="btnText" @click="closeModal4">确定</div>
+                <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
               </div>
             </div>
           </div>
@@ -1645,10 +1649,41 @@
         </div>
       </div>
     </a-modal>
+    <!-- 批量删除弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="allDelete"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <div class="body">
+              <span>您确定批量删除吗？</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="closeCancelDelete">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="closeAllDelete">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
   </div>
 </template>
 <script>
-import { reactive, toRefs,onMounted } from "vue";
+import { reactive, toRefs, onMounted } from "vue";
 import { useRoute } from "vue-router";
 // import { CaretRightOutlined } from "@ant-design/icons-vue";
 import TimeManage from "../../components/drawers/TimeManage";
@@ -1668,6 +1703,8 @@ import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
 import { storage } from "../../api/storage";
 import * as api from "../../api/index1";
+import { getProjStu, deleteStu } from "../../api/indexProjStu";
+import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
 export default {
   name: "taskPage",
@@ -1691,7 +1728,9 @@ export default {
   },
   setup() {
     const state = reactive({
-      projectId: storage.get("projectId") ? JSON.parse(storage.get("projectId")) : null,
+      projectId: storage.get("projectId")
+        ? JSON.parse(storage.get("projectId"))
+        : null,
       goodstuList: [
         {
           id: 1,
@@ -1709,57 +1748,64 @@ export default {
           label: "优秀学员",
         },
       ],
+      bum: [
+        {
+          id: 1,
+          value: "",
+          label: "",
+        },
+      ],
+      //学员信息列表
       tabledata: [
         {
           key: 1,
-          name: "小李",
-          bum: "产研部",
-          gangw: "产品经理",
-          group: "好好学习",
-          progress: "5/20",
+          name: "sss",
+          bum: "c",
+          gangw: "ss",
+          group: "sss",
+          progress: "sss",
           diploma: "0",
-          stutime: "2022-10-31 23:12:00",
-          putin: "手动加入",
-          excellent: true, //是否是优秀学员
+          stutime: "20202",
+          putin: "shs",
+          excellent: true,
+          studentId: 22,
         },
         {
           key: 2,
-          name: "小刘",
-          bum: "产研部",
-          gangw: "产品经理",
-          group: "天天向上",
-          progress: "5/20",
+          name: "sss",
+          bum: "c",
+          gangw: "ss",
+          group: "sss",
+          progress: "sss",
           diploma: "0",
-          stutime: "2022-10-21 23:12:00",
-          putin: "手动加入",
-          excellent: false, //是否是优秀学员
+          stutime: "20202",
+          putin: "shs",
+          excellent: true,
+          studentId: 23,
         },
         {
           key: 3,
-          name: "小王",
-          bum: "产研部",
-          gangw: "后端",
-          group: "好好学习",
-          progress: "5/20",
+          name: "sss",
+          bum: "c",
+          gangw: "ss",
+          group: "sss",
+          progress: "sss",
           diploma: "0",
-          stutime: "2022-10-11 23:12:00",
-          putin: "手动加入",
-          excellent: false, //是否是优秀学员
-        },
-        {
-          key: 4,
-          name: "小赵",
-          bum: "产研部",
-          gangw: "前端",
-          group: "天天向上",
-          progress: "5/20",
-          diploma: "0",
-          stutime: "2022-10-31 23:12:00",
-          putin: "手动加入",
-          excellent: true, //是否是优秀学员
+          stutime: "20202",
+          putin: "shs",
+          excellent: false,
+          studentId: 24,
         },
       ],
-
+      // stuName: "", //搜索的学员姓名
+      // stuGroup: "", //搜索的学员小组名称
+      // stuBum: "", //搜索的学员小组部门
+      // stuGood: "", //搜索的学员是否优秀
+      total: null, //学员列表数据总条数
+      choosed: 0, //勾选的学员总数
+      selectedRowKeys: [], //选择的学员
+      selectedRows: [], //选择的学员的id值
+      chooseDeleteOne: [], //删除的单个学员id
       //进度排行学员
       rankjindu: [{ value: "学员", label: "学员" }],
       valuestu1: "学员",
@@ -1791,12 +1837,12 @@ export default {
       zhibModal: false, //直播二维码弹窗
 
       huodModal: false, //活动二维码弹窗
-
+      allDelete: false, //批量删除弹窗
       pubproject: false,
       stugroup: false,
       canclestu: false,
       canclestu1: false,
-      canclestu2: false,
+      deleteOneStu: false, //删除单个学员弹窗
       checked: false,
       checked1: true,
       checked2: false,
@@ -1815,8 +1861,8 @@ export default {
       valuestun: "", //学员管理姓名
       valuegood: "",
       valuestub: "", //学员管理部门
-      valuestug: "", //学员管理小组名称
-
+      valuestug: "", //学员小组管理名称
+      valuestugroup: "", //学员管理小组名称
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "",
@@ -2266,7 +2312,6 @@ export default {
         // },
       ],
 
-
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
       showTimeText: "",
@@ -2288,31 +2333,30 @@ export default {
 
     // 输入接入 -- start --
 
-
     //任务大纲渲染
     const getTaskList = () => {
-        let objtl = {
-          projectId: 27,
-        }
+      let objtl = {
+        projectId: 27,
+      };
       apitl
         .getProjectDetail(objtl)
         .then((res) => {
           if (res.status == 200) {
-            console.log('res', res)
-            console.log('阶段列表',res.data.data.stageList);
+            console.log("res", res);
+            console.log("阶段列表", res.data.data.stageList);
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
               //获取任务列表 阶段
-              let taskarr = res.data.data.stageList
-              state.taskSyllabus = taskarr
-              console.log( res.data.data.stageList[0].taskList[0].type,'ggg');
+              let taskarr = res.data.data.stageList;
+              state.taskSyllabus = taskarr;
+              console.log(res.data.data.stageList[0].taskList[0].type, "ggg");
             }
           }
         })
         .catch((err) => {
-          console.log('获取任务列表失败', err)
-        })
-      };
+          console.log("获取任务列表失败", err);
+        });
+    };
 
     //学员学员管理渲染
     const getTableDate = () => {
@@ -2412,12 +2456,7 @@ export default {
     const closeModal3 = () => {
       state.canclestu1 = false;
     };
-    const showModal4 = () => {
-      state.canclestu2 = true;
-    };
-    const closeModal4 = () => {
-      state.canclestu2 = false;
-    };
+
     const showModal2 = () => {
       state.stugroup = true;
     };
@@ -2574,8 +2613,8 @@ export default {
                 <a-select-option value="删除" label="删除">
                   <div
                     onClick={() => {
-                      console.log("点击了111");
-                      state.canclestu2 = true;
+                      console.log("点击了111", value.studentId);
+                      showDeleteOne(value.studentId);
                     }}
                   >
                     删除
@@ -2706,24 +2745,19 @@ export default {
 
     //tabs切换
     const tabsChange = (e) => {
-     
       //排行榜
       if (e == 6) {
         //获取进度榜
-      getbillboard(1, 1);
-      //获取学分榜
-      getbillboard(2, 1);
-      //获取学时榜
-      getbillboard(3, 1);
+        getbillboard(1, 1);
+        //获取学分榜
+        getbillboard(2, 1);
+        //获取学时榜
+        getbillboard(3, 1);
       } else {
         rankReset();
       }
     };
 
-    
-
-
-
     // start -------排行榜---------------排行榜------------排行榜------------------排行榜---------
     //选择搜索时间
     const rankTimeChange = (e, date) => {
@@ -2773,10 +2807,192 @@ export default {
 
     // end -----排行榜----------------排行榜----------------------排行榜-----------排行榜----------
 
-    onMounted(()=>{
-      getTaskList()
-    })
-
+    //start---------学员------
+    //删除单个学员
+    const showDeleteOne = (id) => {
+      state.deleteOneStu = true;
+      state.chooseDeleteOne.push(id);
+    };
+    //点击取消删除单个学员
+    const closeDeleteOne = () => {
+      state.deleteOneStu = false;
+    };
+    //点击确认删除单个学员
+    const closeDeleteOneConfirm = () => {
+      state.deleteOneStu = false;
+      deleteStu({
+        projectId: state.projectId,
+        studentIds: state.chooseDeleteOne,
+      })
+        .then((res) => {
+          console.log(res, "单个删除成功");
+          message.success("删除成功");
+        })
+        .catch((err) => {
+          console.log(err, "单个删除失败");
+          message.warning("删除失败");
+        });
+      state.chooseDeleteOne = [];
+    };
+    //批量删除学员弹窗
+    const showAllDelete = () => {
+      if (state.selectedRows.length == 0) {
+        message.destroy();
+        return message.warning("请选择要删除的学员");
+      } else {
+        state.allDelete = true;
+      }
+    };
+    //点击取消的批量删除弹窗
+    const closeCancelDelete = () => {
+      state.allDelete = false;
+    };
+    //点击确定的批量删除弹窗
+    const closeAllDelete = () => {
+      deleteStu({
+        projectId: state.projectId,
+        studentIds: state.selectedRows,
+      })
+        .then((res) => {
+          console.log(res, "删除成功");
+          message.success("删除成功");
+        })
+        .catch((err) => {
+          console.log(err, "删除失败");
+          message.warning("删除成功");
+        });
+      state.allDelete = false;
+    };
+    const handleChangeGood = (value) => {
+      console.log(value, state.valuegood, 11111);
+    };
+    const handleChangeBum = (value) => {
+      console.log(value, 22222);
+    };
+    //把数据放到state里
+    const getTableDataList = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          projectId: value.projectId, //项目id
+          groupId: value.groupId, //小组id
+          group: value.groupName, //小组名
+          studentId: value.studentId, //学生id
+          currentStageId: value.currentStageId, //当前关卡id
+          name: value.userInfoBo.userName, //用户名
+          bum: value.userInfoBo.deptName, //部门
+          gangw: value.userInfoBo.jobName, //岗位
+          completeStageCnt: value.userInfoBo.completeStageCnt, //当前完成阶段数
+          totalStageCnt: value.userInfoBo.totalStageCnt, //总阶段数
+          excellent: value.topFlag == 1 ? "0" : "1", //是否优秀学员
+          progress:
+            value.userInfoBo.completeStageCnt +
+            "/" +
+            value.userInfoBo.totalStageCnt,
+          putin:
+            value.source == 0
+              ? "报名加入"
+              : value.source == 1
+              ? "指定添加"
+              : value.source == 2
+              ? "组织添加"
+              : value.source == 3
+              ? "受众添加"
+              : "-", //加入方式
+          beginStudyTime: value.beginStudyTime, //开始学习时间
+        };
+        array.push(obj);
+      });
+      state.tabledata = array;
+    };
+    //学员搜索
+    const searchStu = () => {
+      let obj = {
+        deptIds: [], //部门
+        groupName: state.valuestugroup,
+        name: state.valuestun,
+        pageNo: 0,
+        pageSize: 0,
+        projectId: state.projectId,
+        topFlag:
+          state.valuegood == "优秀学员"
+            ? 1
+            : state.valuegood == "普通学员"
+            ? 0
+            : null,
+      };
+      getProjStu(obj).then((res) => {
+        console.log("搜索成功", res);
+        //重新获取列表
+        let leng = res.data.data.rows;
+        if (leng > 0) {
+          let arr = res.data.data.rows;
+          getTableDataList(arr);
+        }
+      });
+    };
+    //勾选学员
+    const onSelectChange = (selectedRowKeys, selectedRows) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+      state.selectedRowKeys = selectedRowKeys;
+      state.choosed = state.selectedRowKeys.length;
+      console.log("ssss", selectedRows);
+      state.selectedRows = [];
+      console.log("before", state.selectedRows);
+      // let arr = [];
+      //遍历 插入到state.selectedRows里
+      selectedRows.map((item) => {
+        console.log(item.studentId);
+        state.selectedRows.push(item.studentId);
+        // arr.push(item.studentId);
+        // console.log("asdfasdf", arr);
+      });
+      // state.selectedRows = arr;
+      console.log("after", state.selectedRows);
+      // console.log(state.selectedRows[0]);
+      // console.log("dddd",selectedRows.)
+      //判断是否为数组
+      console.log("wwwwww", Object.prototype.toString.call(state.selectedRows));
+    };
+    //清空所选的学员
+    const clearChooseStu = () => {
+      state.selectedRowKeys = [];
+      state.choosed = 0;
+    };
+    //学员重置
+    const resetCancel = () => {
+      (state.valuestun = null),
+        (state.valuestugroup = null),
+        (state.valuestub = null),
+        (state.valuegood = null);
+    };
+    //获取学员列表
+    const getStu = () => {
+      let obj = {
+        deptIds: [], //部门
+        groupName: "",
+        name: "",
+        pageNo: 1,
+        pageSize: 1,
+        projectId: state.projectId,
+        topFlag: 0,
+      };
+      getProjStu(obj).then((res) => {
+        console.log(res.data.data.rows, "获取学员列表");
+        let leng = res.data.data.rows;
+        state.total = res.data.data.total;
+        if (leng > 0) {
+          let arr = res.data.data.rows;
+          getTableDataList(arr);
+        }
+      });
+    };
+    //end---------学员------
+    onMounted(() => {
+      getStu();
+      getTaskList();
+    });
     return {
       ...toRefs(state),
       totask,
@@ -2789,8 +3005,8 @@ export default {
       closeModal2,
       showModal3,
       closeModal3,
-      showModal4,
-      closeModal4,
+      showDeleteOne,
+      closeDeleteOne,
       showCopyModal,
       closeCopyModal,
       showTime,
@@ -2827,6 +3043,18 @@ export default {
       getbillboard,
       rankSearch,
       rankReset,
+      handleChangeGood,
+      getStu,
+      getTableDataList,
+      searchStu,
+      handleChangeBum,
+      resetCancel,
+      showAllDelete,
+      closeAllDelete,
+      onSelectChange,
+      closeCancelDelete,
+      clearChooseStu,
+      closeDeleteOneConfirm,
     };
   },
 };