diff --git a/src/App.vue b/src/App.vue
index e09e7e17..436f650d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,7 +43,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.13------------");
+    console.log("版本0.17------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
diff --git a/src/api/config.js b/src/api/config.js
index e1b4874a..965764b6 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-04 13:27:07
+ * @LastEditTime: 2022-12-05 00:00:40
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        // window.open("https://u-pre.boe.com/web/", '_self');
+        window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);
diff --git a/src/api/index1.js b/src/api/index1.js
index c2d637ed..e2b28694 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -115,6 +115,8 @@ export const getMemberInfo = (obj) => http.post('/admin/orgStruct/getMemberInfo'
 export const getAudienceInfo = (obj) => http.post('/admin/orgStruct/getAudienceInfo', obj)
 //获取、添加授权（修改版）
 export const optionAuthPerm = (obj) => http.post('/admin/AuthPerm/optionAuthPerm', obj)
+//获取学员列表
+export const getStuList = (obj) => http.post('/admin/orgStruct/getStudentRef', obj)
 //获取用户登录
 export const getUser = () => http.post('/admin/CheckUser/login', { withCredentials: true })
 //公共信息---------------------------------------------------
diff --git a/src/api/indexTask.js b/src/api/indexTask.js
index 534f95e7..10353d60 100644
--- a/src/api/indexTask.js
+++ b/src/api/indexTask.js
@@ -11,4 +11,8 @@ export const RouterEditTask = (obj) => http.post('/admin/router/editTask',obj)
 // 删除关卡任务
 export const RouterDeleteTask = (obj) => http.post('/admin/router/deleteTask',obj);
 // 删除项目任务
-export const ProjectDeleteTask = (obj) => http.delete('/admin/project/deleteTask',obj);
\ No newline at end of file
+export const ProjectDeleteTask = (obj) => http.delete('/admin/project/deleteTask',obj);
+// 判断当前在线课是否已经添加到该路径图下
+export const IsExistence = (obj) => http.post('/admin/router/queryTaskDoesItExist',obj);
+// 判断当前在线课是否已经添加到该项目下
+export const IsExistenceProject = (obj) => http.post('/admin/project/queryTaskDoesItExistForProject',obj);
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 406e21a9..daf8bf36 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -408,6 +408,7 @@ export default {
       ctx.emit("update:addfaceteachVisible", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
+      state.fileList = []
       clear();
     };
     const afterVisibleChange = (bool) => {
diff --git a/src/components/drawers/AddGroupMembers.vue b/src/components/drawers/AddGroupMembers.vue
new file mode 100644
index 00000000..01065e2d
--- /dev/null
+++ b/src/components/drawers/AddGroupMembers.vue
@@ -0,0 +1,637 @@
+<template>
+  <a-drawer
+    :visible="AGMembers"
+    class="drawerStyle AddGroupMembers"
+    placement="right"
+    width="70%"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div class="headerTitle">添加组员</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="main">
+        <div class="search">
+          <div class="namecon" style="margin-right: 30px">
+            <div class="name">组员名称：</div>
+            <a-input
+              v-model:value="name"
+              style="width: 270px; height: 40px; border-radius: 8px"
+              placeholder="请输入姓名"
+            />
+          </div>
+
+          <div class="btns">
+            <div class="btn btn1" style="margin-right: 20px" @click="searchStu">
+              <div class="img1"></div>
+              <div class="wz">搜索</div>
+            </div>
+            <div class="btn btn2" @click="resetSearch">
+              <div class="img2"></div>
+              <div class="wz">重置</div>
+            </div>
+          </div>
+        </div>
+
+        <div class="line">
+          <div class="inline">
+            <div class="left">
+              <div class="img"></div>
+              <div class="text" style="margin-left: 10px">已选择</div>
+              <div class="text2">{{ choosed }}</div>
+              <div class="text">项</div>
+              <div class="text3">列表选项总计：</div>
+              <div class="text4">{{ total }}条</div>
+            </div>
+            <div class="right" @click="clearChooseStu">清空</div>
+          </div>
+        </div>
+        <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
+          <a-table
+            style="border: 1px solid #f2f6fe"
+            :columns="tablecolumns"
+            :data-source="tabledata"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            :scroll="{ x: 900 }"
+            @expand="expandTable"
+            :pagination="false"
+            :row-selection="{
+              columnWidth: 30,
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+            }"
+          />
+          <div class="pa">
+            <a-pagination
+              v-if="total > 10"
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="total"
+              class="pagination"
+              @change="changePaginationStu"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="btnn">
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="addStu">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { toRefs, reactive } from "vue";
+import { getProjStu } from "../../api/indexProjStu";
+import { toDate } from "../../api/method";
+import * as api from "../../api/index1";
+import { message } from "ant-design-vue";
+// import { message } from "ant-design-vue";
+export default {
+  name: "AddGroupMembers",
+  props: {
+    AGMembers: {
+      type: Boolean,
+      default: false,
+    },
+    chooseGroupId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+  },
+
+  setup(props, ctx) {
+    const state = reactive({
+      AGMembers: false,
+      name: null,
+      pageSize: 10,
+      currentPage: 1,
+      total: null,
+      tableDataTotal: -1,
+      selectedRowKeys: [],
+      choosed: 0, //勾选的学员总数
+      selectedRows: [], //选择的学员的id值
+      selectedRowStu: [], //选择的学员id和名字数组
+      tabledata: [
+        // {
+        //   key: 1,
+        //   name: "小李",
+        //   bum: "产品部",
+        //   gangw: "产品经理",
+        //   progress: "20%",
+        //   operations: "删除",
+        // },
+      ],
+
+      tablecolumns: [
+        {
+          title: "姓名",
+          dataIndex: "name",
+          key: "name",
+          width: 40,
+          align: "left",
+          className: "h head",
+        },
+        {
+          title: "部门",
+          dataIndex: "bum",
+          key: "bum",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "岗位",
+          dataIndex: "gangw",
+          key: "gangw",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+        // {
+        //   title: "进度",
+        //   dataIndex: "progress",
+        //   key: "progress",
+        //   width: 60,
+        //   align: "center",
+        //   className: "h",
+        // },
+      ],
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:AGMembers", false);
+      state.selectedRowKeys = [];
+      state.choosed = 0; //勾选的学员总数
+      state.selectedRows = []; //选择的学员的id值
+      state.selectedRowStu = []; //选择的学员id和名字数组
+    };
+
+    //把数据放到state里
+    const getTableDataList = (tableData) => {
+      let data = tableData;
+      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.name, //用户名
+          bum: value.userInfoBo.deptName, //部门
+          gangw: value.userInfoBo.jobName, //岗位
+          completeStageCnt: value.completeStageCnt, //当前完成阶段数
+          totalStageCnt: value.totalStageCnt, //总阶段数
+          progress: value.completeStageCnt + "/" + value.totalStageCnt,
+
+          stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
+        };
+        array.push(obj);
+      });
+      state.tabledata = array;
+    };
+    //获取学员列表
+    const getStu = (obj) => {
+      let objf = obj || {
+        deptIds: [], //部门
+        groupId: 0,
+        groupName: "",
+        name: state.name,
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        projectId: props.projectId,
+        topFlag: "",
+      };
+      getProjStu(objf).then((res) => {
+        if (res.data.code === 200) {
+          console.log(res.data.data, "获取学员列表");
+          // let leng = res.data.data.rows.length;
+          state.total = res.data.data.total;
+          state.tableDataTotal = res.data.data.total;
+          // if (leng > 0) {
+
+          // }
+          let arr = res.data.data.rows;
+          getTableDataList(arr);
+        }
+      });
+    };
+
+    const afterVisibleChange = (bool) => {
+      if (bool) {
+        getStu();
+      }
+    };
+    //分页
+    const changePaginationStu = (page) => {
+      state.currentPage = page;
+      getStu();
+    };
+    //勾选学员
+    const onSelectChange = (selectedRowKeys, selectedRows) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys, selectedRows);
+      state.selectedRowKeys = selectedRowKeys;
+      state.choosed = state.selectedRowKeys.length;
+      state.selectedRows = [];
+      let selectedRowStu = [];
+      selectedRows.map((item) => {
+        console.log(item.studentId);
+        state.selectedRows.push(item.studentId);
+        let obj = {
+          id: item.studentId,
+          name: item.name,
+        };
+        selectedRowStu.push(obj);
+      });
+      state.selectedRowStu = selectedRowStu;
+    };
+
+    //清空所选的学员
+    const clearChooseStu = () => {
+      state.selectedRowKeys = [];
+      state.choosed = 0;
+    };
+    //学员搜索
+    const searchStu = () => {
+      state.currentPage = 1;
+      getStu();
+    };
+    //重置
+    const resetSearch = () => {
+      state.name = null;
+      let obj = {
+        deptIds: [], //部门
+        groupName: "",
+        name: "",
+        pageNo: 1,
+        pageSize: 10,
+        projectId: props.projectId,
+        topFlag: "",
+      };
+      //重新获取列表
+      getStu(obj);
+    };
+
+    //向小组添加组员
+    const addStu = () => {
+      let obj = {
+        deptList: [],
+        groupList: [],
+        projectGroupId: props.chooseGroupId,
+        projectId: props.projectId,
+        studentList: state.selectedRowStu,
+      };
+      console.log("添加小组学员obj", obj);
+      api
+        .addStudentProject(obj)
+        .then((res) => {
+          console.log("添加小组学员成功", res);
+          message.success("添加成功");
+
+          ctx.emit("getStuPro");
+          closeDrawer();
+        })
+        .catch((err) => {
+          console.log("添加小组学员失败", err);
+        });
+    };
+    // console.log("chooseGroupId", props.chooseGroupId);
+    return {
+      ...toRefs(state),
+      closeDrawer,
+
+      getStu,
+      getTableDataList,
+      afterVisibleChange,
+      changePaginationStu,
+      clearChooseStu,
+      onSelectChange,
+      searchStu,
+      resetSearch,
+      addStu,
+    };
+  },
+};
+</script>
+
+<style lang="scss">
+.AddGroupMembers {
+  .drawerMain {
+    min-width: 600px;
+    margin: 0px 32px 0px 32px;
+    //overflow-x: auto;
+    display: flex;
+    flex-direction: column;
+
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+
+    .main {
+      width: 100%;
+      height: 100%;
+
+      // background-color: #bfa;
+      overflow-y: auto;
+      .endtime {
+        font-size: 16px;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .search {
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        margin-top: 20px;
+
+        .namecon {
+          display: flex;
+          flex-wrap: nowrap;
+          margin-bottom: 10px;
+
+          .name {
+            margin-top: 8px;
+          }
+
+          // .name {
+          //   margin-top: 8px;
+
+          //   color: rgba(0, 0, 0, 0.85);
+          //   font-size: 14px;
+          //   font-weight: 400;
+          // }
+        }
+
+        .btns {
+          display: flex;
+          flex-wrap: nowrap;
+
+          .btn {
+            cursor: pointer;
+            width: 100px;
+            height: 40px;
+            border-radius: 8px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            .img1 {
+              width: 15px;
+              height: 17px;
+              background-image: url(../../assets/images/courseManage/search0.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
+
+            .img2 {
+              width: 16px;
+              height: 18px;
+              background-image: url(../../assets/images/courseManage/reset1.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
+          }
+
+          .btn1 {
+            background: #409eff;
+
+            color: #ffffff;
+          }
+
+          .btn2 {
+            background: #ffffff;
+
+            color: #409eff;
+            border: 1px solid #409eff;
+          }
+        }
+      }
+
+      .btnss {
+        display: flex;
+        flex-wrap: nowrap;
+
+        .btn {
+          cursor: pointer;
+          width: 130px;
+          height: 40px;
+          border-radius: 8px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
+          .img1 {
+            width: 15px;
+            height: 17px;
+            background-image: url(../../assets/images/courseManage/add0.png);
+            background-size: 100% 100%;
+            margin-right: 7px;
+          }
+
+          .img2 {
+            width: 17px;
+            height: 16px;
+            background-image: url(../../assets/images/coursewareManage/export.png);
+            background-size: 100% 100%;
+            margin-right: 7px;
+          }
+
+          .img3 {
+            width: 17px;
+            height: 16px;
+            background-image: url(../../assets/images/projectadd/delete.png);
+            background-size: 100% 100%;
+            margin-right: 7px;
+          }
+        }
+
+        .btn1 {
+          background: #409eff;
+
+          color: #ffffff;
+        }
+
+        .btn2 {
+          background: #ffffff;
+          margin-right: 20px;
+          color: #409eff;
+          border: 1px solid #409eff;
+        }
+      }
+
+      .line {
+        width: 100%;
+        height: 40px;
+        background-color: #e9f6fe;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-top: 20px;
+        border: 1px solid #c3e6fc;
+
+        .inline {
+          width: 95%;
+          height: 100%;
+          display: flex;
+          justify-content: space-between;
+
+          // background-color: #bfa;
+          .left {
+            height: 100%;
+            display: flex;
+            align-items: center;
+
+            .img {
+              width: 14px;
+              height: 15px;
+              background-image: url(../../assets/images/leveladd/gan.png);
+              background-size: 100% 100%;
+            }
+
+            .text {
+              color: #999ba3;
+            }
+
+            .text2 {
+              color: #4ea6ff;
+              margin-left: 5px;
+              margin-right: 5px;
+            }
+
+            .text3 {
+              color: #999ba3;
+              margin-left: 20px;
+            }
+          }
+
+          .right {
+            font-size: 14px;
+            font-weight: 400;
+            color: #387df7;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            cursor: pointer;
+          }
+        }
+      }
+
+      .tableBox {
+        .ant-table-selection-column {
+          padding: 0px !important;
+          // padding-left: 45px !important;
+        }
+
+        .ant-table-thead > tr > th {
+          background-color: rgba(239, 244, 252, 1) !important;
+          color: rgba(0, 0, 0, 0.85);
+        }
+
+        .ant-table-cell {
+          color: rgba(0, 0, 0, 0.65);
+        }
+
+        .ant-table-selection-column {
+          padding: 0 !important;
+        }
+
+        th.h {
+          background-color: #eff4fc !important;
+        }
+
+        .head {
+          padding-left: 0px !important;
+        }
+
+        .operation {
+          color: rgba(56, 125, 247, 1);
+          cursor: pointer;
+        }
+        .ant-table-tbody
+          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          > td {
+          background: #f6f9fd;
+        }
+        .ant-table-tbody > tr > td {
+          border-bottom: 1px solid rgba(240, 244, 254, 1);
+        }
+        .pa {
+          // left: 0;
+          margin-top: 15px;
+          width: 100%;
+          // height: 20px;
+          // background-color: red;
+          display: flex;
+          justify-content: center;
+          // position: absolute;
+          // bottom: 20px;
+        }
+      }
+    }
+
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
+      .btn1 {
+        width: 100px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        border-radius: 8px;
+        color: #4ea6ff;
+        background-color: #fff;
+        cursor: pointer;
+      }
+
+      .btn2 {
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 8ceab4c2..9b0f8aeb 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -291,6 +291,7 @@ export default {
       resetForm();
     };
     const closeDrawer2 = () => {
+      ctx.emit("update:edit", false);
       ctx.emit("update:addhomeworkVisible", false);
       resetForm();
     };
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index d52c7a4e..c8451a80 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -134,7 +134,7 @@ import * as api from "../../api/indexOnline.js";
 import * as apiTask from "../../api/indexTaskadd";
 // import { setCookie } from "../../api/method"
 import { message } from "ant-design-vue";
-import { RouterEditTask } from "@/api/indexTask";
+import { RouterEditTask, IsExistence, IsExistenceProject } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 export default {
   name: "AddOnline",
@@ -272,6 +272,7 @@ export default {
     const onSelectChange = (selectedRowKeys,selectedRows) => {
         state.selectedRowKeys = selectedRowKeys;
         state.addOnlineList = selectedRows;
+        console.log(selectedRowKeys,selectedRows)
         if( props.edit && selectedRows.length > 0 ){
           selectedRows.map((value)=>{
             if(value.courseId == props.EditOnlineId){
@@ -311,7 +312,6 @@ export default {
         }
       });
       state.tableData = array;
-      state.tableDataTotal = state.tableData.length
     };
     //获取全部在线信息接口
     const getAllOnlineText = () => {
@@ -330,17 +330,80 @@ export default {
           "sysType3": "",
         })
         .then((res) => {
-          let arr = res.data.data;
+          let arr = res.data.data.list;
+          state.tableDataTotal = res.data.data.count
           if (res.status === 200) {
+            console.log('获取在线课列表数据', res)
             getTableDate(arr);
           }
         })
         .catch((err) => {
             console.log(err,'请求失败在线');});
     };
+
+    // 校验当前在线课是否已经添加进来了
+    const isExistence = (id) => {
+
+      console.log({
+        "chapterId": Number(props.isactive),
+        "courseTaskId": Number(id),
+        "routerId": props.routerId,
+        "type": 1
+      })
+
+      IsExistence({
+        "chapterId": Number(props.isactive),
+        "courseTaskId": Number(id),
+        "routerId": props.routerId,
+        "type": 1
+      }).then(res=>{
+        console.log('我是不是已经添加了',res)
+      }).catch(err=>{
+        console.log(err)
+      })
+    }
+
+    // 判断项目中是否添加当前在线课
+    const IsExistenceProjects = () => {
+      IsExistenceProject({
+        "courseTaskId": props.projectTaskId || 0,
+        "projectId": props.projectId,
+        "stageId": props.chooseStageId || 0,
+        "type": 1
+      }).then(res=>{
+        console.log(res)
+      }).catch(err=>{
+        console.log(err)
+      })
+    }
+
     const updateTask = () => {
+
+      
+      if(props.isLevel == 1){
+        // isExistence(23)
+        // return
+        // let routerarr = []
+        // console.log('我是要便利的数据1', state.addOnlineList)
+        // state.addOnlineList.map((value) => {
+        //   routerarr.push(isExistence(value.courseId))
+        // })
+        // console.log('当前是否已经添加了',routerarr)
+      }
+
+      if(props.isLevel == 2){
+        console.log('我是要便利的数据2', state.addOnlineList)
+
+      }
+
+      if(props.isLevel == 3){
+        console.log('我是要便利的数据3', state.addOnlineList)
+
+      }
+
       if (props.isLevel == 1) {
         state.addOnlineList.map((value) => {
+          console.log(value)
           RouterEditTask({
           chapterId: Number(props.isactive),
           courseId: value.num,
@@ -445,6 +508,8 @@ export default {
       updateTask,
       searchList,
       resetOnline,
+      isExistence,
+      IsExistenceProjects
     };
   },
 };
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 65fde411..5f163a64 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -62,7 +62,7 @@
               <div class="text3">列表选项总计：</div>
               <div class="text4">{{ total }}条</div>
             </div>
-            <div class="right">清空</div>
+            <div class="right" @click="clearChooseStu">清空</div>
           </div>
         </div>
         <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
@@ -97,8 +97,8 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">确定</button>
       </div>
       <!-- 批量删除的弹窗 -->
       <a-modal
@@ -146,20 +146,30 @@
           <button class="btn btn2" @click="yesdele">确定</button>
         </div>
       </a-modal>
-      <stu-add v-model:Stuvisible="Stuvisible" />
+      <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
+      <add-group-members
+        v-model:AGMembers="Stuvisible"
+        :chooseGroupId="chooseGroupId"
+        :projectId="projectId"
+        @getStuPro="getStu"
+      />
     </div>
   </a-drawer>
 </template>
 
 <script>
 import { toRefs, reactive } from "vue";
-import StuAdd from "./StuAdd.vue";
+// import StuAdd from "./StuAdd.vue";
 import { getProjStu, deleteStu } from "../../api/indexProjStu";
 import { toDate } from "../../api/method";
 import { message } from "ant-design-vue";
+import AddGroupMembers from "./AddGroupMembers.vue";
 export default {
   name: "MemberList",
-  components: { StuAdd },
+  components: {
+    // StuAdd,
+    AddGroupMembers,
+  },
   props: {
     Lvisible: {
       type: Boolean,
@@ -178,12 +188,15 @@ export default {
   setup(props, ctx) {
     const state = reactive({
       Stuvisible: false,
+      // chooseGroupId: props.chooseGroupId,
+      // projectId: props.projectId,
       name: null,
       showmodal: false,
       closable: false, //modal右上角的关闭按钮
       pageSize: 10,
       currentPage: 1,
       total: null,
+      tableDataTotal: -1,
       selectedRowKeys: [],
       choosed: 0, //勾选的学员总数
       selectedRows: [], //选择的学员的id值
@@ -257,6 +270,8 @@ export default {
     });
     const closeDrawer = () => {
       ctx.emit("update:Lvisible", false);
+      state.tabledata = [];
+      console.log("tabledata", state.tabledata);
     };
     const showModal = () => {
       if (state.selectedRows.length == 0) {
@@ -290,6 +305,7 @@ export default {
     };
     const showStuAdd = () => {
       state.Stuvisible = true;
+      // console.log("单击");
     };
     //把数据放到state里
     const getTableDataList = (tableData) => {
@@ -326,21 +342,30 @@ export default {
         pageSize: 10,
         projectId: props.projectId,
         topFlag: "",
-        groupId: 10, //暂时写死
+        groupId: props.chooseGroupId, //暂时写死
       };
+      state.tableDataTotal = -1;
       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) {
+        if (res.data.code === 200) {
+          state.total = res.data.data.total;
+          state.tableDataTotal = res.data.data.total;
           let arr = res.data.data.rows;
           getTableDataList(arr);
         }
+        // let leng = res.data.data.rows.length;
+
+        // state.tableDataTotal = res.data.data.total;
+        // if (leng > 0) {
+
+        // }
       });
     };
 
-    const afterVisibleChange = () => {
-      getStu();
+    const afterVisibleChange = (bool) => {
+      if (bool) {
+        getStu();
+      }
     };
     //分页
     const changePaginationStu = (page) => {
diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index c2cd635c..305d1e1f 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -583,6 +583,7 @@ import {
   // batchLoadList,
 } from "../../utils/utils";
 import * as api from "../../api/index1";
+import {getStuList} from "../../api/index1";
 
 export default {
   name: "ProjCheckShip",
@@ -603,6 +604,11 @@ export default {
       type: Number,
       default: null,
     },
+    //1 审核 2添加学员
+    type: {
+      type: Number,
+      default: 1,
+    },
   },
   setup(props, ctx) {
     const store = useStore();
@@ -611,7 +617,7 @@ export default {
       //快速选人
       pageSize: 10,
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: 0,
       nameSearch: "", //搜索名称
       loading: false,
       //受众
@@ -805,7 +811,7 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
       if (bool) {
-        optionAuthPerm();
+        props.type === 1 ? optionAuthPerm() : getStuentList()
       }
     };
     //获取组织树
@@ -822,7 +828,7 @@ export default {
     //     };
     onMounted(() => {
       window.addEventListener("resize", getClientHeight, false);
-      state.tabledata = store.state.memberInitInfo;
+      // state.tabledata = store.state.memberInitInfo;
     });
     onUnmounted(() => {
       window.removeEventListener("resize", getClientHeight, false);
@@ -898,10 +904,14 @@ export default {
       console.log("choosepeople : ", state.choosepeople);
       state.selectedRowKeys = selectedRowKeys;
       const se = state.studentList.map(e => e.id).join(',') || ''
-      const addItem = item.filter(e => (e && !se.includes(e.id + ',')))
+      const addItem = item.filter(e => (e && !se.includes(e.id + '')))
       addItem.forEach(e => {
         e.name = e.realName
       })
+      const selectStr = selectedRowKeys.join(',')
+      console.log(selectStr)
+      state.studentList = state.studentList.filter(e => selectStr.includes(e.id + ''))
+      console.log(state.studentList)
       state.choosepeople = [...addItem.reverse(), ...state.studentList];
       selectedsHeight();
       // if (selectedRowKeys.length > 0 && item.length > 0) {
@@ -1331,6 +1341,47 @@ export default {
       ctx.emit("update:addAuthList", state.selectAllArr);
       closeDrawer();
     };
+    //获取学员列表
+    const getStuentList = () => {
+      getStuList({
+        refType: {learnPath: 1, project: 2, course: 3, addstudent: 2}[props.classify],
+        refId: props.selectProjectId,
+        extId: 0
+      }).then(res => {
+        initResp(res)
+      })
+    }
+
+    function initResp(res) {
+      let studentArr = res.data.data.studentList;
+      state.studentList = res.data.data.studentList;
+      state.choosepeople = res.data.data.studentList;
+      //快速选人
+      state.selectedRowKeys = studentArr.map(e => e.id);
+      let deptArr = res.data.data.deptList;
+      let selectedKeys1 = [];
+      let chooseorganization = [];
+      for (let i = 0; i < deptArr.length; i++) {
+        selectedKeys1.push(deptArr[i].id);
+        chooseorganization.push(deptArr[i]);
+      }
+      //组织
+      state.selectedKeys1 = selectedKeys1;
+      state.chooseorganization = chooseorganization;
+      state.chooseorganization1 = chooseorganization;
+      let groupArr = res.data.data.groupList;
+      let selectedRowKeys2 = [];
+      let relationpeople = [];
+      for (let i = 0; i < groupArr.length; i++) {
+        selectedRowKeys2.push(groupArr[i].id);
+        relationpeople.push(groupArr[i]);
+      }
+      //受众
+      state.selectedRowKeys2 = selectedRowKeys2;
+      state.relationpeople = relationpeople;
+      console.log("获取权限名单成功", res);
+    }
+
     //获取授权 坐回显
     const optionAuthPerm = () => {
       let obj = {
@@ -1353,43 +1404,10 @@ export default {
         studentList: [],
       };
       console.log("获取权限名单obj", obj);
-      api
-          .optionAuthPerm(obj)
-          .then((res) => {
-            // console.log("获取权限名单成功", res);
-            if (res.data.code === 200) {
-              let studentArr = res.data.data.studentList;
-              state.studentList = res.data.data.studentList;
-              state.choosepeople = res.data.data.studentList;
-              //快速选人
-              state.selectedRowKeys = studentArr.map(e => e.id);
-              let deptArr = res.data.data.deptList;
-              let selectedKeys1 = [];
-              let chooseorganization = [];
-              for (let i = 0; i < deptArr.length; i++) {
-                selectedKeys1.push(deptArr[i].id);
-                chooseorganization.push(deptArr[i]);
-              }
-              //组织
-              state.selectedKeys1 = selectedKeys1;
-              state.chooseorganization = chooseorganization;
-              state.chooseorganization1 = chooseorganization;
-              let groupArr = res.data.data.groupList;
-              let selectedRowKeys2 = [];
-              let relationpeople = [];
-              for (let i = 0; i < groupArr.length; i++) {
-                selectedRowKeys2.push(groupArr[i].id);
-                relationpeople.push(groupArr[i]);
-              }
-              //受众
-              state.selectedRowKeys2 = selectedRowKeys2;
-              state.relationpeople = relationpeople;
-              console.log("获取权限名单成功", res);
-            }
-          })
-          .catch((err) => {
-            console.log("获取权限名单失败", err);
-          });
+      api.optionAuthPerm(obj).then((res) => {
+        initResp(res)
+      })
+
     };
     return {
       ...toRefs(state),
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 7a6cb6f0..970cb9cc 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2439,7 +2439,7 @@
                 </div>
                 <div class="i5_right">
                   <div class="stmm_btn btn3">
-                    <span style="color: #ffffff" @click="showStuAdd">
+                    <span style="color: #ffffff" @click="showStuAdd(currentPlanItem)">
                       添加学员
                     </span>
                   </div>
@@ -2970,6 +2970,7 @@
       v-model:addAuthList="addAuthList"
       :authClassify="authClassify"
       classify="course"
+      :type="shipType"
     />
   </div>
 
@@ -3160,7 +3161,7 @@ const columns1 = [
     key: "9",
     align: "center",
     customRender: ({ text }) => {
-      return text ? getdateToTime(text * 1000) : "-";
+      return text ? text : "-";
     },
   },
   {
@@ -3501,6 +3502,7 @@ export default defineComponent({
   },
   setup() {
     const state = reactive({
+      shipType: 1,
       addLoading: false,
       currentPlanItem: {},
       teacherId: null,
@@ -3750,9 +3752,11 @@ export default defineComponent({
       newCourseName: null, //新建开课名称
     });
 
-    const showStuAdd = () => {
-      state.viewpowervisible = true;
+    const showStuAdd = (record) => {
+      state.selectCourseId = record.offcoursePlanId;
+      state.shipType = 2;
       state.authClassify = 3;
+      state.viewpowervisible = true;
     };
 
     //  富文本 sssssssssssssss
@@ -3913,6 +3917,7 @@ export default defineComponent({
         beginTime: startTime,
       });
       const { rows, total } = res.data.data;
+      console.log(res.data.data);
       state.tableDataTotal1 = total;
       const datas = traverseArr(
         rows,
@@ -4429,8 +4434,8 @@ export default defineComponent({
     };
     // 关闭查看
     const handlelookMs = () => {
-      state.lookMs = false
-    }
+      state.lookMs = false;
+    };
     //保存面授课
     const handlePush = (param) => {
       //state.isEdit = 1;
@@ -5030,7 +5035,6 @@ export default defineComponent({
       state.ft_eidt = true;
     };
 
-
     const handleLook = async (itm, type) => {
       state.isEdit = 0;
       console.log(45555);
@@ -5306,28 +5310,31 @@ export default defineComponent({
     //权限名单
     const showPrower = (record) => {
       // console.log("record", record);
-      state.corpowerlistvisible = true;
       state.selectCourseId = record.offcourseId;
+      state.corpowerlistvisible = true;
     };
     //归属权
     const showOwnPrower = (record) => {
       // console.log("record", record);
-      state.ownpowervisible = true;
       state.selectCourseId = record.offcourseId;
+      state.ownpowervisible = true;
     };
     //查看权
     const showViewPrower = (record) => {
       // console.log("record", record);
-      state.viewpowervisible = true;
       state.selectCourseId = record.offcourseId;
       state.authClassify = 1;
+      state.viewpowervisible = true;
     };
     //管理权
     const showManagePrower = (record) => {
       // console.log("record", record);
-      state.viewpowervisible = true;
+      console.log(22222222)
+      console.log(record)
       state.selectCourseId = record.offcourseId;
+      state.shipType = 1;
       state.authClassify = 2;
+      state.viewpowervisible = true;
     };
     //添加权限
     watch(
@@ -5508,7 +5515,7 @@ export default defineComponent({
 
       closeOnlineCoursevisible,
       handlelookMs,
-      handleLook
+      handleLook,
     };
   },
 });
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 70a8d3b6..3eaf1ade 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -65,7 +65,6 @@
 import { reactive, toRefs, onMounted } from "vue";
 import { courseListView } from "../../api/indexAudit";
 import * as api1 from "@/api/index1";
-import { toDate } from "../../api/method";
 
 export default {
   name: "CoursereViewed",
@@ -123,7 +122,7 @@ export default {
           key: "time",
           align: "center",
           customRender: (time) => {
-            return <div style="color:#387DF7">{toDate(time.record.time, "Y-M-D h:m")}</div>;
+            return <div style="color:#387DF7">{time.record.time}</div>;
           },
 
         },
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 074cbc25..782c5467 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -318,7 +318,6 @@
 <script>
 import { reactive, toRefs, onMounted, ref } from "vue";
 import { list, courseAuditView, courseDetail } from "../../api/indexAudit";
-import { toDate } from "../../api/method";
 import { message } from "ant-design-vue";
 import { Editor } from "@wangeditor/editor-for-vue";
 import { iframeUrl } from "../../api/method";
@@ -585,7 +584,7 @@ export default {
                     : "-",
           change: "-",
           creater: item.createName,
-          time: toDate(item.createTime, "Y-M-D h:m"),
+          time: item.createTime,
           createrId: item.createId,
           offId: item.offcourseId,
         };
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index af260299..ff17ecfd 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1027,7 +1027,8 @@
         :selectProjectId="routerId"
         v-model:addAuthList="addAuthList"
         :authClassify="authClassify"
-        classify="addstudent"
+        classify="learnPath"
+        :type="2"
       />
       <!-- 导入学员抽屉 -->
       <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 63d53e39..a4772c4e 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1471,7 +1471,7 @@ export default {
                             path: "/projectadd",
                             query: {
                               parentId: value.record.projectId,
-                              parentName: value.record.name,
+                              parentName: value.record.parentName + '——' + value.record.name,
                             },
                           });
                         }}
@@ -1573,7 +1573,7 @@ export default {
         data.forEach((e) => {
           e.parentName = parentName;
           e.key = e.projectId;
-          initDataSublist(e.name, e.subList);
+          initDataSublist((parentName ? (parentName + '——') : '') + e.name, e.subList);
           e.subList && e.subList.length && (e.children = e.subList);
         });
       }
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 7d56e5a1..4f0232d2 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -4,11 +4,12 @@
       <div class="left clearfix">
         <div class="leftmain">
           <div class="tit">
-            阶段<img
-              src="../../assets/images/projectadd/right.png"
-              style="margin-left: 10px; cursor: pointer"
-              @click="showCancel"
-            />
+            阶段
+<!--            <img-->
+<!--              src="../../assets/images/projectadd/right.png"-->
+<!--              style="margin-left: 10px; cursor: pointer"-->
+<!--              @click="showCancel"-->
+<!--            />-->
           </div>
           <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
             <div class="search"></div>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 165578e5..37b3b0f1 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -777,7 +777,7 @@
                   </div>
                 </div>
                 <div class="second2">
-                  <div class="btn1" @click="showModal2">
+                  <div class="btn1" @click="showModal2(1, null)">
                     <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">创建小组</span>
                   </div>
@@ -803,7 +803,9 @@
                             >. . .</span
                           >
                           <div class="moreItems">
-                            <div class="sammo">编辑</div>
+                            <div class="sammo" @click="showModal2(2, item)">
+                              编辑
+                            </div>
                             <div
                               class="sammo"
                               @click="deleteGroupBtn(item.projectGroupId)"
@@ -1185,7 +1187,8 @@
       :selectProjectId="projectId"
       v-model:addAuthList="addAuthList"
       :authClassify="authClassify"
-      classify="addstudent"
+      classify="project"
+      :type="2"
     />
     <!-- 学员管理-导入学员抽屉 -->
     <import-stu v-model:Importvisible="Importvisible" />
@@ -1935,6 +1938,8 @@ export default {
       valuestub: "", //学员管理部门
       valuestug: "", //学员小组管理名称
       valuestugroup: "", //学员管理小组名称
+      projectGroupId: null, //是编辑小组id
+      stuMemberClassify: null, //1：新建小组 2：编辑小组
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "",
@@ -2641,11 +2646,23 @@ export default {
       state.canclestu1 = false;
     };
 
-    const showModal2 = () => {
+    const showModal2 = (classify, item) => {
+      state.stuMemberClassify = classify;
+      state.projectGroupId =
+        item && item.projectGroupId ? item.projectGroupId : null;
       state.stugroup = true;
+      if (item) {
+        state.valueaddg = item.groupName;
+        state.valueaddm = item.leaderName;
+      }
+      console.log("编辑小组item", item);
     };
     const closeModal2 = () => {
       state.stugroup = false;
+      state.valueaddg = null;
+      state.valueaddm = null;
+      state.projectGroupId = null;
+      state.stuMemberClassify = null;
     };
     //点击确定创建小组
     const createG = () => {
@@ -2654,7 +2671,7 @@ export default {
         return message.warning("请输入必填项");
       } else {
         createGroup();
-        state.stugroup = false;
+        closeModal2();
       }
     };
     const showFaceIn = () => {
@@ -3233,6 +3250,7 @@ export default {
         array.push(obj);
       });
       state.groupList = array;
+      console.log("编辑小组", state.groupList);
     };
     //学员搜索
     const searchStu = () => {
@@ -3293,6 +3311,7 @@ export default {
     };
     //获取学员列表
     const getStu = (obj) => {
+      state.loading = true;
       let objf = obj || {
         deptIds: [], //部门
         groupId: 0,
@@ -3392,11 +3411,14 @@ export default {
       getGroupList(objf)
         .then((res) => {
           console.log(res.data.data.rows, "获取小组列表成功");
-          let leng = res.data.data.rows.length;
-          if (leng > 0) {
+          if (res.data.code === 200) {
             let arr = res.data.data.rows;
             setGroupList(arr);
           }
+          // let leng = res.data.data.rows.length;
+          // if (leng > 0) {
+
+          // }
         })
         .catch((err) => {
           console.log(err, "获取列表失败");
@@ -3414,23 +3436,47 @@ export default {
     };
     //创建小组
     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("小组创建失败");
-        });
+      //新建
+      if (state.stuMemberClassify === 1) {
+        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("小组创建失败");
+          });
+      }
+      //编辑
+      if (state.stuMemberClassify === 2) {
+        let obj = {
+          groupName: state.valueaddg,
+          leaderId: 0,
+          leaderName: state.valueaddm,
+          projectGroupId: state.projectGroupId,
+          projectId: state.projectId,
+        };
+        console.log("编辑小组obj", obj);
+        editGroup(obj)
+          .then((res) => {
+            console.log("小组编辑成功", res);
+            message.success("小组编辑成功");
+            getGroup();
+          })
+          .catch((err) => {
+            console.log("小组编辑失败", err);
+            message.warning("小组编辑失败");
+          });
+      }
     };
     //搜索小组重置
     const resetGroupName = () => {