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/AddHomework.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{workId ? '编辑':'添加' }}作业</div>
+        <div class="headerTitle">{{ workId ? "编辑" : "添加" }}作业</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -16,99 +16,103 @@
         />
       </div>
       <a-form
-            ref="formRef"
-            name="custom-validation"
-            :model="formState"
-            :rules="rules"
-            v-bind="layout"
-            @finish="handleFinish"
-            @validate="handleValidate"
-            @finishFailed="handleFinishFailed"
-          >
-      <div class="contentMain">
-        <div class="main_left">
-          
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="作业名称" name="workName">
-                <a-input v-model:value="formState.workName"
-                style="width: 424px; height: 32px;margin-left: 35px;"
-                placeholder="请输入作业名称"
-                autocomplete="off" />
-              </a-form-item>
-             
-            </div>
-          </div>
-          <div class="main_item2">
-              <a-form-item has-feedback label="作业要求" name="workRequirement">
-              <a-textarea
-                v-model:value="formState.workRequirement"
-                placeholder="请输入作业要求"
-                autocomplete="off"
-                allow-clear
-                style="margin-left: 35px"
-                maxlength="150"
-              />
-              </a-form-item>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="提交时间" name="choosedTime">
-              <a-range-picker
-              style="width: 424px;margin-left: 35px;"
-              v-model:value="formState.choosedTime"
-              format="YYYY-MM-DD"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
-            </a-form-item>
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/enclosure.png"
-                  alt=""
-                />
+        ref="formRef"
+        name="custom-validation"
+        :model="formState"
+        :rules="rules"
+        v-bind="layout"
+        @finish="handleFinish"
+        @validate="handleValidate"
+        @finishFailed="handleFinishFailed"
+      >
+        <div class="contentMain">
+          <div class="main_left">
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="作业名称" name="workName">
+                  <a-input
+                    v-model:value="formState.workName"
+                    style="width: 424px; height: 32px; margin-left: 35px"
+                    placeholder="请输入作业名称"
+                    autocomplete="off"
+                  />
+                </a-form-item>
               </div>
-              <span style="margin-right: 3px">附件：</span>
             </div>
-            <div class="btnbox">
-              <a-upload
-                v-model:file-list="fileList"
-                name="file"
-                action="/api/file/upload"
-                @change="handleChange"
-              >
-              <button class="xkbtn" type="button">上传附件</button>
-            </a-upload>
+            <div class="main_item2">
+              <a-form-item has-feedback label="作业要求" name="workRequirement">
+                <a-textarea
+                  v-model:value="formState.workRequirement"
+                  placeholder="请输入作业要求"
+                  autocomplete="off"
+                  allow-clear
+                  style="margin-left: 35px"
+                  maxlength="150"
+                />
+              </a-form-item>
             </div>
-          </div>
-          <div class="main_item" style="margin-top:-25px;">
-            <div class="signbox">
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="提交时间" name="choosedTime">
+                  <a-range-picker
+                    style="width: 424px; margin-left: 35px"
+                    v-model:value="formState.choosedTime"
+                    format="YYYY-MM-DD"
+                    :placeholder="['      开始时间', '        结束时间']"
+                  />
+                </a-form-item>
+              </div>
             </div>
-            <div class="btnbox">
-              <span style="color:#999999;">支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span>
+            <div class="main_item">
+              <div class="signbox">
+                <div class="sign">
+                  <img
+                    src="@/assets/images/coursewareManage/enclosure.png"
+                    alt=""
+                  />
+                </div>
+                <span style="margin-right: 3px">附件：</span>
+              </div>
+              <div class="btnbox">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
+                  <button class="xkbtn" type="button">上传附件</button>
+                </a-upload>
+              </div>
+            </div>
+            <div class="main_item" style="margin-top: -25px">
+              <div class="signbox"></div>
+              <div class="btnbox">
+                <span style="color: #999999"
+                  >支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span
+                >
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="main_btns">
-        <a-button class="btn1"  @click="closeDrawer">取消</a-button>
-        <a-button class="btn2" html-type="submit">确定</a-button>
-      </div>
-    </a-form>
-
+        <div class="main_btns">
+          <a-button class="btn1" @click="closeDrawer">取消</a-button>
+          <a-button class="btn2" html-type="submit">确定</a-button>
+        </div>
+      </a-form>
     </div>
   </a-drawer>
 </template>
 <script>
 import { reactive, ref } from "vue";
-import {message} from"ant-design-vue";
-import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing} from "@/api/indexWork";
-import { ProjectEditTask,RouterEditTask } from "@/api/indexTask";
+import { message } from "ant-design-vue";
+import {
+  createWorkTask,
+  queryWorkDetailById,
+  updateWorkTaskUsing,
+} from "@/api/indexWork";
+import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import { storage } from "../../api/storage";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 const rowSelection = ref({
   checkStrictly: false,
@@ -146,53 +150,65 @@ export default {
     routerTaskId: {
       type: Number,
       default: 0,
-    }
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const formState = reactive({
-      workName: '',
-      workRequirement: '',
-      choosedTime: '',
+      workName: "",
+      workRequirement: "",
+      choosedTime: "",
     });
     const formRef = ref();
     const state = reactive({
-      routerId: storage.get("routerId") ?JSON.parse(storage.get("routerId"))  : null,
-    })
+      routerId: storage.get("routerId")
+        ? JSON.parse(storage.get("routerId"))
+        : null,
+    });
 
     let checkWorkName = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业名称');
+        return Promise.reject("请输入作业名称");
       }
     };
 
     let checkWorkRequirement = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业要求');
+        return Promise.reject("请输入作业要求");
       }
     };
 
     let checkTime = async (_rule, value) => {
       if (!value.length) {
-        return Promise.reject('请选择时间');
+        return Promise.reject("请选择时间");
       }
     };
 
     const rules = {
-      workName: [{
-        required: true,
-        validator: checkWorkName,
-        trigger: 'change',
-      }],
-      workRequirement: [{
-        required: true,
-        validator: checkWorkRequirement,
-        trigger: 'change',
-      }],
-      choosedTime: [{
-        required: true,
-        validator: checkTime,
-        trigger: 'change',
-      }],
+      workName: [
+        {
+          required: true,
+          validator: checkWorkName,
+          trigger: "change",
+        },
+      ],
+      workRequirement: [
+        {
+          required: true,
+          validator: checkWorkRequirement,
+          trigger: "change",
+        },
+      ],
+      choosedTime: [
+        {
+          required: true,
+          validator: checkTime,
+          trigger: "change",
+        },
+      ],
     };
     // const layout = {
     //   labelCol: {
@@ -202,12 +218,12 @@ export default {
     //     span: 14,
     //   },
     // };
-    const handleFinish = values => {
+    const handleFinish = (values) => {
       console.log(values);
-      updateWork(props.workId)
+      updateWork(props.workId);
     };
 
-    const handleFinishFailed = errors => {
+    const handleFinishFailed = (errors) => {
       console.log(errors);
       // message.error("handleFinishFailed");
     };
@@ -219,14 +235,14 @@ export default {
     const handleValidate = (...args) => {
       console.log(args);
     };
-    const handleChange = info => {
-      if (info.file.status !== 'uploading') {
+    const handleChange = (info) => {
+      if (info.file.status !== "uploading") {
         console.log(info.file, info.fileList);
       }
 
-      if (info.file.status === 'done') {
+      if (info.file.status === "done") {
         message.success(`${info.file.name} 文件上传成功`);
-      } else if (info.file.status === 'error') {
+      } else if (info.file.status === "error") {
         message.error(`${info.file.name} 文件上传失败.`);
       }
     };
@@ -235,98 +251,110 @@ export default {
     const closeDrawer = () => {
       resetForm();
       fileList.value = [];
-      formState.choosedTime = '';
+      formState.choosedTime = "";
       ctx.emit("update:addhomeworkVisible", false);
     };
     const afterVisibleChange = (bool) => {
-      if(props.addhomeworkVisible && props.workId){
-        queryWork({workId: props.workId})
+      if (props.addhomeworkVisible && props.workId) {
+        queryWork({ workId: props.workId });
       }
       console.log("state", bool);
     };
     const queryWork = (data) => {
-      queryWorkDetailById(data).then((res) => {
-        console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
-        formState.workName = res.data.data.workName;
-        formState.workRequirement = res.data.data.workRequirement;
-        formState.choosedTime=[dayjs(res.data.data.submitStartTime,"YYYY-MM-DD"),dayjs(res.data.data.submitEndTime,"YYYY-MM-DD")]
-        console.log(res);
-      }).catch(() => {
-        message.error(`查询失败`)
-      })
+      queryWorkDetailById(data)
+        .then((res) => {
+          console.log(
+            dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD")
+          );
+          formState.workName = res.data.data.workName;
+          formState.workRequirement = res.data.data.workRequirement;
+          formState.choosedTime = [
+            dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.submitEndTime, "YYYY-MM-DD"),
+          ];
+          console.log(res);
+        })
+        .catch(() => {
+          message.error(`查询失败`);
+        });
     };
     const updateWork = (id) => {
       let obj = {
-        "createTime": "",
-        "createUser": 0,
-        "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-        "submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-        "updateTime": "",
-        "updateUser": 0,
-        "workEnclosureAddress": "",
-        "workFlag": "",
-        "workId": id || 0,
-        "workName": formState.workName,
-        "workRequirement": formState.workRequirement,
-        "workTag": ""
-      }
-      if(id) {
-        updateWorkTaskUsing(obj).then((res) => {
-        console.log(res);
-      }).catch((err) => {
-        message.error(`编辑失败${err}`)
-      })
+        createTime: "",
+        createUser: 0,
+        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+        updateTime: "",
+        updateUser: 0,
+        workEnclosureAddress: "",
+        workFlag: "",
+        workId: id || 0,
+        workName: formState.workName,
+        workRequirement: formState.workRequirement,
+        workTag: "",
+      };
+      if (id) {
+        updateWorkTaskUsing(obj)
+          .then((res) => {
+            console.log(res);
+          })
+          .catch((err) => {
+            message.error(`编辑失败${err}`);
+          });
       } else {
-        createWorkTask(obj).then((res)=>{
-          console.log(res);
-      }).catch((err)=>{
-        message.error(`添加失败${err}`)
-      })
+        createWorkTask(obj)
+          .then((res) => {
+            console.log(res);
+          })
+          .catch((err) => {
+            message.error(`添加失败${err}`);
+          });
       }
-      if(props.flag == 1) {
+      if (props.flag == 1) {
         let editObj = {
-        "courseId": 0,
-        "duration": 0,
-        "flag": true,
-        "name": formState.workName,
-        "projectId": 0,
-        "projectTaskId": props.workId || '',
-        "stageId": 0,
-        "type": 4
-      }
-      // 新增编辑或新增项目任务
-      ProjectEditTask(editObj).then(res => {
-        console.log(` 编辑项目成功的打印 ${res}`);
-        message.success(`${props.workId? '编辑' : '新增'}阶段任务成功`)
-        closeDrawer();
-      }).catch(err => {
-        message.error(`${props.workId? '编辑' : '新增'}阶段任务失败`)
-        console.log(` 编辑项目失败的打印 ${err}`);
-      })
+          courseId: 0,
+          duration: 0,
+          flag: true,
+          name: formState.workName,
+          projectId: 0,
+          projectTaskId: props.workId || "",
+          stageId: 0,
+          type: 4,
+        };
+        // 新增编辑或新增项目任务
+        ProjectEditTask(editObj)
+          .then((res) => {
+            console.log(` 编辑项目成功的打印 ${res}`);
+            message.success(`${props.workId ? "编辑" : "新增"}阶段任务成功`);
+            closeDrawer();
+          })
+          .catch((err) => {
+            message.error(`${props.workId ? "编辑" : "新增"}阶段任务失败`);
+            console.log(` 编辑项目失败的打印 ${err}`);
+          });
       } else {
         let editObj1 = {
-          "chapterId":36,
-          "courseId": 0,
-          "duration": 0,
-          "flag": true,
-          "name": formState.workName,
-          "routerId": Number(storage.get('routerId')),
-          "routerTaskId": '',
-          "type": 4
-        }
+          chapterId: props.isactive,
+          courseId: 0,
+          duration: 0,
+          flag: true,
+          name: formState.workName,
+          routerId: Number(storage.get("routerId")),
+          routerTaskId: "",
+          type: 4,
+        };
         // 新增编辑或新增关卡任务
-      RouterEditTask(editObj1).then(res => {
-        console.log(` 编辑关卡成功的打印 ${res}`);
-        message.success(`${props.workId? '编辑' : '新增'}关卡任务成功`)
-        closeDrawer();
-      }).catch(err => {
-        message.error(`${props.workId? '编辑' : '新增'}关卡任务失败`)
-        console.log(` 编辑关卡失败的打印 ${err}`);
-      })
+        RouterEditTask(editObj1)
+          .then((res) => {
+            console.log(` 编辑关卡成功的打印 ${res}`);
+            message.success(`${props.workId ? "编辑" : "新增"}关卡任务成功`);
+            closeDrawer();
+          })
+          .catch((err) => {
+            message.error(`${props.workId ? "编辑" : "新增"}关卡任务失败`);
+            console.log(` 编辑关卡失败的打印 ${err}`);
+          });
       }
-      
-      
-
     };
     return {
       afterVisibleChange,

src/components/drawers/AddRef.vue

@@ -126,6 +126,14 @@ export default {
       type: Number,
       default: null,
     },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -183,12 +191,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

@@ -211,6 +211,7 @@
               flag="0"
               :workId="editID"
               v-model:addhomeworkVisible="addhomeworkvisible"
+              v-model:isactive="isactive"
             />
           </div>
           <div class="lin"></div>
@@ -517,22 +518,6 @@
                 </div>
               </template>
             </draggable>
-
-            <!-- <a-table
-              style="border: 1px solid #f2f6fe"
-              :columns="tableDataFunc()"
-              :data-source="tableData"
-              :loading="tableDataTotal === -1 ? true : false"
-              expandRowByClick="true"
-              @expand="expandTable"
-              :customRow="handleClickRow"
-              :pagination="false"
-              :row-selection="{
-                columnWidth: 30,
-                selectedRowKeys: selectedRowKeys,
-                onChange: onSelectChange,
-              }"
-            /> -->
           </div>
           <!-- 无数据样式 -->
           <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">

src/views/projectcenter/TaskAdd.vue

@@ -847,6 +847,7 @@ export default {
         ? JSON.parse(storage.get("projectId"))
         : null,
       chooseStageId: null,
+      edit: false,
       isRefEdit: 1, //外链编辑
       isLiveEdit: 1, //直播编辑
       EditRefId: null, //要编辑的外链的id
@@ -1885,6 +1886,7 @@ export default {
     };
     //编辑的按钮
     const decideType = (type, id) => {
+      state.edit = true;
       console.log(type, id);
       if (type == "外链") {
         showEditRefDrawer(id);

src/views/projectcenter/TaskPage.vue

@@ -478,7 +478,7 @@
                     >
                       <div class="groupname">小组名称：</div>
                       <a-input
-                        v-model:value="valuestug"
+                        v-model:value="valuestugroup"
                         placeholder="请输入小组名称"
                       />
                     </div>
@@ -494,6 +494,8 @@
                       <a-select
                         v-model:value="valuestub"
                         placeholder="请选择部门"
+                        :options="bum"
+                        @change="handleChangeBum"
                       />
                     </div>
                     <div
@@ -508,15 +510,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>
@@ -531,7 +534,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>
@@ -541,14 +544,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
@@ -1271,7 +1274,7 @@
     <!-- 删除学员弹窗 -->
     <div>
       <a-modal
-        v-model:visible="canclestu2"
+        v-model:visible="deleteOneStu"
         :footer="null"
         :closable="close"
         wrapClassName="canclestu1"
@@ -1289,10 +1292,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>
@@ -1644,10 +1647,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 } 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";
@@ -1667,6 +1701,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";
 export default {
   name: "taskPage",
   components: {
@@ -1689,7 +1725,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,
@@ -1707,57 +1745,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: "学员",
@@ -1789,12 +1834,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,
@@ -1813,8 +1858,8 @@ export default {
       valuestun: "", //学员管理姓名
       valuegood: "",
       valuestub: "", //学员管理部门
-      valuestug: "", //学员管理小组名称
-
+      valuestug: "", //学员小组管理名称
+      valuestugroup: "", //学员管理小组名称
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "",
@@ -2382,12 +2427,7 @@ export default {
     const closeModal3 = () => {
       state.canclestu1 = false;
     };
-    const showModal4 = () => {
-      state.canclestu2 = true;
-    };
-    const closeModal4 = () => {
-      state.canclestu2 = false;
-    };
+
     const showModal2 = () => {
       state.stugroup = true;
     };
@@ -2544,8 +2584,8 @@ export default {
                 <a-select-option value="删除" label="删除">
                   <div
                     onClick={() => {
-                      console.log("点击了111");
-                      state.canclestu2 = true;
+                      console.log("点击了111", value.studentId);
+                      showDeleteOne(value.studentId);
                     }}
                   >
                     删除
@@ -2676,24 +2716,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) => {
@@ -2743,8 +2778,191 @@ export default {
 
     // end -----排行榜----------------排行榜----------------------排行榜-----------排行榜----------
 
-
-
+    //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();
+    });
     return {
       ...toRefs(state),
       totask,
@@ -2757,8 +2975,8 @@ export default {
       closeModal2,
       showModal3,
       closeModal3,
-      showModal4,
-      closeModal4,
+      showDeleteOne,
+      closeDeleteOne,
       showCopyModal,
       closeCopyModal,
       showTime,
@@ -2789,12 +3007,22 @@ export default {
 
       tabsChange,
 
-     
-
       rankTimeChange,
       getbillboard,
       rankSearch,
       rankReset,
+      handleChangeGood,
+      getStu,
+      getTableDataList,
+      searchStu,
+      handleChangeBum,
+      resetCancel,
+      showAllDelete,
+      closeAllDelete,
+      onSelectChange,
+      closeCancelDelete,
+      clearChooseStu,
+      closeDeleteOneConfirm,
     };
   },
 };