diff --git a/src/api/index.js b/src/api/index.js
index 994fc519..2ccc90d6 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -58,7 +58,11 @@ export const releaseProject=(obj)=>http.post('/admin/project/publish',obj)
 //获取项目学员
 export const projectStudent=(obj)=>http.post('/admin/project/studentList',obj)
 //撤回发布、结束
-export const handleProject=(obj)=>http.post('/admin/project/handle',obj)
+export const handleProject = (obj) => http.post('/admin/project/handle', obj)
+
+//获取任务管理列表
+export const taskStudentList = (obj) => http.post('/admin/project/taskStudentList', obj)
+
 
 
 
diff --git a/src/api/indexLearningPath.js b/src/api/indexLearningPath.js
new file mode 100644
index 00000000..f32f7d01
--- /dev/null
+++ b/src/api/indexLearningPath.js
@@ -0,0 +1,4 @@
+import http from "./config";
+
+// 获取路径图概览
+export const getRouterOverview = (routerId) => http.get(`/admin/router/overview?routerId=${routerId}`)
\ No newline at end of file
diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index 0dc883a6..b28fa230 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -4,4 +4,13 @@ import http from "./config";
 export const getProjStu = (obj) => http.post('/admin/project/studentList', obj)
 
 //删除学员
-export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj)
\ No newline at end of file
+export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj)
+
+//获取小组列表
+export const getGroupList = (obj) => http.post('/admin/project/groupList', obj)
+
+//删除小组
+export const deleteGroup = (obj) => http.delete('/admin/project/deleteGroup', { params: obj })
+
+//新增或编辑小组
+export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
\ No newline at end of file
diff --git a/src/components/Modals/projSet.vue b/src/components/Modals/projSet.vue
new file mode 100644
index 00000000..d41a38c6
--- /dev/null
+++ b/src/components/Modals/projSet.vue
@@ -0,0 +1,457 @@
+<template>
+  <!-- 编辑弹窗 -->
+  <div>
+    <a-modal
+      :visible="editHs"
+      :title="null"
+      @ok="closeModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="set_edit"
+      width="679px"
+      @cancel="edit_exit"
+    >
+      <div
+        class="modalHeader"
+        style="
+          width: 100%;
+          height: 68px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
+        <div class="headerLeft" style="margin-left: 32px">
+          <span style="width: 15px; height: 15px"
+            ><img src="../../assets/images/taskpage/edit.png"
+          /></span>
+          <span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >编辑</span
+          >
+        </div>
+        <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
+          <img
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close.png"
+          />
+        </div>
+      </div>
+      <div class="modalMain">
+        <div class="projectname">基本信息</div>
+        <div class="setbody">
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">项目名称：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="projectName"
+                style="width: 424px; height: 32px"
+                placeholder="请输入项目名称"
+                maxlength="20"
+              />
+            </div>
+          </div>
+          <div class="main_item2">
+            <div class="signbox">
+              <span style="margin-right: 3px">直播封面：</span>
+            </div>
+            <div class="lodalimg">
+              <div class="lodalcenter">
+                <span style="color: #448ef7; margin-right: 10px">+</span>
+                <span style="color: #448ef7">添加图片</span>
+              </div>
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">项目时间：</span>
+            </div>
+            <div class="btnbox">
+              <a-range-picker
+                style="width: 424px"
+                :placeholder="['      开始时间', '        结束时间']"
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">项目经理：</span>
+            </div>
+            <div class="btnbox">
+              <a-select
+                dropdownClassName="dropdown-style"
+                style="width: 424px"
+                placeholder="请选择项目经理"
+                :options="options1"
+                allowClear
+                showSearch
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">资源归属：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="inputV1"
+                style="width: 424px; height: 32px"
+                placeholder="自动带出 可修改"
+                maxlength="20"
+              />
+            </div>
+          </div>
+          <div class="main_item2">
+            <div class="signbox">
+              <span style="margin-right: 3px">项目说明：</span>
+            </div>
+            <div class="textarea">
+              <a-textarea
+                v-model:value="textV1"
+                placeholder="请输入说明"
+                allow-clear
+                maxlength="150"
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">同步学习记录：</span>
+            </div>
+            <div class="btnbox">
+              <a-radio-group v-model:value="radioV1">
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
+                  >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自由免修改课程）
+                </a-radio>
+              </a-radio-group>
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">项目级别：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="inputV1"
+                style="width: 424px; height: 32px"
+                placeholder="集团级/组织级/现地级/部门级"
+                maxlength="20"
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">培训体系：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="inputV1"
+                style="width: 424px; height: 32px"
+                placeholder="集团级/组织级/现地级/部门级"
+                maxlength="20"
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">是否BOEU实施：</span>
+            </div>
+            <div class="btnbox">
+              <a-radio-group v-model:value="radioV2">
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio2"
+                  >BOEU实施</a-radio
+                >
+              </a-radio-group>
+            </div>
+          </div>
+        </div>
+
+        <div class="pubtn">
+          <a-button class="pubtn1" @click="closeModal">取消</a-button>
+          <a-button class="pubtn2" @click="closeModal">发布</a-button>
+        </div>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { reactive, toRefs } from "vue";
+// import {getTask} from "../../api/indexTaskadd"
+// import dayjs from "dayjs";
+// import {message} from "ant-design-vue"
+// import { toDate } from "@/api/method";
+
+export default {
+  name: "projSet",
+  props: {
+    editHs: {
+      type: Boolean,
+      default: false,
+    },
+    projectId: {
+      type: String,
+      default: null,
+    },
+  },
+  setup(props, ctx) {
+    //console.log("学习路径",props.isStudiscuss);
+    const state = reactive({});
+    const closeModal = () => {
+      ctx.emit("update:editHs", false);
+      console.log("projectId", props.projectId);
+    };
+    return {
+      ...toRefs(state),
+      closeModal,
+    };
+  },
+};
+</script>
+
+<style lang="scss" >
+.set_edit {
+  .ant-modal {
+    width: 866px !important;
+    height: 870px !important;
+
+    .ant-modal-body {
+      .modalHeader {
+        background: linear-gradient(
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
+        );
+      }
+
+      padding: 0;
+
+      .modalHeader {
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
+      }
+
+      .modalMain {
+        .projectname {
+          color: rgba(79, 81, 86, 1);
+          font-size: 14px;
+          line-height: 36px;
+          margin-left: 62px;
+          font-weight: 500;
+          margin-bottom: 24px;
+        }
+
+        .setbody {
+          margin-left: 67px;
+
+          .main_item {
+            display: flex;
+            align-items: center;
+            margin-bottom: 32px;
+
+            .signbox {
+              width: 130px;
+              display: flex;
+              justify-content: end;
+              align-items: center;
+              white-space: nowrap;
+
+              .sign {
+                margin-right: 5px;
+              }
+            }
+
+            .btnbox {
+              display: flex;
+              flex: 1;
+              align-items: center;
+
+              .xkbtn {
+                cursor: pointer;
+                width: 130px;
+                height: 40px;
+                background: #388be1;
+                border-radius: 8px;
+                border: 0;
+                margin-right: 8px;
+                color: #fff;
+              }
+            }
+          }
+
+          .main_item2 {
+            display: flex;
+            align-items: flex-start;
+            margin-bottom: 32px;
+
+            .signbox {
+              width: 130px;
+              display: flex;
+              justify-content: end;
+              align-items: center;
+              white-space: nowrap;
+
+              .sign {
+                margin-right: 5px;
+              }
+            }
+
+            .lodalimg {
+              width: 120px;
+              height: 120px;
+              border: 1px dashed #387df7;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              cursor: pointer;
+
+              .lodalimg {
+                display: flex;
+                white-space: nowrap;
+              }
+            }
+
+            .kqszbox {
+              .qdqtbox {
+                margin-left: 5px;
+                cursor: pointer;
+              }
+
+              .qdbtn,
+              .qtbtn {
+                width: 75px;
+                height: 24px;
+                background: rgba(56, 139, 225, 0.16);
+                border-radius: 2px;
+                border: 1px solid #387df7;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                .btntext {
+                  color: #387df7;
+                }
+              }
+
+              .setbox {
+                display: flex;
+                flex-wrap: wrap;
+                margin-top: 10px;
+                margin-bottom: 24px;
+
+                .timerbox {
+                  margin-top: 6px;
+                  margin-right: 32px;
+                  display: flex;
+                  align-items: center;
+                  flex-wrap: nowrap;
+                }
+              }
+            }
+
+            .btnbox2 {
+              display: flex;
+              flex-direction: column;
+              justify-content: flex-start;
+
+              .xkbtn {
+                cursor: pointer;
+                width: 130px;
+                height: 40px;
+                background: #388be1;
+                border-radius: 8px;
+                border: 0;
+                margin-right: 16px 8px 32px 0;
+                color: #fff;
+                margin-top: 16px;
+                margin-bottom: 60px;
+              }
+            }
+          }
+        }
+
+        .pubtn {
+          display: flex;
+          justify-content: center;
+          margin-top: 25px;
+
+          //margin-bottom: 29px;
+          .pubtn1 {
+            width: 100px;
+            height: 40px;
+            margin-right: 16px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: rgba(78, 166, 255, 1);
+            font-size: 14px;
+            //line-height: 36px;
+            align-items: center;
+            background: rgba(255, 255, 255, 1);
+          }
+
+          .pubtn2 {
+            width: 100px;
+            height: 40px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: #ffffff;
+            font-size: 14px;
+            align-items: center;
+            //line-height: 36px;
+            background: #409eff;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index fa3a1fe9..c3c75f15 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -1,58 +1,95 @@
 <template>
-  <a-drawer :visible="addhomeworkVisible" class="drawerStyle addhomeworkDrawer" width="80%" placement="right"
-    @after-visible-change="afterVisibleChange">
+  <a-drawer
+    :visible="addhomeworkVisible"
+    class="drawerStyle addhomeworkDrawer"
+    width="80%"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ edit ? '编辑' : '添加' }}作业</div>
-        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer" />
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
       </div>
-      <a-form ref="formRef" name="custom-validation" :model="formState" :rules="rules" v-bind="layout"
-        @finish="handleFinish" @validate="handleValidate" @finishFailed="handleFinishFailed">
+      <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-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-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-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="" />
+                  <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">
+                <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="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>
+                <span style="color: #999999"
+                  >支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span
+                >
               </div>
             </div>
           </div>
@@ -62,21 +99,23 @@
           <a-button class="btn2" html-type="submit">确定</a-button>
         </div>
       </a-form>
-      
-
     </div>
     <!--  加载动画 -->
-    <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
-        <a-spin :spinning="addLoading" tip="添加中..." />
-      </div>
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="添加中..." />
+    </div>
   </a-drawer>
 </template>
 <script>
 import { reactive, ref, toRefs } from "vue";
 import { message } from "ant-design-vue";
-import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing } from "@/api/indexWork";
+import {
+  createWorkTask,
+  queryWorkDetailById,
+  updateWorkTaskUsing,
+} from "@/api/indexWork";
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 const rowSelection = ref({
   checkStrictly: false,
@@ -103,7 +142,8 @@ export default {
       type: Boolean,
       default: false,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -119,15 +159,18 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Boolean,
       default: null,
     },
-    EditWorkId: { // 要编辑的workId 
+    EditWorkId: {
+      // 要编辑的workId
       type: Number,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -138,53 +181,59 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
+    },
   },
   setup(props, ctx) {
     const formState = reactive({
-      workName: '',
-      workRequirement: '',
-      choosedTime: '',
+      workName: "",
+      workRequirement: "",
+      choosedTime: "",
     });
     const state = reactive({
       addLoading: false,
-    })
+    });
     const formRef = ref();
 
     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: {
@@ -194,12 +243,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");
     };
@@ -211,14 +260,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} 文件上传失败.`);
       }
     };
@@ -227,146 +276,161 @@ export default {
     const closeDrawer = () => {
       resetForm();
       fileList.value = [];
-      formState.choosedTime = '';
+      formState.choosedTime = "";
       ctx.emit("update:addhomeworkVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
-      if (props.addhomeworkVisible && props.edit) { // 该页面显示同时 edit为true 时，发送查询请求, 
-        queryWork()
+      if (props.addhomeworkVisible && props.edit) {
+        // 该页面显示同时 edit为true 时，发送查询请求,
+        queryWork();
       }
       console.log("state", bool);
     };
 
     const updateWork = () => {
       state.addLoading = true;
-        if (props.edit) { // 编辑任务
-          myUpdateWorkTaskUsing()
-        } else {  // 创建任务
-          console.log('创建任务***************');
-          myCreateWorkTask()
-        }
-      
+      if (props.edit) {
+        // 编辑任务
+        myUpdateWorkTaskUsing();
+      } else {
+        // 创建任务
+        console.log("创建任务***************");
+        myCreateWorkTask();
+      }
     };
 
-        // 新增任务
-        const myCreateWorkTask = () => {
-          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": 0,
-            "workName": formState.workName,
-            "workRequirement": formState.workRequirement,
-            "workTag": ""
-          }
-          createWorkTask(obj).then((res) => {
-            if(props.isLevel) {
+    // 新增任务
+    const myCreateWorkTask = () => {
+      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: 0,
+        workName: formState.workName,
+        workRequirement: formState.workRequirement,
+        workTag: "",
+      };
+      createWorkTask(obj)
+        .then((res) => {
+          if (props.isLevel) {
             // 如果是关卡页面进入 ---------------------------------
-              myRouterEditTask(res.data.data.workId);
-            }else {
-              myProjectEditTask(res.data.data.workId);
-            }
-            
-          }).catch((err) => {
-            message.error(`添加失败${err}`)
-          })
-        }
-        // 编辑任务
-        const myUpdateWorkTaskUsing = () => {
-          let editObj = {
-            "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": props.EditWorkId,
-            "workName": formState.workName,
-            "workRequirement": formState.workRequirement,
-            "workTag": ""
+            myRouterEditTask(res.data.data.workId);
+          } else {
+            myProjectEditTask(res.data.data.workId);
           }
-          updateWorkTaskUsing(editObj).then((res) => {
-          console.log(res);
-          if(props.isLevel) {
-            // 如果是关卡页面进入 ---------------------------------
-              myRouterEditTask(res.data.data.workId);
-            }else {
-              myProjectEditTask(res.data.data.workId);
-            }
-        }).catch((err) => {
-          message.error(`编辑失败${err}`)
         })
-        }
-        // 查询任务
-        const queryWork = () => {
-          state.addLoading = true;
-          queryWorkDetailById({workId:props.EditWorkId}).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);
-            state.addLoading = false;
-          }).catch(() => {
-            message.error(`查询失败`)
-          })
-        };
-        // 新增编辑或新增项目任务
-        const myProjectEditTask = (workId) => {
-          let editObj = {
-          "courseId": workId,
-          "duration": 60,
-          "flag": true,
-          "name": formState.workName,
-          "projectId": props.projectId,
-          "projectTaskId":  props.projectTaskId || 0,
-          "stageId": props.chooseStageId,
-          "type": 4
-        }
-        ProjectEditTask(editObj).then(res => {
+        .catch((err) => {
+          message.error(`添加失败${err}`);
+        });
+    };
+    // 编辑任务
+    const myUpdateWorkTaskUsing = () => {
+      let editObj = {
+        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: props.EditWorkId,
+        workName: formState.workName,
+        workRequirement: formState.workRequirement,
+        workTag: "",
+      };
+      updateWorkTaskUsing(editObj)
+        .then((res) => {
+          console.log(res);
+          if (props.isLevel) {
+            // 如果是关卡页面进入 ---------------------------------
+            myRouterEditTask(res.data.data.workId);
+          } else {
+            myProjectEditTask(res.data.data.workId);
+          }
+        })
+        .catch((err) => {
+          message.error(`编辑失败${err}`);
+        });
+    };
+    // 查询任务
+    const queryWork = () => {
+      state.addLoading = true;
+      queryWorkDetailById({ workId: props.EditWorkId })
+        .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);
+          state.addLoading = false;
+        })
+        .catch(() => {
+          message.error(`查询失败`);
+        });
+    };
+    // 新增编辑或新增项目任务
+    const myProjectEditTask = (workId) => {
+      let editObj = {
+        courseId: workId,
+        duration: 60,
+        flag: true,
+        name: formState.workName,
+        projectId: props.projectId,
+        projectTaskId: props.projectTaskId || 0,
+        stageId: props.chooseStageId,
+        type: 4,
+      };
+      ProjectEditTask(editObj)
+        .then((res) => {
           console.log(` 编辑项目成功的打印 ${res}`);
-          message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
+          message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
           ctx.emit("changeData", false);
           state.addLoading = false;
           closeDrawer();
-        }).catch(err => {
-          message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
-          console.log(` 编辑项目失败的打印 ${err}`);
         })
+        .catch((err) => {
+          message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          console.log(` 编辑项目失败的打印 ${err}`);
+        });
+    };
+    // 新增编辑或新增关卡任务
+    const myRouterEditTask = (testId) => {
+      let editObj1 = {
+        chapterId: props.isactive,
+        courseId: testId,
+        duration: 30,
+        flag: true,
+        name: formState.workName,
+        routerId: props.routerId,
+        routerTaskId: props.routerTaskId || 0,
+        type: 4,
+      };
 
-        }
-        // 新增编辑或新增关卡任务
-        const myRouterEditTask = (testId) => {
-          let editObj1 = {
-            "chapterId": props.isactive,
-            "courseId": testId,
-            "duration": 30,
-            "flag": true,
-            "name": formState.workName,
-            "routerId": props.routerId,
-            "routerTaskId":  props.routerTaskId || 0,
-            "type": 4
-          }
-
-          RouterEditTask(editObj1).then(res => {
-            console.log(` 编辑关卡成功的打印 ${res}`);
-            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-            ctx.emit("changeData", false);
-            state.addLoading = false;
-            closeDrawer();
-          }).catch(err => {
-            message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
-            console.log(` 编辑关卡失败的打印 ${err}`);
-          })
-        }
+      RouterEditTask(editObj1)
+        .then((res) => {
+          console.log(` 编辑关卡成功的打印 ${res}`);
+          message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+          ctx.emit("changeData", false);
+          state.addLoading = false;
+          closeDrawer();
+        })
+        .catch((err) => {
+          message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          console.log(` 编辑关卡失败的打印 ${err}`);
+        });
+    };
 
     return {
       afterVisibleChange,
@@ -383,7 +447,7 @@ export default {
       // layout,
       rules,
       updateWork,
-      ...toRefs(state)
+      ...toRefs(state),
     };
   },
 };
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 8655565a..d84c6c9e 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -28,11 +28,11 @@
                 maxlength="20"
               />
             </div>
-            <div class="btns">
+            <div class="btns" @click="searchInvist">
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
-            <div class="btnsn">
+            <div class="btnsn" @click="resetInvist">
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
@@ -182,7 +182,7 @@ export default {
       return columns;
     };
     const rowSelection = {
-      type: 'radio',
+      type: "radio",
       // onChange: (selectedRowKeys, selectedRows) => {
       //   this.selectedRowKeys = selectedRowKeys
       //   if (selectedRows.length > 1) {
@@ -199,9 +199,16 @@ export default {
       //   // // Column configuration not to be checked
       //   name: record.name,
       // }),
-      onSelect: ( selectedRows, selected,selectedRowKeys) => {
-        console.log('selectedRowKeys',selectedRowKeys,'selectedRows', selectedRows, 'selected', selected)
-      }
+      onSelect: (selectedRows, selected, selectedRowKeys) => {
+        console.log(
+          "selectedRowKeys",
+          selectedRowKeys,
+          "selectedRows",
+          selectedRows,
+          "selected",
+          selected
+        );
+      },
     };
 
     const getTableDate = (tableData) => {
@@ -325,7 +332,70 @@ export default {
         });
     };
     //搜索评估信息接口
-
+    const searchInvist = () => {
+      let objsearch = {
+        assessmentName: state.inputV1,
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        releaseStatus: "",
+        searchEndTime: "",
+        searchStartTime: "",
+      };
+      api
+        .queryAssessmentDetailList(objsearch)
+        .then((res) => {
+          if (res.status === 200) {
+            console.log("获取搜索的评估信息", res.data.data);
+            let arr = res.data.data.rows;
+            if (
+              arr.length === 0 &&
+              res.data.data.total > 0 &&
+              state.currentPage > 1
+            ) {
+              state.currentPage = state.currentPage - 1;
+              getAllInvistText();
+            }
+            getTableDate(arr);
+            state.tableDataTotal = Number(res.data.data.total);
+          }
+        })
+        .catch((err) => {
+          console.log("获取全部评估信息接口失败", err);
+        });
+    };
+    //重置评估信息
+    const resetInvist = () => {
+      state.inputV1 = "";
+      let objreset = {
+        assessmentName: state.inputV1,
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        releaseStatus: "",
+        searchEndTime: "",
+        searchStartTime: "",
+      };
+      api
+        .queryAssessmentDetailList(objreset)
+        .then((res) => {
+          if (res.status === 200) {
+            console.log("获取重置后的评估信息", res.data.data);
+            let arr = res.data.data.rows;
+            if (
+              arr.length === 0 &&
+              res.data.data.total > 0 &&
+              state.currentPage > 1
+            ) {
+              state.currentPage = state.currentPage - 1;
+              getAllInvistText();
+            }
+            getTableDate(arr);
+            state.tableDataTotal = Number(res.data.data.total);
+          }
+        })
+        .catch((err) => {
+          console.log("获取重置的评估信息接口失败", err);
+        });
+    };
     onMounted(() => {
       // createInvist();
       getAllInvistText();
@@ -338,6 +408,8 @@ export default {
       rowSelection,
       createInvist,
       getAllInvistText,
+      searchInvist,
+      resetInvist,
     };
   },
 };
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index d13fe14e..57195b43 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -27,7 +27,7 @@
                   alt=""
                 />
               </div>
-              <span style="margin-right: 3px">投票名称：</span>
+              <span style="margin-right: 3px">任务名称：</span>
             </div>
             <div class="btnbox">
               <a-input
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 9722df81..cdcd309d 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -36,6 +36,10 @@
           <button class="cjtpbtn" @click="addQue()">创建题干</button>
         </div>
         <div class="queBox" v-for="(q, index) in questions" :key="index">
+          <div class="delBtn" v-if="questions.length > 1">
+            <img src="@/assets/images/projectadd/delete.png" alt="" />
+            <div class="btnText">删除题干</div>
+          </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -44,7 +48,9 @@
                   alt=""
                 />
               </div>
-              <span style="margin-right: 3px">题干</span>
+              <span style="margin-right: 3px"
+                >{{ q.stemTit }}{{ index + 1 }}</span
+              >
             </div>
             <div class="btnbox">
               <a-input
@@ -55,7 +61,7 @@
             </div>
           </div>
           <div class="option" v-for="(o, index) in q.options" :key="index">
-            <div class="main_item">
+            <div class="mainoptions">
               <div class="signbox">
                 <div class="sign">
                   <img
@@ -63,24 +69,29 @@
                     alt=""
                   />
                 </div>
-                <span style="margin-right: 3px">{{ o.title }}</span>
+                <span style="margin-right: 3px">{{ o.title }}{{index+1}}</span>
               </div>
-              <div class="btnbox">
-                <a-input
-                  v-model:value="o.opvalue"
-                  style="width: 424px; height: 32px"
-                />
-                <a-button v-if="o.opvalue == ''" type="link"
-                  >+ 上传图片</a-button
-                >
-                <a-button v-else type="link">删除</a-button>
+              <div class="optionbox">
+                <div class="btnbox">
+                  <a-input
+                    v-model:value="o.opvalue"
+                    style="width: 424px; height: 32px"
+                  />
+                  <button v-if="q.options.length > 2" class="delbtn" :key="index" @click="delOpt(q.options)">
+                    删除
+                  </button>
+                </div>
+                <a-button type="link">+ 上传图片</a-button>
+                <!-- <input class="file-upload" type="file" accept="image/*" name="picture"/> -->
               </div>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox"></div>
-            <div class="btnbox" @click="addOpt(q.options)">
-              <div class="tjxxbtn"><div class="btntext">添加选项</div></div>
+            <div class="btnbox">
+              <div class="tjxxbtn" @click="addOpt(q.options)">
+                <div class="btntext">添加选项</div>
+              </div>
             </div>
           </div>
         </div>
@@ -112,14 +123,15 @@ export default {
       creVote: true,
       questions: [
         {
+          stemTit: "题干",
           inputV: "",
           options: [
             {
-              title: "选项1",
+              title: "选项",
               opvalue: "",
             },
             {
-              title: "选项2",
+              title: "选项",
               opvalue: "",
             },
           ],
@@ -129,14 +141,15 @@ export default {
 
     const addQue = () => {
       state.questions.push({
+        stemTit: "题干",
         inputV: "",
         options: [
           {
-            title: "选项1",
+            title: "选项",
             opvalue: "",
           },
           {
-            title: "选项2",
+            title: "选项",
             opvalue: "",
           },
         ],
@@ -145,10 +158,16 @@ export default {
     const addOpt = (value) => {
       console.log(value);
       value.push({
-        title: "选项" + (value.length + 1 * 1),
+        // title: "选项" + (value.length + 1 * 1),
+        title: "选项",
         opvalue: "",
       });
     };
+    const delOpt = (value) => {
+      console.log('gys', value);
+      // delete value[0]
+      value.pop()
+    }
 
     const closeDrawer = () => {
       ctx.emit("update:crevoteVisible", false);
@@ -171,7 +190,7 @@ export default {
       //   message.destroy();
       //   return message.info("请输入选项");
       // }
-      console.log('111111',state.questions);
+      console.log("111111", state.questions);
       // console.log('22222',state.questions.inputV);
       // console.log('333333',state.questions.options);
       let obj = [
@@ -207,11 +226,11 @@ export default {
           // console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId);
           // console.log('state.questions[0].inputV',state.questions[0].inputV);
           message.success("创建成功");
-        //获取题干信息
+          //获取题干信息
           let objstem = {
             stemId: res.data.data[0].ascriptionId,
             ascriptionId: res.data.data[0].voteStemId,
-          }
+          };
           api
             .queryStemByStemId(objstem)
             .then((res) => {
@@ -240,6 +259,7 @@ export default {
       closeDrawer,
       addQue,
       addOpt,
+      delOpt,
       createQueTit,
     };
   },
@@ -291,6 +311,7 @@ export default {
           display: flex;
           justify-content: end;
           align-items: center;
+          margin-right: 5px;
           .sign {
             margin-right: 5px;
           }
@@ -299,24 +320,9 @@ export default {
           display: flex;
           flex: 1;
           align-items: center;
-          .tjxxbtn {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            cursor: pointer;
-            width: 130px;
-            height: 40px;
-            background: #388be1;
-            border-radius: 8px;
-            border: 0;
-            margin-right: 8px;
-            .btntext {
-              color: #fff;
-            }
-          }
         }
       }
-      .main_item2 {
+      .mainoptions {
         display: flex;
         align-items: flex-start;
         margin-bottom: 32px;
@@ -325,43 +331,128 @@ export default {
           display: flex;
           justify-content: end;
           align-items: center;
+          padding-top: 5px;
+          margin-right: 5px;
           .sign {
             margin-right: 5px;
           }
         }
-        .kqszbox {
-          .qdqtbox {
-            margin-left: 56px;
-          }
-          .setbox {
+        .optionbox {
+          .btnbox {
             display: flex;
-            flex-wrap: wrap;
-            margin-top: 10px;
-            margin-bottom: 24px;
-            .timerbox {
-              margin-top: 6px;
-              margin-right: 32px;
+            align-items: center;
+          }
+          .delbtn {
+            border: none;
+            color: #4ea6ff;
+            background-color: #fff;
+            cursor: pointer;
+          }
+        }
+      }
+      .queBox {
+        border: 1px solid #e8e8e8;
+        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+        padding-top: 30px;
+        margin-bottom: 30px;
+        .delBtn {
+          width: 130px;
+          height: 40px;
+          border: 1px solid #4ea6ff;
+          border-radius: 8px;
+          color: #4ea6ff;
+          background-color: #fff;
+          cursor: pointer;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-left: 20px;
+          margin-bottom: 20px;
+          img {
+            margin-right: 10px;
+          }
+        }
+        .main_item {
+          display: flex;
+          align-items: center;
+          margin-bottom: 32px;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+            .sign {
+              margin-right: 5px;
+            }
+          }
+          .btnbox {
+            display: flex;
+            flex: 1;
+            align-items: center;
+            .tjxxbtn {
               display: flex;
               align-items: center;
-              flex-wrap: nowrap;
+              justify-content: center;
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 8px;
+              .btntext {
+                color: #fff;
+              }
             }
           }
         }
-        .btnbox2 {
+        .main_item2 {
           display: flex;
-          flex-direction: column;
-          justify-content: flex-start;
-          .xkbtn {
-            cursor: pointer;
-            width: 130px;
-            height: 40px;
-            background: #388be1;
-            border-radius: 8px;
-            border: 0;
-            margin-right: 16px 8px 32px 0;
-            color: #fff;
-            margin-top: 16px;
-            margin-bottom: 60px;
+          align-items: flex-start;
+          margin-bottom: 32px;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+            .sign {
+              margin-right: 5px;
+            }
+          }
+          .kqszbox {
+            .qdqtbox {
+              margin-left: 56px;
+            }
+            .setbox {
+              display: flex;
+              flex-wrap: wrap;
+              margin-top: 10px;
+              margin-bottom: 24px;
+              .timerbox {
+                margin-top: 6px;
+                margin-right: 32px;
+                display: flex;
+                align-items: center;
+                flex-wrap: nowrap;
+              }
+            }
+          }
+          .btnbox2 {
+            display: flex;
+            flex-direction: column;
+            justify-content: flex-start;
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 16px 8px 32px 0;
+              color: #fff;
+              margin-top: 16px;
+              margin-bottom: 60px;
+            }
           }
         }
       }
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 48960ef2..cdb61889 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -149,6 +149,7 @@
 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import EntryScores from "./EntryScores.vue";
+import * as api from "../../api/index";
 export default {
   name: "FaceManage",
   components: { EntryScores },
@@ -157,6 +158,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    ProjectTaskId: {
+      type: Number,
+      default: null,
+    },
   },
 
   setup(props, ctx) {
@@ -359,8 +364,33 @@ export default {
     const showopen = () => {
       state.open = true;
     };
+
+    //获取任务管理列表
+    const getManageList = () => {
+      let obj = {
+        name: "",
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.ProjectTaskId,
+        status: 0,
+      };
+      console.log('9999999999999',obj.projectTaskId);
+      api
+        .taskStudentList(obj)
+        .then((res) => {
+          console.log('获取任务管理列表成功', res);
+          
+        })
+        .catch((err) => {
+        console.log("获取任务列表失败",err)
+      })
+    };
+
     let timer;
     onMounted(() => {
+      setTimeout(() => {
+        getManageList()
+      },1000)
       timer = setInterval(() => {
         state.open = false;
       }, 3000);
@@ -380,6 +410,7 @@ export default {
       showdoneModal,
       closedoneModal,
       showopen,
+      getManageList,
     };
   },
 };
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index cdb761cf..735d851f 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -65,32 +65,50 @@
                     <div class="right1">清空</div>
                   </div>
                 </div> -->
-                  <div class="tabb" style="margin-top: 16px">
-                    <a-table
-                      style="border: 1px solid #f2f6fe"
-                      :columns="tablecolumns"
-                      :data-source="tabledata"
-                      :loading="tableDataTotal === -1 ? true : false"
-                      expandRowByClick="true"
-                      :scroll="{ x: 500 }"
-                      @expand="expandTable"
-                      :pagination="false"
-                      :row-selection="{
-                        columnWidth: 30,
-                        selectedRowKeys: selectedRowKeys,
-                        onChange: onSelectChange,
-                      }"
-                    />
-                    <div class="pa">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize"
-                        :current="currentPage"
-                        :total="tableDataTotal"
-                        class="pagination"
+                  <div class="chooseLeft">
+                    <div class="boeTree">
+                      <a-tree-select
+                        v-model:value="valueSelectboe"
+                        style="width: 240px; border-radius: 4px"
+                        dropdownClassName="changetreedropdownboe"
+                        :dropdown-style="{
+                          maxHeight: '600px',
+                          overflow: 'auto',
+                        }"
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData"
+                      >
+                        <template #suffixIcon></template>
+                      </a-tree-select>
+                    </div>
+                    <div class="tabb" style="margin-top: 16px">
+                      <a-table
+                        style="border: 1px solid #f2f6fe"
+                        :columns="tablecolumns"
+                        :data-source="tabledata"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        expandRowByClick="true"
+                        @expand="expandTable"
+                        :pagination="false"
+                        :row-selection="{
+                          columnWidth: 20,
+                          selectedRowKeys: selectedRowKeys,
+                          onChange: onSelectChange,
+                        }"
                       />
+                      <div class="pa">
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize"
+                          :current="currentPage"
+                          :total="tableDataTotal"
+                          class="pagination"
+                        />
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -101,36 +119,14 @@
                   style="overflow-y: auto"
                 >
                   <div class="tab2">
-                    <div class="t1">
-                      <div class="organize">选择组织：</div>
-                      <div class="select">
-                        <a-tree-select
-                          v-model:value="valueSelect"
-                          style="width: 200px"
-                          dropdownClassName="changetreedropdown"
-                          :dropdown-style="{
-                            maxHeight: '400px',
-                            overflow: 'auto',
-                          }"
-                          placeholder="请输入组织名称"
-                          allow-clear
-                          tree-default-expand-all
-                          :tree-data="treeData"
-                        >
-                        </a-tree-select>
-                      </div>
-                    </div>
-                    <div class="t1">
-                      <div class="organize">姓名：</div>
+                    <div class="nameinp">
+                      <div class="namee">组织：</div>
                       <a-input
-                        v-model:value="nameadd"
-                        style="width: 200px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
                       />
                     </div>
-                  </div>
-                  <!-- 选完后出现下面 -->
-                  <div class="searchdown">
                     <div class="btns">
                       <div class="btn1">
                         <div class="img1">
@@ -149,6 +145,34 @@
                         <div class="wz">重置</div>
                       </div>
                     </div>
+                    <!-- <div class="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </div> -->
+                  </div>
+                  <div class="boeTree">
+                    <a-tree-select
+                      v-model:value="valueSelectboe2"
+                      style="width: 240px; border-radius: 4px"
+                      dropdownClassName="changetreedropdownboe"
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                        overflow: 'auto',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData2"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree-select>
+                  </div>
+                  <!-- 选完后出现下面 -->
+                  <!-- <div class="searchdown">
                     <div class="tabb" style="margin-top: 16px">
                       <a-table
                         style="border: 1px solid #f2f6fe"
@@ -177,7 +201,7 @@
                         />
                       </div>
                     </div>
-                  </div>
+                  </div> -->
                 </div>
               </a-tab-pane>
               <a-tab-pane key="3" tab="受众关联">
@@ -284,204 +308,19 @@
               <span class="allclear">全部清除</span>
             </div>
           </div>
-          <div
-            class="selecteds"
-            :style="{ 'max-height': screenHeight - 235 + 'px' }"
-            style="overflow-y: auto"
-          >
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
+          <div class="line"></div>
+          <div class="tit">快速选人</div>
+          <div class="selecteds">
+            <!-- 遍历生成 -->
+            <div class="chose" v-for="item in choosepeople" :key="item.id">
+              {{ item.name }}
               <div class="ch"></div>
             </div>
           </div>
+          <div class="line"></div>
+          <div class="tit">添加组织</div>
+          <div class="line"></div>
+          <div class="tit">受众关联</div>
         </div>
       </div>
       <div class="btnn">
@@ -521,9 +360,12 @@ export default {
       value: [], //级联选择框
       choosevalue: null, //受众选择
       valueSelect: null, //树形选择
+      valueSelectboe: null, //boe树形选择
+      valueSelectboe2: null, //boe树形选择
       name: "",
       nameadd: "",
       nameaddd: "",
+      com: "",
       treeData: [
         {
           title: "京东方",
@@ -691,69 +533,236 @@ export default {
           ],
         },
       ],
+      treeData2: [
+        {
+          title: "京东方",
+          value: "京东方",
+          children: [
+            {
+              title: "产研部",
+              value: "产研部",
+              children: [
+                {
+                  title: "产品部",
+                  value: "产品部",
+                },
+                {
+                  title: "研究部",
+                  value: "研究部",
+                },
+              ],
+            },
+            {
+              title: "二级标题",
+              value: "二级标题",
+              children: [
+                {
+                  title: "三级标题",
+                  value: "三级标题",
+                  children: [
+                    {
+                      title: "四级标题",
+                      value: "四级标题",
+                      children: [
+                        {
+                          title: "五级标题",
+                          value: "五级标题",
+                          children: [
+                            {
+                              title: "六级标题",
+                              value: "六级标题",
+                              children: [
+                                {
+                                  title: "七级标题",
+                                  value: "七级标题",
+                                  children: [
+                                    {
+                                      title: "八级标题",
+                                      value: "八级标题",
+                                      children: [
+                                        {
+                                          title: "九级标题",
+                                          value: "九级标题",
+                                          children: [
+                                            {
+                                              title: "十级标题",
+                                              value: "十级标题",
+                                              children: [
+                                                {
+                                                  title: "十一级标题",
+                                                  value: "十一级标题",
+                                                  children: [
+                                                    {
+                                                      title: "十二级标题",
+                                                      value: "十二级标题",
+                                                      children: [
+                                                        {
+                                                          title:
+                                                            "十三级标题十三级标题十三级标题十三级标题",
+                                                          value: "十三级标题",
+                                                          children: [
+                                                            {
+                                                              title:
+                                                                "十四级标题",
+                                                              value:
+                                                                "十四级标题",
+                                                              children: [
+                                                                {
+                                                                  title:
+                                                                    "十五级标题",
+                                                                  value:
+                                                                    "十五级标题",
+                                                                  children: [
+                                                                    {
+                                                                      title:
+                                                                        "十六级标题",
+                                                                      value:
+                                                                        "十六级标题",
+                                                                      children:
+                                                                        [
+                                                                          {
+                                                                            title:
+                                                                              "十七级标题",
+                                                                            value:
+                                                                              "十七级标题",
+                                                                            children:
+                                                                              [
+                                                                                {
+                                                                                  title:
+                                                                                    "十八级标题",
+                                                                                  value:
+                                                                                    "十八级标题",
+                                                                                  children:
+                                                                                    [
+                                                                                      {
+                                                                                        title:
+                                                                                          "十九级标题",
+                                                                                        value:
+                                                                                          "十九级标题",
+                                                                                        children:
+                                                                                          [
+                                                                                            {
+                                                                                              title:
+                                                                                                "二十级标题二十级标题",
+                                                                                              value:
+                                                                                                "二十级标题二十级标题",
+                                                                                            },
+                                                                                          ],
+                                                                                      },
+                                                                                    ],
+                                                                                },
+                                                                              ],
+                                                                          },
+                                                                        ],
+                                                                    },
+                                                                  ],
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
+                                                      ],
+                                                    },
+                                                  ],
+                                                },
+                                              ],
+                                            },
+                                          ],
+                                        },
+                                      ],
+                                    },
+                                  ],
+                                },
+                              ],
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              title: "人力资源部",
+              value: "人力资源部",
+              children: [
+                {
+                  title: "人事部",
+                  value: "人事部",
+                },
+                {
+                  title: "行政部",
+                  value: "行政部",
+                },
+              ],
+            },
+          ],
+        },
+      ],
       tabledata: [
         {
           key: 1,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 2,
           name: "小刘",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 3,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 4,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 5,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 6,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 7,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 8,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 9,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
       ],
       tablecolumns: [
@@ -761,7 +770,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -769,7 +778,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -777,7 +786,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -785,7 +794,7 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -998,6 +1007,52 @@ export default {
           label: "人力资源hrbp",
         },
       ],
+      choosepeople: [
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+        {
+          id: 1,
+          name: "李明",
+        },
+      ],
     });
     const closeDrawer = () => {
       state.activeKey = "1";
@@ -1234,49 +1289,70 @@ export default {
               }
             }
           }
-          .tabb {
-            .ant-table-thead > tr > th {
-              background-color: rgba(240, 246, 252, 1);
-              color: rgba(0, 0, 0, 0.85);
-            }
-            .ant-table-tbody > tr > td {
-              border-bottom: 1px solid #f0f6fc;
-              color: rgba(0, 0, 0, 0.65);
-            }
-            th.h {
-              background-color: #eff4fc !important;
+          .chooseLeft {
+            display: flex;
+            justify-content: space-between;
+            .boeTree {
+              margin-top: 20px;
+              width: 300px;
+              height: 40px;
+              margin-right: 10px;
+              .ant-select {
+                .ant-select-selector {
+                  border-radius: 8px;
+                  height: 40px;
+                  .ant-select-selection-placeholder {
+                    color: #409eff;
+                    margin-left: 72px !important;
+                    margin-top: 4px !important;
+                  }
+                }
+              }
             }
+            .tabb {
+              .ant-table-thead > tr > th {
+                background-color: rgba(240, 246, 252, 1);
+                color: rgba(0, 0, 0, 0.85);
+              }
+              .ant-table-tbody > tr > td {
+                border-bottom: 1px solid #f0f6fc;
+                color: rgba(0, 0, 0, 0.65);
+              }
+              th.h {
+                background-color: #eff4fc !important;
+              }
 
-            .ant-table-tbody
-              > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-              > td {
-              background: rgba(250, 250, 250, 1);
-            }
-            .ant-table-selection-column {
-              padding: 0 !important;
-            }
-            // table tr td.ant-table-selection-column {
-            //   text-align: right;
-            // }
-            // .ant-checkbox-wrapper {
-            //   align-items: center;
-            //   margin-top: -2px;
-            // }
-            .pa {
-              // left: 0;
-              margin-top: 15px;
-              width: 100%;
-              // height: 20px;
-              // background-color: red;
-              display: flex;
-              justify-content: center;
-              // position: absolute;
-              // bottom: 20px;
-              .ant-pagination-item,
-              .ant-pagination-prev,
-              .ant-pagination-next,
-              .ant-pagination-options {
-                margin-bottom: 10px;
+              .ant-table-tbody
+                > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+                > td {
+                background: rgba(250, 250, 250, 1);
+              }
+              .ant-table-selection-column {
+                padding: 0 !important;
+              }
+              // table tr td.ant-table-selection-column {
+              //   text-align: right;
+              // }
+              // .ant-checkbox-wrapper {
+              //   align-items: center;
+              //   margin-top: -2px;
+              // }
+              .pa {
+                // left: 0;
+                margin-top: 15px;
+                width: 100%;
+                // height: 20px;
+                // background-color: red;
+                display: flex;
+                justify-content: center;
+                // position: absolute;
+                // bottom: 20px;
+                .ant-pagination-item,
+                .ant-pagination-prev,
+                .ant-pagination-next,
+                .ant-pagination-options {
+                  margin-bottom: 10px;
+                }
               }
             }
           }
@@ -1284,45 +1360,27 @@ export default {
           .tab2 {
             display: flex;
             align-items: center;
-            margin-top: 10px;
+            // margin-top: 10px;
             flex-wrap: wrap;
             justify-content: space-between;
+            .nameinp {
+              display: flex;
+              align-items: center;
+              margin-top: 10px;
+              .namee {
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
+              }
+            }
 
             .t1 {
               display: flex;
               align-items: center;
               margin-bottom: 5px;
             }
-            .organize {
-              color: rgba(0, 0, 0, 0.85);
-              font-size: 14px;
-              white-space: nowrap;
-            }
-
-            .ant-select-dropdown {
-              min-width: 800px !important;
-            }
-            .ant-select {
-              border-radius: 8px !important;
-              // background-color: red;
-            }
-            .ant-cascader {
-              width: 264px;
-              height: 40px;
-              border-radius: 8px !important;
-              .ant-select-selector {
-                height: 100%;
-              }
-              .ant-select-selection-search-input {
-                height: 40px;
-              }
-            }
-          }
-
-          .searchdown {
             .btns {
               display: flex;
-              margin-top: 10px;
+              // margin-top: -10px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -1357,6 +1415,47 @@ export default {
                 }
               }
             }
+            .organize {
+              color: rgba(0, 0, 0, 0.85);
+              font-size: 14px;
+              white-space: nowrap;
+            }
+
+            .ant-select-dropdown {
+              min-width: 800px !important;
+            }
+            .ant-select {
+              border-radius: 8px !important;
+              // background-color: red;
+            }
+            .ant-cascader {
+              width: 264px;
+              height: 40px;
+              border-radius: 8px !important;
+              .ant-select-selector {
+                height: 100%;
+              }
+              .ant-select-selection-search-input {
+                height: 40px;
+              }
+            }
+          }
+          .boeTree {
+            margin-top: 20px;
+            width: 300px;
+            height: 40px;
+            margin-right: 10px;
+            .ant-select {
+              .ant-select-selector {
+                border-radius: 8px;
+                height: 40px;
+                .ant-select-selection-placeholder {
+                  color: #409eff;
+                  margin-left: 72px !important;
+                  margin-top: 4px !important;
+                }
+              }
+            }
           }
         }
       }
@@ -1416,10 +1515,25 @@ export default {
             }
           }
         }
+        .line {
+          width: 90%;
+          height: 1px;
+          background-color: #e8e8e8;
+          margin-left: 12px;
+          margin-top: 20px;
+        }
+        .tit {
+          font-size: 14px;
+          font-weight: 500;
+          margin-top: 12px;
+          margin-left: 32px;
+        }
         .selecteds {
           display: flex;
           flex-wrap: wrap;
           margin-left: 32px;
+          height: 200px;
+          overflow-y: hidden;
           .chose {
             width: 64px;
             height: 24px;
@@ -1490,4 +1604,18 @@ export default {
     width: 7px !important;
   }
 }
+.changetreedropdownboe {
+  width: 240px !important;
+  border-radius: 5px;
+  min-height: 600px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
 </style>
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index a71722cc..072f1b21 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -119,6 +119,10 @@ export default {
       type: String,
       default: "",
     },
+    projectTaskId: {
+      type: Number,
+      default: null,
+    }
   },
 
   setup(props, ctx) {
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index e15764a2..b1661cda 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -115,6 +115,10 @@ export default {
       type: String,
       default: "",
     },
+    projectTaskId: {
+      type: Number,
+      default: null,
+    }
   },
 
   setup(props, ctx) {
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index 9348356b..f8374472 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -134,6 +134,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    projectTaskId: {
+      type: Number,
+      default: null,
+    }
   },
 
   setup(props, ctx) {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f5708800..d94cb66d 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -116,43 +116,48 @@
             <div class="onerow"><div class="taskmain">项目概览</div></div>
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
-                <span class="nub1">200</span>
+                <span class="nub1">{{routerInfoOverview.totalStudentCnt}}</span>
                 <div class="nub2">总人数</div>
               </div>
               <div class="nubbox">
-                <span class="nub1" style="color: #ff90ae">15</span>
-                <div class="nub2">必修课</div>
+                <span class="nub1" style="color: #ff90ae">{{routerInfoOverview.studyStudentCnt}}</span>
+                <div class="nub2">学习人数</div>
               </div>
               <div class="nubbox">
-                <span class="nub1" style="color: #a497ff">15</span>
-                <div class="nub2">选修课</div>
+                <span class="nub1" style="color: #a497ff">{{routerInfoOverview.completeStudentCnt}}</span>
+                <div class="nub2">完成人数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #5dc988">50</span
+                  <span class="nub1" style="color: #5dc988">{{routerInfoOverview.onlineCourseCnt}}</span
                   ><span style="color: #5dc988; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">完成率</div>
+                <div class="nub2">在线课程数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #ff90ae">30</span
+                  <span class="nub1" style="color: #ff90ae">{{routerInfoOverview.offLineCourseCnt}}</span
                   ><span style="color: #ff90ae; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">必修完成率</div>
+                <div class="nub2">面授课程数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #a497ff">30</span
+                  <span class="nub1" style="color: #a497ff">{{routerInfoOverview.completeRatio}}</span
                   ><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">选修完成率</div>
+                <div class="nub2">总完成率</div>
               </div>
             </div>
             <div class="onerow"><div class="taskmain">阶段信息</div></div>
             <div class="stagemess">
-              <div class="stage1">阶段1</div>
-              <div class="stage2">阶段2</div>
+              <div v-for="item in stageList" 
+              :class= "{ 'stage1': item.stageId == choosedStageId, 'stage2': item.stageId != choosedStageId }"
+              :key="item.stageId" @click="choosedStageId = item.stageId">
+              {{item.stage}}
+            </div>
+              <!-- <div class="stage1">阶段1</div>
+              <div class="stage2">阶段2</div> -->
             </div>
             <div class="stagesecond">
               <div class="staname">阶段名称：</div>
@@ -163,7 +168,7 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="chapterOverviewList.completeCourseRatio"
                   :width="140"
                 />
                 <div class="protext">课程完成率</div>
@@ -172,7 +177,7 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="chapterOverviewList.completeExamRatio"
                   :width="140"
                 />
                 <div class="protext">考试通过率</div>
@@ -181,26 +186,26 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="chapterOverviewList.completeRatio"
                   :width="140"
                 />
-                <div class="protext">作业合格率</div>
+                <div class="protext">作业完成率</div>
               </div>
               <div class="proright">
-                <div class="pronub" style="margin-left: 280px">10</div>
+                <div class="pronub" style="margin-left: 280px">{{chapterOverviewList.totalTaskCnt}}</div>
                 <div class="proright1">
-                  <span class="textpro">阶段任务总数</span>
-                  <a-progress :percent="50" style="width: 369px" />
+                  <span class="textpro">关卡任务总数</span>
+                  <a-progress :percent="chapterOverviewList.totalTaskCnt" style="width: 369px" />
                 </div>
-                <div class="pronub" style="margin-left: 206px">5</div>
+                <div class="pronub" style="margin-left: 206px">{{chapterOverviewList.totalReqCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">必修课</span>
-                  <a-progress :percent="25" style="width: 369px" />
+                  <a-progress :percent="chapterOverviewList.totalReqCnt" style="width: 369px" />
                 </div>
-                <div class="pronub" style="margin-left: 142px">1</div>
+                <div class="pronub" style="margin-left: 142px">{{chapterOverviewList.totalOptCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">选修课</span>
-                  <a-progress :percent="5" style="width: 369px" />
+                  <a-progress :percent="chapterOverviewList.totalOptCnt" style="width: 369px" />
                 </div>
               </div>
             </div>
@@ -301,11 +306,11 @@
                 <a-collapse-panel
                   v-for="(value, index) in taskSyllabus"
                   :key="index"
-                  :header="value.text"
+                  :header="value.name"
                 >
                   <div
                     class="course"
-                    v-for="(item, key) in value.children"
+                    v-for="(item, key) in value.taskList"
                     :key="key"
                   >
                     <!-- :style="{width:item.course==='在线'?'28px':
@@ -323,29 +328,29 @@
                         >
                           <img
                             :src="
-                              item.course === '在线'
+                              item.type === 1
                                 ? require('../../assets/images/leveladd/zai.png')
-                                : item.course === '面授'
+                                : type === 2
                                 ? require('../../assets/images/leveladd/mian.png')
-                                : item.course === '案例'
+                                : item.type === 3
                                 ? require('../../assets/images/leveladd/an.png')
-                                : item.course === '作业'
+                                : item.type === 4
                                 ? require('../../assets/images/leveladd/zuo.png')
-                                : item.course === '考试'
+                                : item.type === 5
                                 ? require('../../assets/images/leveladd/kao.png')
-                                : item.course === '直播'
+                                : item.type === 6
                                 ? require('../../assets/images/leveladd/zhi.png')
-                                : item.course === '外链'
+                                : item.type === 7
                                 ? require('../../assets/images/leveladd/wai.png')
-                                : item.course === '讨论'
+                                : item.type === 8
                                 ? require('../../assets/images/leveladd/tao.png')
-                                : item.course === '活动'
+                                : item.type === 9
                                 ? require('../../assets/images/leveladd/huo.png')
-                                : item.course === '测评'
+                                : item.type === 10
                                 ? require('../../assets/images/leveladd/ce.png')
-                                : item.course === '评估'
+                                : item.type === 11
                                 ? require('../../assets/images/leveladd/diao.png')
-                                : item.course === '投票'
+                                : item.type === 12
                                 ? require('../../assets/images/leveladd/tou.png')
                                 : null
                             "
@@ -353,17 +358,17 @@
                         </div>
                       </div>
                       <div>
-                        <div class="iconame">「{{ item.course }}」</div>
+                        <div class="iconame">「{{checkType(item.type)}}」</div>
                         <div class="icontext">{{ item.name }}</div>
                       </div>
                     </div>
                     <div class="type">
                       <div
                         :class="
-                          item.classify == '必修' ? 'typename1' : 'typename'
+                          item.flag ? 'typename1' : 'typename'
                         "
                       >
-                        {{ item.classify }}
+                        {{ item.flag ? "必修" : "选修" }}
                       </div>
                     </div>
                     <div class="time">
@@ -548,165 +553,213 @@
         </a-tab-pane>
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
-          <div class="sametab">
-            <div class="Gcon">
-              <div class="pad"></div>
-              <div class="Gin">
-                <div class="headone">
-                  <div class="box"></div>
-                  <div class="onetitle">关卡内容可见可学设置</div>
-                  <div class="oneedi" @click="showbtn" v-show="twobtn">
-                    编辑
-                  </div>
-                  <div v-show="twobtnn" class="twobtn">
-                    <div class="btnone" @click="closebtn">取消</div>
-                    <div class="btntwo" @click="closebtn">确定</div>
-                  </div>
-                </div>
-                <div class="onemain clearfix">
-                  <div class="checkcon">
-                    <input
-                      type="checkbox"
-                      name="cb1"
-                      value="yulan"
-                      class="in"
-                    />
-                    <span class="yulan">预览其他关卡</span><br />
-                    <div style="width: 10px; height: 4px"></div>
-                    <div style="display: flex; align-items: center">
-                      <span class="yulan2">学员可预览第</span>
-                      <span style="color: #4ea6ff" v-show="number">1</span>
-                      <a-input-number
-                        v-model:value="nubvalue"
-                        v-show="inputbox"
-                        :controls="false"
-                        :autofocus="true"
-                        :min="1"
-                      />
-                      <span>关-第</span
-                      ><span style="color: #4ea6ff" v-show="number">4</span>
-                      <a-input-number
-                        v-model:value="nubvalue1"
-                        v-show="inputbox"
-                        :controls="false"
-                        :autofocus="true"
-                        :min="1"
-                      />
-                      <span>关内容</span>
+
+          <a-tabs>
+            <a-tab-pane key="1" tab="基本信息">
+            <div class="sametab">
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin">
+                  <div class="headone">
+                    <div class="box"></div>
+                    <div class="onetitle">关卡内容可见可学设置</div>
+                    <div class="oneedi" @click="showbtn" v-show="twobtn">
+                      编辑
+                    </div>
+                    <div v-show="twobtnn" class="twobtn">
+                      <div class="btnone" @click="closebtn">取消</div>
+                      <div class="btntwo" @click="closebtn">确定</div>
                     </div>
                   </div>
-                  <div class="checkcon" style="margin-top: 20px">
-                    <input
-                      type="checkbox"
-                      name="cb1"
-                      value="xuexi"
-                      class="in"
-                    />
-                    <span class="yulan">学习其他关卡</span><br />
-                    <div style="width: 10px; height: 4px"></div>
-                    <div style="display: flex; align-items: center">
-                      <span class="yulan2">学员可预览第</span>
-                      <span style="color: #4ea6ff" v-show="number">1</span>
-                      <a-input-number
-                        v-model:value="nubvalue2"
-                        v-show="inputbox"
-                        :controls="false"
-                        :autofocus="true"
-                        :min="1"
+                  <div class="onemain clearfix">
+                    <div class="checkcon">
+                      <input
+                        type="checkbox"
+                        name="cb1"
+                        value="yulan"
+                        class="in"
                       />
-                      <span>关-第</span
-                      ><span style="color: #4ea6ff" v-show="number">4</span>
-                      <a-input-number
-                        v-model:value="nubvalue3"
-                        v-show="inputbox"
-                        :controls="false"
-                        :autofocus="true"
-                        :min="1"
-                      />
-                      <span>关内容</span>
+                      <span class="yulan">预览其他关卡</span><br />
+                      <div style="width: 10px; height: 4px"></div>
+                      <div style="display: flex; align-items: center">
+                        <span class="yulan2">学员可预览第</span>
+                        <span style="color: #4ea6ff" v-show="number">1</span>
+                        <a-input-number
+                          v-model:value="nubvalue"
+                          v-show="inputbox"
+                          :controls="false"
+                          :autofocus="true"
+                          :min="1"
+                        />
+                        <span>关-第</span
+                        ><span style="color: #4ea6ff" v-show="number">4</span>
+                        <a-input-number
+                          v-model:value="nubvalue1"
+                          v-show="inputbox"
+                          :controls="false"
+                          :autofocus="true"
+                          :min="1"
+                        />
+                        <span>关内容</span>
+                      </div>
                     </div>
+                    <div class="checkcon" style="margin-top: 20px">
+                      <input
+                        type="checkbox"
+                        name="cb1"
+                        value="xuexi"
+                        class="in"
+                      />
+                      <span class="yulan">学习其他关卡</span><br />
+                      <div style="width: 10px; height: 4px"></div>
+                      <div style="display: flex; align-items: center">
+                        <span class="yulan2">学员可预览第</span>
+                        <span style="color: #4ea6ff" v-show="number">1</span>
+                        <a-input-number
+                          v-model:value="nubvalue2"
+                          v-show="inputbox"
+                          :controls="false"
+                          :autofocus="true"
+                          :min="1"
+                        />
+                        <span>关-第</span
+                        ><span style="color: #4ea6ff" v-show="number">4</span>
+                        <a-input-number
+                          v-model:value="nubvalue3"
+                          v-show="inputbox"
+                          :controls="false"
+                          :autofocus="true"
+                          :min="1"
+                        />
+                        <span>关内容</span>
+                      </div>
+                    </div>
+                    <br />
                   </div>
-                  <br />
                 </div>
               </div>
-            </div>
-            <div class="Gcon">
-              <div class="pad"></div>
-              <div class="Gin" style="margin-top: 0px">
-                <div class="headone">
-                  <div class="box"></div>
-                  <div class="onetitle">关卡晋级规则</div>
-                </div>
-                <div class="twomain clearfix">
-                  <a-switch
-                    size="small"
-                    v-model:checked="checked2"
-                    style="margin-top: -5px"
-                  />
-                  <span class="info">启用关卡自动规则加入</span>
-                  <div class="infor">
-                    若开启“新建/编辑关卡-添加学员”支持设定自动加入规则，将于每日8点同步数据
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin" style="margin-top: 0px">
+                  <div class="headone">
+                    <div class="box"></div>
+                    <div class="onetitle">关卡晋级规则</div>
                   </div>
-                  <div :class="[checked2 ? 'chooseshow' : 'choo']">
-                    <div class="fane">选择范围</div>
-                    <div class="select">
-                      <a-select
-                        v-model:value="projectName"
-                        style="
-                          width: 250px;
-                          border-radius: 8px;
-                          margin-top: 15px;
-                        "
-                        placeholder="请选择部门"
-                        :options="projectNameList"
-                        @change="selectProjectName3"
-                        allowClear
-                        showSearch
-                      ></a-select>
+                  <div class="twomain clearfix">
+                    <a-switch
+                      size="small"
+                      v-model:checked="checked2"
+                      style="margin-top: -5px"
+                    />
+                    <span class="info">启用关卡自动规则加入</span>
+                    <div class="infor">
+                      若开启“新建/编辑关卡-添加学员”支持设定自动加入规则，将于每日8点同步数据
                     </div>
-                    <div class="select">
-                      <a-select
-                        v-model:value="projectName2"
-                        style="
-                          width: 250px;
-                          border-radius: 8px;
-                          margin-top: 15px;
-                        "
-                        placeholder="请选择岗位"
-                        :options="projectNameList2"
-                        @change="selectProjectName2"
-                        allowClear
-                        showSearch
-                      ></a-select>
-                    </div>
-                  </div>
-                  <div class="btm">
-                    <div class="bmo">关卡学习方案展示设置</div>
-                    <div class="bmt">仅支持移动端</div>
-                    <div class="chosecon">
-                      <div class="chose">
-                        <input
-                          type="checkbox"
-                          name="cb1"
-                          value="lieb"
-                          class="inl"
-                        /><span class="sh">列表展示</span>
+                    <div :class="[checked2 ? 'chooseshow' : 'choo']">
+                      <div class="fane">选择范围</div>
+                      <div class="select">
+                        <a-select
+                          v-model:value="projectName"
+                          style="
+                            width: 250px;
+                            border-radius: 8px;
+                            margin-top: 15px;
+                          "
+                          placeholder="请选择部门"
+                          :options="projectNameList"
+                          @change="selectProjectName3"
+                          allowClear
+                          showSearch
+                        ></a-select>
                       </div>
-                      <div class="chose" style="margin-left: 20px">
-                        <input
-                          type="checkbox"
-                          name="cb1"
-                          value="lieb"
-                          class="inl"
-                        /><span class="sh">路径展示</span>
+                      <div class="select">
+                        <a-select
+                          v-model:value="projectName2"
+                          style="
+                            width: 250px;
+                            border-radius: 8px;
+                            margin-top: 15px;
+                          "
+                          placeholder="请选择岗位"
+                          :options="projectNameList2"
+                          @change="selectProjectName2"
+                          allowClear
+                          showSearch
+                        ></a-select>
+                      </div>
+                    </div>
+                    <div class="btm">
+                      <div class="bmo">关卡学习方案展示设置</div>
+                      <div class="bmt">仅支持移动端</div>
+                      <div class="chosecon">
+                        <div class="chose">
+                          <input
+                            type="checkbox"
+                            name="cb1"
+                            value="lieb"
+                            class="inl"
+                          /><span class="sh">列表展示</span>
+                        </div>
+                        <div class="chose" style="margin-left: 20px">
+                          <input
+                            type="checkbox"
+                            name="cb1"
+                            value="lieb"
+                            class="inl"
+                          /><span class="sh">路径展示</span>
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div></a-tab-pane
-        >
+          </a-tab-pane>
+
+          <a-tab-pane key="2" tab="共享文档">
+            <div class="sametab">
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin">
+                  <div class="headone">
+                    <div class="box"></div>
+                    <div class="onetitle">上传共享文档</div>
+                    <div class="oneedi">
+                      <a-switch v-model:checked="docChecked" ></a-switch>
+                    </div>
+                  </div>
+                  <div class="btnbox" style="margin:20px;">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
+                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
+                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
+                  width:34px;height:34px;
+                  " alt="">
+                </a-upload>
+                <div class="btnbox" style="margin:20px;">
+                <span style="color: #999999">
+                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                </span>
+              </div>
+              <div v-for="item in docList" :key="item.src" class="docListStyle">
+                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
+                  width:40px;height:40px;margin-right:40px;
+                  " alt="">
+                <span style="font: oblique bold  16px Sans-serif">{{item.name}}</span> 
+                <span style="color: #4ea6ff;float:right;">删除</span>
+              </div>
+              </div>
+                </div>
+              </div>
+            </div>
+          </a-tab-pane>
+
+          </a-tabs>
+          </a-tab-pane>
       </a-tabs>
       <a-modal
         style="padding: 0"
@@ -883,10 +936,15 @@
       <!-- 作业管理抽屉 -->
       <work-manage v-model:Wvisible="Wvisible" />
     </div>
+    <!--  加载动画 -->
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="添加中..." />
+    </div>
   </div>
 </template>
 <script>
-import { ref, reactive, toRefs } from "vue";
+import { ref, reactive, toRefs,onMounted } from "vue";
+import { message } from "ant-design-vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import CheckStu from "../../components/drawers/CheckStu";
@@ -901,6 +959,9 @@ import WorkManage from "../../components/drawers/WorkManage";
 import * as api from "../../api/index1";
 import { storage } from "../../api/storage";
 
+import { getRouterOverview } from "@/api/indexLearningPath";
+import { GetRouterDetail } from "@/api/indexTask";
+
 export default {
   name: "LevelAdd",
   components: {
@@ -926,11 +987,27 @@ export default {
       AddSvisible: false, //添加学员抽屉
       AddImpStuvisible: false, //导入学员抽屉
       CheckStuvisible: false, //学员管理的查看抽屉
+      addLoading:false, // 加载动画
+      choosedStageId:1, // 选择的阶段id
       twobtn: true,
       number: true,
       twobtnn: false,
       inputbox: false,
       Wvisible: false, //作业管理
+      docList:[
+        {
+          name:'测试文档1.doc',
+          src:"",
+        },
+        {
+          name:'测试文档2.doc',
+          src:"",
+        },
+        {
+          name:'测试文档3.doc',
+          src:"",
+        }
+      ], // 共享文档列表
       huodModal: false,
       zhibModal: false,
       projectNameListt: [
@@ -1009,8 +1086,8 @@ export default {
       //任务大纲列表
       taskSyllabus: [
         {
-          text: "关卡1  初级产品经理",
-          children: [
+          name: "关卡1  初级产品经理",
+          taskList: [
             {
               course: "在线",
               name: "时间管理",
@@ -1068,8 +1145,8 @@ export default {
           ],
         },
         {
-          text: "关卡2  中级产品经理",
-          children: [
+          name: "关卡2  中级产品经理",
+          taskList: [
             {
               course: "讨论",
               name: "时间管理",
@@ -1115,7 +1192,9 @@ export default {
       nubvalue2: ref("1"),
       nubvalue3: ref("4"),
       nubvalue1: ref("4"),
+      fileList:ref([]),
       checked2: false,
+      docChecked:true,
       currentPage: 1,
       tableDataTotal: 100,
       pageSize: 10,
@@ -1238,6 +1317,36 @@ export default {
         },
       ],
     });
+
+    const levelList = reactive({
+      routerInfoOverview:{ // 路径图整体数据概览
+        totalStudentCnt:0,
+        studyStudentCnt:0,
+        completeStudentCnt:0,
+        onlineCourseCnt:0,
+        offLineCourseCnt:0,
+        completeRatio:0,
+      },
+      chapterOverviewList:{ // 路径图阶段数据概览
+        completeCourseRatio:0,
+        completeExamRatio:0,
+        completeRatio:0,
+        totalTaskCnt:0,
+        totalReqCnt:0,
+        totalOptCnt:0,
+      },
+      stageList: [ // 阶段列表
+        {
+          stageId:1,
+          stage:"阶段一"
+        },
+        {
+          stageId:2,
+          stage:"阶段二"
+        }
+      ]
+    })
+
     // console.log("store", state.routerId);
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -1451,6 +1560,9 @@ export default {
 
     const changeTabs = (e) => {
       console.log("切换tabs", e, state.routerId);
+      if(e == 2) {
+        myGetRouterDetail()
+      }
       //学员管理
       if (e == 3) {
         getStudent();
@@ -1474,9 +1586,87 @@ export default {
         });
     };
 
+    
+  const checkType = (type) => {
+    let typeRules = [
+        "",
+        "在线",
+        "面授",
+        "案例",
+        "作业",
+        "考试",
+        "直播",
+        "外链",
+        "讨论",
+        "活动",
+        "测评",
+        "评估",
+        "投票",
+      ];
+      return typeRules[type];
+  }
+
     //学员管理------------------------------------------------
+
+    onMounted(() => {
+      state.addLoading = true;
+      getOverview()
+    })
+
+    // 获取项目概览
+    const getOverview = () =>{
+      getRouterOverview(state.routerId).then((res) => {
+        Object.keys(res.data.data.routerInfoOverview).forEach(item => {
+          levelList.routerInfoOverview[item] = res.data.data.routerInfoOverview[item] || 0
+        })
+        Object.keys(res.data.data.chapterOverviewList).forEach(item => {
+          levelList.chapterOverviewList[item] = res.data.data.chapterOverviewList[item] || 0
+        })
+        // res.data.data.routerInfoOverview.forEach((r) => {
+        //   console.log(r)
+        // })
+        state.addLoading = false;
+        console.log("项目概览--"+res)
+      }).catch(err => {
+        state.addLoading = false;
+        message.error("概览获取失败")
+        console.log("获取失败"+err)
+      })
+    }
+    // 获取路径列表
+    const myGetRouterDetail = () => {
+      GetRouterDetail(state.routerId).then(res => {
+        let data = res.data.data.chapterList
+        // state.taskSyllabus = data
+        for(let i in data) {
+          state.taskSyllabus[i].name = data[i].name
+          for(let j in data[i].taskList) {
+            Object.keys(data[i].taskList[j]).forEach(item => {
+            state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0
+        })
+          }
+        }
+      }).catch(err => {
+        message.error('获取路径列表失败'+err);
+      })
+
+    }
+
+    const handleChange = (info) => {
+      if (info.file.status !== "uploading") {
+        console.log(info.file, info.fileList);
+      }
+
+      if (info.file.status === "done") {
+        message.success(`${info.file.name} 文件上传成功`);
+      } else if (info.file.status === "error") {
+        message.error(`${info.file.name} 文件上传失败.`);
+      }
+    };
+
     return {
       ...toRefs(state),
+      ...toRefs(levelList),
       selectProjectName,
       selectProjectName2,
       selectProjectName3,
@@ -1505,6 +1695,8 @@ export default {
       closehuodModal,
       closezhibModal,
       changeTabs,
+      checkType,
+      handleChange
     };
   },
 };
@@ -1590,6 +1782,11 @@ export default {
                 color: #666666;
               }
             }
+            .docListStyle {
+              display: flex;
+              width: 300px !important;
+              justify-content: space-around;
+            }
             .del_btnbox {
               display: flex;
               margin: 30px auto;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index eeb9619d..c9510c07 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1326,7 +1326,16 @@ export default {
             // console.log("22222", res.data.data.stageList);
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
-              //获取任务列表
+              //后加选择了阶段id
+              // if(state.chooseStageId!==null){
+              //   let final = res.data.data.stageList.find((item)=>item.id==state.chooseStageId)
+              //   getTableData(final)
+              // }else{
+              //   //获取任务列表
+              // let arr = res.data.data.stageList[0].taskList;
+              // console.log("任务列表", arr);
+              // getTableData(arr);
+              // }
               let arr = res.data.data.stageList[0].taskList;
               console.log("任务列表", arr);
               getTableData(arr);
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 4ca4884a..f813abf3 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -408,9 +408,9 @@
                             ? showTime(item.course, item.name)
                             : item.type == '5' || item.type == '10'
                             ? showTest(item.course, item.name)
-                            : item.type == '面授'
+                            : item.type == '2'
                             ? showFace(item.course)
-                            : item.type == '作业'
+                            : item.type == '4'
                             ? showWork(item.course)
                             : null
                         "
@@ -597,11 +597,11 @@
                     />
                   </div>
                   <div class="groupright">
-                    <div class="btn1">
+                    <div class="btn1" @click="searchGroup">
                       <img src="../../assets/images/courseManage/search0.png" />
                       <span class="btn1text">搜索</span>
                     </div>
-                    <div class="btn2">
+                    <div class="btn2" @click="resetGroupName">
                       <img src="../../assets/images/courseManage/reset1.png" />
                       <span class="btn2text">重置</span>
                     </div>
@@ -617,11 +617,16 @@
                     <span class="btn2text">随机分组</span>
                   </div>
                 </div>
+                <!-- 小组列表 -->
                 <div class="groupmain">
-                  <div class="groupbox">
+                  <div
+                    class="groupbox"
+                    v-for="item in groupList"
+                    :key="item.projectGroupId"
+                  >
                     <div style="width: 90%">
                       <div class="grouptitle">
-                        <div class="goodgruop">好好学习小组</div>
+                        <div class="goodgruop">{{ item.groupName }}</div>
                         <div class="more">
                           <span
                             style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
@@ -629,155 +634,19 @@
                           >
                           <div class="moreItems">
                             <div class="sammo">编辑</div>
-                            <div class="sammo">删除</div>
+                            <div
+                              class="sammo"
+                              @click="deleteGroupBtn(item.projectGroupId)"
+                            >
+                              删除
+                            </div>
                           </div>
                         </div>
                       </div>
-                      <div class="leader">组长：小李</div>
+                      <div class="leader">组长：{{ item.leaderName }}</div>
                       <div class="grocenter">
                         <div class="leader1">进度</div>
-                        <a-progress :percent="55" />
-                      </div>
-                      <div class="grofooter" @click="showMemberList">
-                        <div class="ftext">组员名单 ></div>
-                        <div class="peoples">
-                          <div class="people1">
-                            <img
-                              src="../../assets/images/taskpage/people1.png"
-                            />
-                          </div>
-                          <div class="people2">
-                            <img
-                              src="../../assets/images/taskpage/people2.png"
-                            />
-                          </div>
-                          <div class="people3">
-                            <img
-                              src="../../assets/images/taskpage/people3.png"
-                            />
-                          </div>
-                          <div class="people4">
-                            <img
-                              src="../../assets/images/taskpage/people4.png"
-                            />
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="groupbox">
-                    <div style="width: 90%">
-                      <div class="grouptitle">
-                        <div class="goodgruop">全能小组</div>
-                        <div class="more">
-                          <span
-                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
-                            >. . .</span
-                          >
-                          <div class="moreItems">
-                            <div class="sammo">编辑</div>
-                            <div class="sammo">删除</div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="leader">组长：小李</div>
-                      <div class="grocenter">
-                        <div class="leader1">进度</div>
-                        <a-progress :percent="55" />
-                      </div>
-                      <div class="grofooter" @click="showMemberList">
-                        <div class="ftext">组员名单 ></div>
-                        <div class="peoples">
-                          <div class="people1">
-                            <img
-                              src="../../assets/images/taskpage/people1.png"
-                            />
-                          </div>
-                          <div class="people2">
-                            <img
-                              src="../../assets/images/taskpage/people2.png"
-                            />
-                          </div>
-                          <div class="people3">
-                            <img
-                              src="../../assets/images/taskpage/people3.png"
-                            />
-                          </div>
-                          <div class="people4">
-                            <img
-                              src="../../assets/images/taskpage/people4.png"
-                            />
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="groupbox">
-                    <div style="width: 90%">
-                      <div class="grouptitle">
-                        <div class="goodgruop">宇宙第一最强小组</div>
-                        <div class="more">
-                          <span
-                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
-                            >. . .</span
-                          >
-                          <div class="moreItems">
-                            <div class="sammo">编辑</div>
-                            <div class="sammo">删除</div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="leader">组长：小李</div>
-                      <div class="grocenter">
-                        <div class="leader1">进度</div>
-                        <a-progress :percent="55" />
-                      </div>
-                      <div class="grofooter" @click="showMemberList">
-                        <div class="ftext">组员名单 ></div>
-                        <div class="peoples">
-                          <div class="people1">
-                            <img
-                              src="../../assets/images/taskpage/people1.png"
-                            />
-                          </div>
-                          <div class="people2">
-                            <img
-                              src="../../assets/images/taskpage/people2.png"
-                            />
-                          </div>
-                          <div class="people3">
-                            <img
-                              src="../../assets/images/taskpage/people3.png"
-                            />
-                          </div>
-                          <div class="people4">
-                            <img
-                              src="../../assets/images/taskpage/people4.png"
-                            />
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="groupbox">
-                    <div style="width: 90%">
-                      <div class="grouptitle">
-                        <div class="goodgruop">天天向上小组</div>
-                        <div class="more">
-                          <span
-                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
-                            >. . .</span
-                          >
-                          <div class="moreItems">
-                            <div class="sammo">编辑</div>
-                            <div class="sammo">删除</div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="leader">组长：小李</div>
-                      <div class="grocenter">
-                        <div class="leader1">进度</div>
-                        <a-progress :percent="55" />
+                        <a-progress :percent="item.completeRatio" />
                       </div>
                       <div class="grofooter" @click="showMemberList">
                         <div class="ftext">组员名单 ></div>
@@ -954,52 +823,56 @@
              -->
             <div class="line"></div>
             <div class="set_body">
-              <div class="edit" @click="edit_hShow">
+              <div class="edit" @click="showEditProj">
                 <div class="img"></div>
                 <div class="ed">编辑</div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>项目名称：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">管理者进阶 - 管理者腾飞班</span>
+                  <span style="color: #999999">{{ name }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>封面图：</span></div>
                 <div class="setc_main">
-                  <img src="@/assets/images/projectadd/picture.png" alt="" />
+                  <img
+                    style="width: 151px; height: 84px"
+                    :src="picUrl"
+                    alt=""
+                  />
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>项目时间：</span></div>
                 <div class="setc_main">
                   <span style="color: #999999"
-                    >2022-7-16 12:30 ～ 2022-7-30 12:30</span
+                    >{{ startTime }} ～ {{ endTime }}</span
                   >
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>项目经理：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">张雪</span>
+                  <span style="color: #999999">{{ manager }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>资源归属：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <span style="color: #999999">{{ sourceBelong }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>项目说明：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <span style="color: #999999">{{ remark }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>同步学习记录：</span></div>
-                <div class="setc_main" @click="changecheck2">
-                  <a-radio v-model:checked="checkedd"
+                <div class="setc_main">
+                  <a-radio v-model:checked="checkedSty"
                     ><span style="color: #333333"
                       >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                     ></a-radio
@@ -1009,19 +882,19 @@
               <div class="set_content">
                 <div class="setc_name"><span>项目级别：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <span style="color: #999999">{{ level }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>培训体系：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <span style="color: #999999">{{ systemId }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>是否BOEU实施：</span></div>
-                <div class="setc_main" @click="changecheck3">
-                  <a-radio v-model:checked="checkedd2"
+                <div class="setc_main">
+                  <a-radio v-model:checked="checkedBOEU"
                     ><span style="color: #333333">BOEU实施</span></a-radio
                   >
                 </div>
@@ -1032,9 +905,16 @@
       </a-tabs>
     </div>
     <!-- 时间管理抽屉 -->
-    <time-manage v-model:Tvisible="visible" :title="showTimeText" />
+    <time-manage
+      v-model:Tvisible="visible"
+      :title="showTimeText"
+      v-model:ProjectTaskId="projectTaskId"
+    />
     <!-- 面授管理抽屉 -->
-    <face-manage v-model:Fvisible="FaceVisivle" />
+    <face-manage
+      v-model:Fvisible="FaceVisivle"
+      v-model:ProjectTaskId="projectTaskId"
+    />
     <!-- 学员（小组管理）创建小组抽屉 -->
     <subset-manage v-model:Svisible="subsetVisivle" />
     <!-- 学员管理-添加学员抽屉 -->
@@ -1052,9 +932,16 @@
     <!-- 活动考勤抽屉 -->
     <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
     <!-- 作业管理抽屉 -->
-    <work-manage v-model:Wvisible="Wvisible" />
+    <work-manage
+      v-model:Wvisible="Wvisible"
+      v-model:ProjectTaskId="projectTaskId"
+    />
     <!-- 考试管理抽屉 -->
-    <test-manage v-model:TMvisible="TMvisible" :title="showTestText" />
+    <test-manage
+      v-model:TMvisible="TMvisible"
+      :title="showTestText"
+      v-model:ProjectTaskId="projectTaskId"
+    />
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
 
@@ -1202,7 +1089,7 @@
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-            <a-button class="pubtn2" @click="closeModal2">确定</a-button>
+            <a-button class="pubtn2" @click="createG">确定</a-button>
           </div>
         </div>
       </a-modal>
@@ -1305,232 +1192,7 @@
       </a-modal>
     </div>
     <!-- 删除学员弹窗 -->
-    <!-- 编辑弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="edit_hs"
-        :title="null"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="set_edit"
-        width="679px"
-        @cancel="edit_exit"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <div class="headerLeft" style="margin-left: 32px">
-            <span style="width: 15px; height: 15px"
-              ><img src="../../assets/images/taskpage/edit.png"
-            /></span>
-            <span
-              class="headerLeftText"
-              style="font-size: 16px; margin-left: 10px"
-              >编辑</span
-            >
-          </div>
-          <div style="cursor: pointer; margin-right: 32px" @click="edit_exit">
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div class="projectname">基本信息</div>
-          <div class="setbody">
-            <div class="main_item">
-              <div class="signbox">
-                <div class="sign">
-                  <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                </div>
-                <span style="margin-right: 3px">项目名称：</span>
-              </div>
-              <div class="btnbox">
-                <a-input
-                  v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
-                  placeholder="请输入项目名称"
-                  maxlength="20"
-                />
-              </div>
-            </div>
-            <div class="main_item2">
-              <div class="signbox">
-                <span style="margin-right: 3px">直播封面：</span>
-              </div>
-              <div class="lodalimg">
-                <div class="lodalcenter">
-                  <span style="color: #448ef7; margin-right: 10px">+</span>
-                  <span style="color: #448ef7">添加图片</span>
-                </div>
-              </div>
-            </div>
-            <div class="main_item">
-              <div class="signbox">
-                <div class="sign">
-                  <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                </div>
-                <span style="margin-right: 3px">项目时间：</span>
-              </div>
-              <div class="btnbox">
-                <a-range-picker
-                  style="width: 424px"
-                  :placeholder="['      开始时间', '        结束时间']"
-                />
-              </div>
-            </div>
-            <div class="main_item">
-              <div class="signbox">
-                <div class="sign">
-                  <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                </div>
-                <span style="margin-right: 3px">项目经理：</span>
-              </div>
-              <div class="btnbox">
-                <a-select
-                  dropdownClassName="dropdown-style"
-                  style="width: 424px"
-                  placeholder="请选择项目经理"
-                  :options="options1"
-                  allowClear
-                  showSearch
-                />
-              </div>
-            </div>
-            <div class="main_item">
-              <div class="signbox">
-                <div class="sign">
-                  <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                </div>
-                <span style="margin-right: 3px">资源归属：</span>
-              </div>
-              <div class="btnbox">
-                <a-input
-                  v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
-                  placeholder="自动带出 可修改"
-                  maxlength="20"
-                />
-              </div>
-            </div>
-            <div class="main_item2">
-              <div class="signbox">
-                <span style="margin-right: 3px">项目说明：</span>
-              </div>
-              <div class="textarea">
-                <a-textarea
-                  v-model:value="textV1"
-                  placeholder="请输入说明"
-                  allow-clear
-                  maxlength="150"
-                />
-              </div>
-            </div>
-            <div class="main_item">
-              <div class="signbox">
-                <span style="margin-right: 3px">同步学习记录：</span>
-              </div>
-              <div class="btnbox">
-                <a-radio-group v-model:value="radioV1">
-                  <a-radio
-                    v-model:checked="checked"
-                    :value="1"
-                    @click="cloradio1"
-                    >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自由免修改课程）
-                  </a-radio>
-                </a-radio-group>
-              </div>
-            </div>
-            <div class="main_item">
-              <div class="signbox">
-                <div class="sign">
-                  <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                </div>
-                <span style="margin-right: 3px">项目级别：</span>
-              </div>
-              <div class="btnbox">
-                <a-input
-                  v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
-                  placeholder="集团级/组织级/现地级/部门级"
-                  maxlength="20"
-                />
-              </div>
-            </div>
-            <div class="main_item">
-              <div class="signbox">
-                <div class="sign">
-                  <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                </div>
-                <span style="margin-right: 3px">培训体系：</span>
-              </div>
-              <div class="btnbox">
-                <a-input
-                  v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
-                  placeholder="集团级/组织级/现地级/部门级"
-                  maxlength="20"
-                />
-              </div>
-            </div>
-            <div class="main_item">
-              <div class="signbox">
-                <div class="sign">
-                  <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                </div>
-                <span style="margin-right: 3px">是否BOEU实施：</span>
-              </div>
-              <div class="btnbox">
-                <a-radio-group v-model:value="radioV2">
-                  <a-radio
-                    v-model:checked="checked"
-                    :value="1"
-                    @click="cloradio2"
-                    >BOEU实施</a-radio
-                  >
-                </a-radio-group>
-              </div>
-            </div>
-          </div>
 
-          <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal">取消</a-button>
-            <a-button class="pubtn2" @click="closeModal">发布</a-button>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 编辑弹窗 -->
     <!-- 删除弹窗 -->
     <div>
       <a-modal
@@ -1680,6 +1342,8 @@
         </div>
       </a-modal>
     </div>
+    <!-- 编辑项目弹窗 -->
+    <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
   </div>
 </template>
 <script>
@@ -1703,9 +1367,18 @@ 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 {
+  getProjStu,
+  deleteStu,
+  getGroupList,
+  deleteGroup,
+  editGroup,
+} from "../../api/indexProjStu";
 import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
+import { getTask } from "../../api/indexTaskadd";
+import { toDate } from "../../api/method";
+import projSet from "../../components/Modals/projSet";
 export default {
   name: "taskPage",
   components: {
@@ -1725,6 +1398,7 @@ export default {
     NoticePub,
     ProjectScore,
     TaskImpStu,
+    projSet,
   },
   setup() {
     const state = reactive({
@@ -1757,46 +1431,48 @@ export default {
       ],
       //学员信息列表
       tabledata: [
-        {
-          key: 1,
-          name: "sss",
-          bum: "c",
-          gangw: "ss",
-          group: "sss",
-          progress: "sss",
-          diploma: "0",
-          stutime: "20202",
-          putin: "shs",
-          excellent: true,
-          studentId: 22,
-        },
-        {
-          key: 2,
-          name: "sss",
-          bum: "c",
-          gangw: "ss",
-          group: "sss",
-          progress: "sss",
-          diploma: "0",
-          stutime: "20202",
-          putin: "shs",
-          excellent: true,
-          studentId: 23,
-        },
-        {
-          key: 3,
-          name: "sss",
-          bum: "c",
-          gangw: "ss",
-          group: "sss",
-          progress: "sss",
-          diploma: "0",
-          stutime: "20202",
-          putin: "shs",
-          excellent: false,
-          studentId: 24,
-        },
+        // {
+        //   key: 1,
+        //   name: "sss",
+        //   bum: "c",
+        //   gangw: "ss",
+        //   group: "sss",
+        //   progress: "sss",
+        //   diploma: "0",
+        //   stutime: "20202",
+        //   putin: "shs",
+        //   excellent: true,
+        //   studentId: 22,
+        // },
+        // {
+        //   key: 2,
+        //   name: "sss",
+        //   bum: "c",
+        //   gangw: "ss",
+        //   group: "sss",
+        //   progress: "sss",
+        //   diploma: "0",
+        //   stutime: "20202",
+        //   putin: "shs",
+        //   excellent: true,
+        //   studentId: 23,
+        // },
+        // {
+        //   key: 3,
+        //   name: "sss",
+        //   bum: "c",
+        //   gangw: "ss",
+        //   group: "sss",
+        //   progress: "sss",
+        //   diploma: "0",
+        //   stutime: "20202",
+        //   putin: "shs",
+        //   excellent: false,
+        //   studentId: 24,
+        // },
       ],
+      //小组信息列表
+      groupList: [],
       // stuName: "", //搜索的学员姓名
       // stuGroup: "", //搜索的学员小组名称
       // stuBum: "", //搜索的学员小组部门
@@ -1806,6 +1482,7 @@ export default {
       selectedRowKeys: [], //选择的学员
       selectedRows: [], //选择的学员的id值
       chooseDeleteOne: [], //删除的单个学员id
+      projectTaskId: "", //项目任务id
       //进度排行学员
       rankjindu: [{ value: "学员", label: "学员" }],
       valuestu1: "学员",
@@ -1830,7 +1507,7 @@ export default {
       Importvisible: false, //导入学员
       Seevisible: false, //查看学员
       Changevisible: false, //学员换组
-      edit_hs: false, //编辑弹窗
+      editHs: false, //编辑弹窗
       delete_hs: false, //删除弹窗
       copyModal: false, //面授二维码弹窗
       closeCopy: false, //面授二维码关闭图标
@@ -1846,8 +1523,8 @@ export default {
       checked: false,
       checked1: true,
       checked2: false,
-      checkedd: false, //设置按钮1
-      checkedd2: false, //设置按钮2
+      checkedSty: false, //同步学习记录
+      checkedBOEU: false, //是否BOEU实施
       radioV1: "",
       radioV2: "",
       activeKey: "5", //1:概览 2.任务...
@@ -1867,7 +1544,7 @@ export default {
       noticeChecked: true,
       noticeContent: "",
       TaskFaceImpStuvisible: false, //批量面授报名
-
+      valuestugn: "", //小组管理的输入的小组名称
       //进度排行表
       jindutabledata: [
         {
@@ -2324,6 +2001,17 @@ export default {
       rankStartTime: null,
       rankEndTime: null,
       valueName: "", //排行榜输入姓名
+
+      //设置
+      name: null, //项目名称
+      startTime: null, //开始时间
+      endTime: null, //结束时间
+      manager: null, //项目经理
+      sourceBelong: null, //资源归属
+      remark: null, //项目说明
+      level: null, //项目级别
+      systemId: null, //培训体系
+      picUrl: null,
     });
 
     // 输入接入 -- start --
@@ -2344,12 +2032,19 @@ export default {
           if (res.status == 200) {
             console.log("res", res);
             console.log("阶段列表", res.data.data.stageList);
+            console.log(
+              "任务id",
+              res.data.data.stageList[0].taskList[0].projectTaskId
+            );
+            //taskList[num] num应该是点那个就是那个数
+            state.projectTaskId =
+              res.data.data.stageList[0].taskList[0].projectTaskId;
             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");
+              // console.log(res.data.data.stageList[0].taskList[0].type, "ggg");
             }
           }
         })
@@ -2463,6 +2158,16 @@ export default {
     const closeModal2 = () => {
       state.stugroup = false;
     };
+    //点击确定创建小组
+    const createG = () => {
+      if (state.valueaddm == "" || state.valueaddg == "") {
+        message.destroy();
+        return message.warning("请输入必填项");
+      } else {
+        createGroup();
+        state.stugroup = false;
+      }
+    };
     const showCopyModal = () => {
       state.copyModal = true;
     };
@@ -2524,12 +2229,7 @@ export default {
     const showChangeGroup = () => {
       state.Changevisible = true;
     };
-    const changecheck2 = () => {
-      state.checkedd = !state.checkedd;
-    };
-    const changecheck3 = () => {
-      state.checkedd2 = !state.checkedd2;
-    };
+
     const edit_hShow = () => {
       state.edit_hs = true;
     };
@@ -2560,10 +2260,14 @@ export default {
     const closehuodModal = () => {
       state.huodModal = false;
     };
+    const showEditProj = () => {
+      state.editHs = true;
+    };
 
     //学员管理列表操作
     const studentData = () => {
       let arr = state.tabledata;
+      console.log(arr, "学员管理");
       arr.map((value) => {
         value.operation = (
           <div
@@ -2626,16 +2330,15 @@ export default {
         );
       });
       state.tabledata = arr;
-      // console.log("state.tabledata", state.tabledata);
     };
-    studentData();
+    // studentData();
     const studentColumns = () => {
       const tablecolumns = [
         {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
           // scopedSlots: { customRender: "action" }, //引入的插槽
@@ -2672,7 +2375,7 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 50,
+          // width: 50,
           align: "center",
           className: "h",
         },
@@ -2680,7 +2383,7 @@ export default {
           title: "岗位",
           dataIndex: "gangw",
           key: "gangw",
-          width: 50,
+          // width: 50,
           align: "center",
           className: "h",
         },
@@ -2688,7 +2391,7 @@ export default {
           title: "所属小组",
           dataIndex: "group",
           key: "group",
-          width: 50,
+          // width: 50,
           align: "center",
           className: "h",
         },
@@ -2696,7 +2399,7 @@ export default {
           title: "进度",
           dataIndex: "progress",
           key: "progress",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -2704,7 +2407,7 @@ export default {
           title: "证书",
           dataIndex: "diploma",
           key: "diploma",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -2712,7 +2415,7 @@ export default {
           title: "最近学习时间",
           dataIndex: "stutime",
           key: "stutime",
-          width: 50,
+          // width: 50,
           align: "center",
           className: "h",
           // sorter: {
@@ -2724,7 +2427,7 @@ export default {
           title: "加入方式",
           dataIndex: "putin",
           key: "putin",
-          width: 40,
+          // width: 40,
           align: "center",
           className: "h",
         },
@@ -2732,7 +2435,7 @@ export default {
           title: "操作",
           dataIndex: "operation",
           key: "operation",
-          width: 60,
+          // width: 60,
           align: "center",
           className: "h",
         },
@@ -2827,6 +2530,7 @@ export default {
         .then((res) => {
           console.log(res, "单个删除成功");
           message.success("删除成功");
+          getStu();
         })
         .catch((err) => {
           console.log(err, "单个删除失败");
@@ -2856,10 +2560,11 @@ export default {
         .then((res) => {
           console.log(res, "删除成功");
           message.success("删除成功");
+          getStu();
         })
         .catch((err) => {
           console.log(err, "删除失败");
-          message.warning("删除成功");
+          message.warning("删除失败");
         });
       state.allDelete = false;
     };
@@ -2875,21 +2580,19 @@ export default {
       let array = [];
       data.map((value) => {
         let obj = {
+          key: value.studentId,
           projectId: value.projectId, //项目id
           groupId: value.groupId, //小组id
           group: value.groupName, //小组名
           studentId: value.studentId, //学生id
           currentStageId: value.currentStageId, //当前关卡id
-          name: value.userInfoBo.userName, //用户名
+          name: value.name, //用户名
           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,
+          completeStageCnt: value.completeStageCnt, //当前完成阶段数
+          totalStageCnt: value.totalStageCnt, //总阶段数
+          excellent: value.topFlag == 1 ? true : false, //是否优秀学员
+          progress: value.completeStageCnt + "/" + value.totalStageCnt,
           putin:
             value.source == 0
               ? "报名加入"
@@ -2906,14 +2609,34 @@ export default {
       });
       state.tabledata = array;
     };
+    //把小组列表信息放到state里
+    const setGroupList = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          projectId: value.projectId, //项目id
+          projectGroupId: value.projectGroupId, //小组id
+          groupName: value.groupName, //小组名称
+          leaderId: value.leaderId, //组长id
+          leaderName: value.leaderName, //组长名称
+          source: value.source == 1 ? "指定添加" : "随机分组",
+          completeTaskCnt: value.completeTaskCnt, //完成任务数
+          totalTaskCnt: value.totalTaskCnt, //累计任务数
+          completeRatio: value.completeRatio, //完成比例
+        };
+        array.push(obj);
+      });
+      state.groupList = array;
+    };
     //学员搜索
     const searchStu = () => {
       let obj = {
         deptIds: [], //部门
         groupName: state.valuestugroup,
         name: state.valuestun,
-        pageNo: 0,
-        pageSize: 0,
+        pageNo: 1,
+        pageSize: 10,
         projectId: state.projectId,
         topFlag:
           state.valuegood == "优秀学员"
@@ -2922,15 +2645,17 @@ export default {
             ? 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);
-        }
-      });
+      //重新获取列表
+      getStu(obj);
+      // 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) => {
@@ -2953,7 +2678,7 @@ export default {
       // console.log(state.selectedRows[0]);
       // console.log("dddd",selectedRows.)
       //判断是否为数组
-      console.log("wwwwww", Object.prototype.toString.call(state.selectedRows));
+      // console.log("wwwwww", Object.prototype.toString.call(state.selectedRows));
     };
     //清空所选的学员
     const clearChooseStu = () => {
@@ -2966,32 +2691,150 @@ export default {
         (state.valuestugroup = null),
         (state.valuestub = null),
         (state.valuegood = null);
+      getStu();
     };
     //获取学员列表
-    const getStu = () => {
-      let obj = {
+    const getStu = (obj) => {
+      let objf = obj || {
         deptIds: [], //部门
         groupName: "",
         name: "",
         pageNo: 1,
-        pageSize: 1,
+        pageSize: 10,
         projectId: state.projectId,
         topFlag: 0,
       };
-      getProjStu(obj).then((res) => {
-        console.log(res.data.data.rows, "获取学员列表");
-        let leng = res.data.data.rows;
+      getProjStu(objf).then((res) => {
+        console.log(res.data.data, "获取学员列表");
+        let leng = res.data.data.rows.length;
         state.total = res.data.data.total;
         if (leng > 0) {
           let arr = res.data.data.rows;
           getTableDataList(arr);
+          studentData();
         }
       });
     };
+    //获取项目信息
+    const getTaskInfo = () => {
+      getTask({
+        projectId: state.projectId,
+      }).then((res) => {
+        console.log("get task", res.data.data);
+        let info = res.data.data.projectInfo;
+        let start = toDate(info.beginTime / 1000, "Y-M-D");
+        let end = toDate(info.endTime / 1000, "Y-M-D");
+
+        state.name = info.name;
+        state.startTime = start;
+        state.endTime = end;
+        state.manager = info.manager;
+        state.remark = info.remark;
+        state.level =
+          info.level == 1
+            ? "集团级"
+            : info.level == 2
+            ? "组织级"
+            : info.level == 3
+            ? "现地级"
+            : info.level == 4
+            ? "部门级"
+            : "-";
+        state.systemId =
+          info.systemId == 1
+            ? "集团级"
+            : info.systemId == 2
+            ? "组织级"
+            : info.systemId == 3
+            ? "现地级"
+            : info.systemId == 4
+            ? "部门级"
+            : "-";
+        state.checkedSty = info.courseSyncFlag == 1 ? true : false;
+        state.checkedBOEU = info.boeFlag == 1 ? true : false;
+        state.picUrl = info.picUrl;
+        state.sourceBelong =
+          info.sourceBelongId == 1
+            ? "项目一"
+            : info.sourceBelongId == 2
+            ? "项目二"
+            : info.sourceBelongId == 3
+            ? "项目三"
+            : "-";
+      });
+    };
+    //获取小组列表
+    const getGroup = (obj) => {
+      let objf = obj || {
+        name: "",
+        pageNo: 1,
+        pageSize: 10,
+        projectId: state.projectId,
+      };
+      getGroupList(objf)
+        .then((res) => {
+          console.log(res.data.data.rows, "获取小组列表成功");
+          let leng = res.data.data.rows.length;
+          if (leng > 0) {
+            let arr = res.data.data.rows;
+            setGroupList(arr);
+          }
+        })
+        .catch((err) => {
+          console.log(err, "获取列表失败");
+        });
+    };
+    //删除小组
+    const deleteGroupBtn = (projectGroupId) => {
+      deleteGroup({
+        projectGroupId: projectGroupId,
+      }).then((res) => {
+        console.log("删除小组成功", res);
+        message.success("删除小组成功");
+        getGroup();
+      });
+    };
+    //创建小组
+    const createGroup = () => {
+      let obj = {
+        groupName: state.valueaddg,
+        leaderId: 0,
+        leaderName: state.valueaddm,
+        projectGroupId: 0,
+        projectId: state.projectId,
+      };
+      editGroup(obj)
+        .then((res) => {
+          console.log("小组创建成功", res);
+          message.success("小组创建成功");
+          getGroup();
+        })
+        .catch((err) => {
+          console.log("小组创建失败", err);
+          message.warning("小组创建失败");
+        });
+    };
+    //搜索小组重置
+    const resetGroupName = () => {
+      state.valuestugn = null;
+      getGroup();
+    };
+    //小组搜索
+    const searchGroup = () => {
+      let obj = {
+        name: state.valuestugn,
+        pageNo: 1,
+        pageSize: 10,
+        projectId: state.projectId,
+      };
+      getGroup(obj);
+    };
     //end---------学员------
     onMounted(() => {
       getStu();
       getTaskList();
+      getTaskInfo();
+      getGroup();
     });
     return {
       ...toRefs(state),
@@ -3017,8 +2860,6 @@ export default {
       showAA,
       showWork,
       showTest,
-      changecheck2,
-      changecheck3,
       showStuAdd,
       showImportStu,
       showSeeStu,
@@ -3055,6 +2896,16 @@ export default {
       closeCancelDelete,
       clearChooseStu,
       closeDeleteOneConfirm,
+      showEditProj,
+      getTaskInfo,
+      getGroup,
+      getGroupList,
+      setGroupList,
+      deleteGroupBtn,
+      createGroup,
+      createG,
+      resetGroupName,
+      searchGroup,
     };
   },
 };
@@ -5218,206 +5069,6 @@ export default {
   }
 }
 
-.set_edit {
-  .ant-modal {
-    width: 866px !important;
-    height: 870px !important;
-
-    .ant-modal-body {
-      .modalHeader {
-        background: linear-gradient(
-          rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%
-        );
-      }
-
-      padding: 0;
-
-      .modalHeader {
-        background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
-        );
-      }
-
-      .modalMain {
-        .projectname {
-          color: rgba(79, 81, 86, 1);
-          font-size: 14px;
-          line-height: 36px;
-          margin-left: 62px;
-          font-weight: 500;
-          margin-bottom: 24px;
-        }
-
-        .setbody {
-          margin-left: 67px;
-
-          .main_item {
-            display: flex;
-            align-items: center;
-            margin-bottom: 32px;
-
-            .signbox {
-              width: 130px;
-              display: flex;
-              justify-content: end;
-              align-items: center;
-              white-space: nowrap;
-
-              .sign {
-                margin-right: 5px;
-              }
-            }
-
-            .btnbox {
-              display: flex;
-              flex: 1;
-              align-items: center;
-
-              .xkbtn {
-                cursor: pointer;
-                width: 130px;
-                height: 40px;
-                background: #388be1;
-                border-radius: 8px;
-                border: 0;
-                margin-right: 8px;
-                color: #fff;
-              }
-            }
-          }
-
-          .main_item2 {
-            display: flex;
-            align-items: flex-start;
-            margin-bottom: 32px;
-
-            .signbox {
-              width: 130px;
-              display: flex;
-              justify-content: end;
-              align-items: center;
-              white-space: nowrap;
-
-              .sign {
-                margin-right: 5px;
-              }
-            }
-
-            .lodalimg {
-              width: 120px;
-              height: 120px;
-              border: 1px dashed #387df7;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              cursor: pointer;
-
-              .lodalimg {
-                display: flex;
-                white-space: nowrap;
-              }
-            }
-
-            .kqszbox {
-              .qdqtbox {
-                margin-left: 5px;
-                cursor: pointer;
-              }
-
-              .qdbtn,
-              .qtbtn {
-                width: 75px;
-                height: 24px;
-                background: rgba(56, 139, 225, 0.16);
-                border-radius: 2px;
-                border: 1px solid #387df7;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-
-                .btntext {
-                  color: #387df7;
-                }
-              }
-
-              .setbox {
-                display: flex;
-                flex-wrap: wrap;
-                margin-top: 10px;
-                margin-bottom: 24px;
-
-                .timerbox {
-                  margin-top: 6px;
-                  margin-right: 32px;
-                  display: flex;
-                  align-items: center;
-                  flex-wrap: nowrap;
-                }
-              }
-            }
-
-            .btnbox2 {
-              display: flex;
-              flex-direction: column;
-              justify-content: flex-start;
-
-              .xkbtn {
-                cursor: pointer;
-                width: 130px;
-                height: 40px;
-                background: #388be1;
-                border-radius: 8px;
-                border: 0;
-                margin-right: 16px 8px 32px 0;
-                color: #fff;
-                margin-top: 16px;
-                margin-bottom: 60px;
-              }
-            }
-          }
-        }
-
-        .pubtn {
-          display: flex;
-          justify-content: center;
-          margin-top: 25px;
-
-          //margin-bottom: 29px;
-          .pubtn1 {
-            width: 100px;
-            height: 40px;
-            margin-right: 16px;
-            margin-bottom: 29px;
-            border: 1px solid #409eff;
-            border-radius: 4px;
-            color: rgba(78, 166, 255, 1);
-            font-size: 14px;
-            //line-height: 36px;
-            align-items: center;
-            background: rgba(255, 255, 255, 1);
-          }
-
-          .pubtn2 {
-            width: 100px;
-            height: 40px;
-            margin-bottom: 29px;
-            border: 1px solid #409eff;
-            border-radius: 4px;
-            color: #ffffff;
-            font-size: 14px;
-            align-items: center;
-            //line-height: 36px;
-            background: #409eff;
-          }
-        }
-      }
-    }
-  }
-}
-
 .DelModal {
   .ant-modal {
     .ant-modal-content {