Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/student/TableModelStudent.vue
#	src/views/projectcenter/ProjectAdd.vue
#	src/views/projectcenter/ProjectManage.vue

src/components/drawers/ActiveAttendance.vue

@@ -771,7 +771,7 @@ export default {
                     })
                   }}
                   style="display:flex;justify-content:center;align-items:center;margin-right:12px;cursor:pointer;">
-                  {value.signStatus?
+                  {value.record.signStatus?
                   <div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;display:flex;justify-content:center;align-items:center;'>
                     <div style='width:8px;height:8px;border-radius:8px;background:#4ea6ff;'></div>
                   </div>:
@@ -814,7 +814,7 @@ export default {
                     })
                   }}
                   style="display:flex;justify-content:center;align-items:center;cursor:pointer;">
-                  {value.leaveStatus?
+                  {value.record.leaveStatus?
                   <div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;display:flex;justify-content:center;align-items:center;'>
                     <div style='width:8px;height:8px;border-radius:8px;background:#4ea6ff;'></div>
                   </div>:

src/components/drawers/ProjectAudit.vue

@@ -457,9 +457,10 @@ export default {
 
     //获取项目修改记录
     const getrecord = () => {
+      console.log("props.chooseProject", props.chooseProject);
       editRecord(props.chooseProject)
         .then((res) => {
-          console.log("获取修改记录", res);
+          console.log("获取修改记录2", res);
           if (res.data.code === 200) {
             state.tableData = res.data.data.records;
             // console.log("state.tableData", state.tableData);

src/components/drawers/SubsetManage.vue

@@ -42,9 +42,14 @@
               v-model:value="value.name"
               style="border-radius: 8px; height: 40px"
             />
-            <div class="peopleNum">{{ peopleNum2 }}</div>
+            <a-input-number
+              :min="1"
+              :precision="0"
+              style="width: 64px; height: 40px; border-radius: 8px"
+              v-model:value="peopleNum"
+            />
             <span style="margin-left: 3px">人</span>
-            <div class="delete">删除</div>
+            <div class="delete" @click="deleteGroup(value)">删除</div>
           </div>
         </div>
       </div>
@@ -110,6 +115,7 @@ export default {
       let arr = [];
       for (let i = 0; i < state.groupNum; i++) {
         let obj = {
+          key: i,
           name: "",
           number: state.peopleNum,
         };
@@ -118,10 +124,19 @@ export default {
       state.groupNum2 = arr;
       state.peopleNum2 = state.peopleNum;
     };
+    //删除单个小组
+    const deleteGroup = (item) => {
+      for (let i = 0; i < state.groupNum2.length; i++) {
+        if (item.key === state.groupNum2[i].key) {
+          state.groupNum2.splice(i, 1);
+        }
+      }
+    };
     //添加小组
     const addGroup = () => {
       console.log("state.groupNum2", state.groupNum2);
     };
+
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -130,6 +145,7 @@ export default {
       showAddGroup,
       addGroup,
       // change,
+      deleteGroup,
     };
   },
 };
@@ -169,6 +185,12 @@ export default {
       }
     }
     .main {
+      .ant-input-number-input {
+        height: 38px;
+      }
+      .ant-input-number {
+        margin-left: 10px;
+      }
       .group {
         display: flex;
         align-items: center;

src/components/drawers/router/RouterProjectManage.vue

@@ -0,0 +1,700 @@
+<template>
+    <a-drawer
+        v-if="PjModelVisible"
+        :visible="PjModelVisible"
+        class="drawerStyle RouterProjectManage"
+        placement="right"
+        width="80%"
+        @after-visible-change="afterVisibleChange"
+    >
+        <div class="drawerMain">
+        <div class="header">
+            <div class="headerTitle">
+            【项目】{{ title }}
+            </div>
+            <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
+            />
+        </div>
+        <div class="main">
+            <div
+            v-if="datasource.type !== 6 && datasource.type !== 9"
+            class="endtime"
+            >
+            
+            <!-- 起止时间：—-->
+            </div>
+            <div v-else class="endtime">
+            起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
+            </div>
+            <div class="search" style="justify-content:flex-start;">
+            <div class="sealeft">
+                <div class="namecon" style="margin-right: 30px">
+                <div class="name">姓名：</div>
+                <a-input
+                    v-model:value="name"
+                    style="width: 200px; height: 40px; border-radius: 8px"
+                    placeholder="请输入姓名"
+                />
+                </div>
+                <div v-if="datasource.type !==1" class="namecon" style="margin-right: 50px">
+                <div class="name">任务状态：</div>
+                <div class="select">
+                    <a-select
+                    v-model:value="projectName"
+                    style="width: 200px"
+                    placeholder="请选择"
+                    :options="projectNameList"
+                    @change="selectProjectName"
+                    
+                    ></a-select>
+                </div>
+                </div>
+            </div>
+            <div class="btns">
+                <div
+                class="btn btn1"
+                style="margin-right: 20px"
+                @click="searchTaskList"
+                >
+                <div class="img1"></div>
+                <div class="wz">搜索</div>
+                </div>
+                <div class="btn btn2" @click="resetTaskList">
+                <div class="img2"></div>
+                <div class="wz">重置</div>
+                </div>
+            </div>
+            </div>
+            <div class="btnss" style="margin-top: 20px">
+            <!--
+            <div class="btn btn1" @click="godie" style="margin-right: 20px">
+                <div class="img1"></div>
+                <div class="wz">催促学习</div>
+            </div>-->
+            <div class="btn btn2" @click="exportTaskStu">
+                <div class="img2"></div>
+                <div class="wz">导出数据</div>
+            </div>
+            </div>
+            <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
+            <a-table
+                style="border: 1px solid #f2f6fe"
+                :columns="tableDataFunc()"
+                :data-source="tabledata"
+                :loading="tableDataTotalLoading"
+                :scroll="{ x: 900 }"
+                :pagination="false"
+            />
+            <div class="tableBox">
+                <div class="pa">
+                <a-pagination
+                    :showSizeChanger="false"
+                    showQuickJumper="true"
+                    hideOnSinglePage="true"
+                    :pageSize="pageSize"
+                    :current="currentPage"
+                    :total="tableDataTotal"
+                    class="pagination"
+                    @change="changePaginationStu"
+                    v-if="tableDataTotal > 10"
+                />
+                </div>
+            </div>
+            </div>
+        </div>
+            <!--
+        <div class="btnn">
+            <button class="btn1" @click="closeDrawer">取消</button>
+            <button class="btn2" @click="closeDrawer">确定</button>
+        </div>-->
+        </div>
+    </a-drawer>
+    <CVote 
+        v-model:CVvisible="CVvisible"
+        :voteID="voteID"
+        :courseID="courseID"
+        />
+</template>
+  
+  <script>
+  import { toRefs, reactive, onMounted, onUnmounted } from "vue";
+  import { message } from "ant-design-vue";
+  // import * as api from "../../../api/index";
+  import * as api from "../../../api/indexTaskManage";
+  import CVote from "../CheckVote.vue"
+
+  export default {
+    name: "RouterProjectManage",
+    components:{
+        CVote,
+    },
+    props: {
+      PjModelVisible: {
+        type: Boolean,
+        default: false,
+      },
+      title: {
+        type: String,
+        default: "",
+      },
+      levelName: {
+        type: String,
+        default: "",
+      },
+      projectTaskId: {
+        type: Number,
+        default: null,
+      },
+      itemsType: {
+        type: Number,
+        default: null,
+      },
+      datasource: {
+        type: Object,
+        default: function () {
+          return {};
+        },
+      },
+    },
+  
+    setup(props, ctx) {
+      const state = reactive({
+        visible: props.PjModelVisible,
+        name: "",
+        pageNo: 1,
+        pageSize: 10,
+        currentPage: 1,
+        tableDataTotal: 0,
+        projectName: undefined,
+        projectNameList: [
+          
+            {
+              id: 1,
+              value: "1",
+              label: "未开始",
+            },
+            {
+              id: 2,
+              value: "2",
+              label: "进行中",
+            },
+            {
+              id: 3,
+              value: "3",
+              label: "已完成",
+            },
+            {
+              id: 4,
+              value: "4",
+              label: "未完成",
+            },
+        ],
+        tabledata: [],
+        tableDataTotalLoading: true, // 表格loading加载配置
+        CVvisible:false, //查看投票抽屉
+        voteID: "",
+        courseID: ""
+      });
+      const tableDataFunc = () => {
+        const columns = [
+          {
+            title: "工号",
+            dataIndex: "studentUserNo",
+            key: "studentUserNo",
+            width: "20%",
+            align: "center",
+            ellipsis: true,
+            className: "h head",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+                </div>
+              );
+            },
+          },
+          {
+            title: "姓名",
+            dataIndex: "studentName",
+            key: "studentName",
+            width: "10%",
+            align: "center",
+            ellipsis: true,
+            className: "h head",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentName?text.record.studentName:"-"}</span>
+                </div>
+              );
+            },
+          },
+          {
+            title: "所在部门",
+            dataIndex: "studentDepartName",
+            key: "studentDepartName",
+            width: "20%",
+            align: "center",
+            
+            className: "h",
+            ellipsis: true,
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+                </div>
+              );
+            },
+          },
+          {
+            title: "所在岗位",
+            dataIndex: "studentJobName",
+            key: "studentJobName",
+            width: "10%",
+            align: "center",
+            ellipsis: true,
+            className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+                </div>
+              );
+            },
+          },
+          {
+            title: "学员关卡",
+            dataIndex: "currentStageName",
+            key: "currentStageName",
+            width: "10%",
+            align: "center",
+            ellipsis: true,
+            className: "h",
+            customRender: () => {
+              return (
+                <div class="racona">
+                  <span> {props.levelName}</span>
+                </div>
+              );
+            },
+          },
+          {
+            title: "完成时间",
+            dataIndex: "lastStudyTime",
+            key: "lastStudyTime",
+            width: "15%",
+            align: "center",
+            ellipsis: true,
+            className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
+                </div>
+              );
+            },
+          },
+          {
+            title: "任务状态",
+            dataIndex: "finishStatus",
+            key: "finishStatus",
+            width: "10%",
+            align: "center",
+            ellipsis: true,
+            className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.finishStatus == 1 || text.record.finishStatus == 0 || text.record.finishStatus==null  ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 3 ? "已完成" :"未完成"}</span>
+                </div>
+              );
+            },
+          },
+          {
+            title: "操作",
+            dataIndex: "voteSubmitId",
+            key: "voteSubmitId",
+            width: "10%",
+            align: "center",
+            ellipsis: true,
+            className: "h",
+            customRender: (value) => {
+                return (
+                <div
+                    style="color:#387df7;cursor:pointer"
+                    onClick={
+                        () => {
+                            if(value.record.finishStatus !== 3){
+                                message.destroy()
+                                message.error("当前任务未完成")
+                                return
+                            }
+                            {/* 当前投票提交的ID 用来查看投票详情 */}
+                            console.log(value.record.voteSubmitId);
+                            state.voteID = value.record.voteSubmitId;
+                            state.CVvisible = true;
+                    }}>
+                    {value.record.finishStatus == 3 ?
+                    <span style='color:#387df7;'> 查看 </span>
+                    :
+                    <span style='color:#999;'> 查看 </span>}
+                </div>
+                );
+            },
+          },
+        ];
+        return columns;
+      };
+  
+      const closeDrawer = () => {
+        ctx.emit("update:PjModelVisible", false);
+        state.currentPage = 1;
+        state.name = "";
+        state.projectName = undefined;
+        state.tabledata = [];
+      };
+      const afterVisibleChange = (bol) => {
+        if (bol == true) {
+          console.log("当前是什么类型", props.datasource.type);
+          state.tableDataTotalLoading = true;
+          {/* getData(); */}
+        }
+      };
+      const selectProjectName = (value) => {
+        state.projectName = value;
+      };
+      //催促
+      const godie = () => {
+        message.destroy();
+        message.success("催促" + props.title + "成功");
+      };
+      const onChange = (pageNumber) => {
+        console.log("Page: ", pageNumber);
+      };
+  
+      // 获取数据
+      function getData() {
+        if(props.datasource.type == 12){
+            console.log("我是传递的查询参数", {
+            "pageNo": state.currentPage,
+            "pageSize": state.pageSize,
+            "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId,
+            "status": state.projectName,
+            "studentName": state.name,
+            "targetId":props.datasource.projectId,
+            "taskId": props.datasource.courseId,
+            "type": 1
+          });
+          api.QueryVoteManagementDetail({
+            "pageNo": state.currentPage,
+            "pageSize": state.pageSize,
+            "chapterId": props.datasource.chapterId,
+            "status": state.projectName,
+            "studentName": state.name,
+            "targetId":props.datasource.routerId,
+            "taskId": props.datasource.courseId,
+            "type": 1
+          }).then(res=>{
+            console.log('投票数据获取', res)
+            if(res.data.code==200){
+              state.tableDataTotalLoading = false;
+              let newData = []
+              for(let i=0;i<res.data.data.rows.length;i++){
+                // 处理在线课字段和表格中字段保持一致
+                let obj = {
+                  studentUserNo: res.data.data.rows[i].studentCode,
+                  studentName: res.data.data.rows[i].studentName, 
+                  studentDepartName: res.data.data.rows[i].studentDepartName, 
+                  studentJobName: res.data.data.rows[i].studentJobName, 
+                  lastStudyTime: res.data.data.rows[i].submitTime,
+                  finishStatus: res.data.data.rows[i].status?res.data.data.rows[i].status:0,
+                  voteSubmitId: res.data.data.rows[i].voteSubmitId
+                }
+                newData.push(obj)
+              }
+              state.tabledata = newData;
+              state.courseID = props.datasource.courseId;
+              state.tableDataTotal = res.data.data.total;
+            }
+          }).catch(err=>{
+            console.log(err)
+            state.tableDataTotalLoading = false;
+          })
+        }else{
+          state.tableDataTotalLoading = false;
+          state.tabledata = [];
+        }
+      }
+  
+      // 搜索按钮
+      function searchTaskList() {
+        state.currentPage = 1;
+        state.tableDataTotalLoading = true;
+        getData();
+      }
+      // 重置按钮
+      function resetTaskList() {
+        state.tableDataTotalLoading = true;
+        state.currentPage = 1;
+        state.name = "";
+        state.projectName = undefined;
+        getData();
+      }
+  
+      //分页
+      const changePaginationStu = (page) => {
+        state.tableDataTotalLoading = true;
+        state.currentPage = page;
+        getData();
+      };
+  
+      // 导出数据
+      function exportTaskStu() {
+        console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.routerTaskId}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.routerTaskId}`)
+      }
+  
+      return {
+        ...toRefs(state),
+        selectProjectName,
+        closeDrawer,
+        afterVisibleChange,
+        tableDataFunc,
+        godie,
+        onMounted,
+        onUnmounted,
+        onChange,
+        searchTaskList,
+        resetTaskList,
+        changePaginationStu,
+        exportTaskStu,
+      };
+    },
+  };
+  </script>
+  
+  <style lang="scss">
+  .RouterProjectManage {
+    // overflow-x: auto;
+    .drawerMain {
+      min-width: 550px;
+      margin: 0px 32px 0px 32px;
+      overflow-x: auto;
+      display: flex;
+      flex-direction: column;
+      .noticebox {
+        width: 240px;
+        height: 64px;
+        background: rgba(255, 255, 255, 1);
+        border-radius: 4px;
+        position: absolute;
+        top: 161px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .notext {
+          color: rgba(51, 51, 51, 1);
+          font-size: 14px;
+          font-weight: 500;
+          margin-left: 20px;
+        }
+      }
+      .header {
+        height: 73px;
+        border-bottom: 1px solid #e8e8e8;
+        display: flex;
+        flex-shrink: 0;
+        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;
+        padding-right: 10px;
+        .endtime {
+          font-size: 16px;
+          font-weight: 500;
+          color: #333333;
+        }
+        .search {
+          width: 100%;
+          display: flex;
+          flex-wrap: wrap;
+          margin-top: 20px;
+          justify-content: space-between;
+  
+          .sealeft {
+            display: flex;
+            flex-wrap: wrap;
+            .namecon {
+              display: flex;
+              flex-wrap: nowrap;
+              margin-bottom: 10px;
+              .name {
+                margin-top: 8px;
+                white-space: nowrap;
+              }
+            }
+          }
+          .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: #4ea6ff;
+  
+              color: #ffffff;
+            }
+            .btn2 {
+              background: #ffffff;
+  
+              color: #4ea6ff;
+              border: 1px solid #4ea6ff;
+            }
+          }
+        }
+        .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: 18px;
+              height: 18px;
+              background-image: url(../../../assets/images/basicinfo/call.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;
+            }
+          }
+  
+          .btn1 {
+            background: #4ea6ff;
+  
+            color: #ffffff;
+          }
+          .btn2 {
+            background: #ffffff;
+  
+            color: #4ea6ff;
+            border: 1px solid #4ea6ff;
+          }
+        }
+        .tab {
+          th.h {
+            background-color: #eff4fc !important;
+          }
+  
+          .ant-table-tbody
+            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+            > td {
+            background: #f6f9fd;
+          }
+          .tableBox {
+            .pa {
+              // left: 0;
+              margin-top: 15px;
+              width: 100%;
+              // height: 20px;
+              // background-color: red;
+              display: flex;
+              justify-content: center;
+              // position: absolute;
+              // bottom: 20px;
+              .ant-pagination-prev,
+              .ant-pagination-next,
+              .ant-pagination-item,
+              .ant-pagination-options {
+                margin-bottom: 10px;
+              }
+            }
+          }
+        }
+      }
+  
+      .btnn {
+        height: 72px;
+        width: 100%;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        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>
+    

src/components/student/ChangeGroupModal.vue

@@ -0,0 +1,94 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-20 17:00:37
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2023-01-31 15:51:36
+ * @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <a-modal
+    style="padding: 0"
+    :closable="true"
+    :visible="changegroupV"
+    :footer="null"
+    centered="true"
+    wrapClassName="changeModal"
+  >
+    <div class="con">
+      <div class="header">
+        <div class="inhe">
+          <div class="mod"></div>
+          <div class="tz">换组</div>
+          <div class="mg" @click="closeChangeModal"></div>
+        </div>
+      </div>
+      <div class="mid">
+        <div class="inher">
+          <!-- <div class="cur">当前关卡：关卡2</div> -->
+          <div class="select">
+            <a-select
+              v-model:value="selectStage"
+              style="width: 100%"
+              placeholder="请选择小组"
+              :options="option"
+              allowClear
+            ></a-select>
+          </div>
+          <div class="btn">
+            <button
+              class="sameb btn1"
+              @click="closeChangeModal"
+              style="cursor: pointer"
+            >
+              取消
+            </button>
+            <button
+              class="sameb btn2"
+              @click="changeGroup"
+              style="cursor: pointer"
+            >
+              确定
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
+</template>
+<script setup>
+import { computed, defineEmits, defineProps, ref } from "vue";
+// import { moveStudent } from "@/api/index1";
+// import { message } from "ant-design-vue";
+
+const props = defineProps({
+  changegroupV: {
+    type: Boolean,
+    default: false,
+  },
+  stage: {
+    type: Array,
+    default: () => [],
+  },
+  ids: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const option = computed(() => {
+  return props.stage.map((e) => ({ label: e.name, value: e.id }));
+});
+console.log("changegroupV", props.changegroupV);
+const selectStage = ref();
+
+const emit = defineEmits({});
+
+const closeChangeModal = () => {
+  emit("update:changegroupV", false);
+};
+//确认换组
+const changeGroup = (item) => {
+  console.log("换组", item);
+};
+</script>

src/components/student/OwnerTableModelStudent.vue

@@ -1,7 +1,23 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2023-01-31 13:41:35
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2023-01-31 13:45:07
+ * @FilePath: /fe-manage/src/components/student/OwnerTableModelStudent.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <TableModelStudent :types="types" :id="id" ref="tableModelRef">
     <template #extension="{ data: { record } }">
-        <CommonStudent v-if="record.type===type" :type="type" :id="id" @finash="submitCall" :clear="true" :select-stu="true" :select-one="true">
+      <CommonStudent
+        v-if="record.type === type"
+        :type="type"
+        :id="id"
+        @finash="submitCall"
+        :clear="true"
+        :select-stu="true"
+        :select-one="true"
+      >
         <a-button type="link">转移归属权</a-button>
       </CommonStudent>
     </template>
@@ -21,12 +37,11 @@ defineProps({
     default: () => [],
   },
 });
-
+console.log("props", props.types);
-const tableModelRef = ref()
+const tableModelRef = ref();
 
 function submitCall(flag) {
-  tableModelRef.value.loading = true
+  tableModelRef.value.loading = true;
   flag && tableModelRef.value.searchStu();
 }
-
 </script>

src/components/student/TableStudent.vue

@@ -216,9 +216,19 @@
           <!--					</div>-->
           <a-space :size="2">
             <slot name="extension" v-bind:data="{ record }"></slot>
-            <a-button v-if="type === 1" @click="updateStatus(0, record.id)" type="link">换组</a-button>
+
-            <a-button v-if="type === 3 && record.status!==0" @click="updateStatus(0, record.id)" type="link">通过</a-button>
+            <a-button
-            <a-button v-if="type === 3 && record.status!==0" @click="updateStatus(2, record.id)" type="link">拒绝</a-button>
+              v-if="type === 3 && record.status !== 0"
+              @click="updateStatus(0, record.id)"
+              type="link"
+              >通过</a-button
+            >
+            <a-button
+              v-if="type === 3 && record.status !== 0"
+              @click="updateStatus(2, record.id)"
+              type="link"
+              >拒绝</a-button
+            >
             <a-button @click="del(record.id)" type="link" danger>删除</a-button>
           </a-space>
         </template>
@@ -423,7 +433,7 @@ const tablecolumns = ref([
     className: "h",
     ellipsis: true,
     customRender: ({ record: { studentOrgName, studentDepartName } }) =>
-      (allDepartShow(studentOrgName, studentDepartName)),
+      allDepartShow(studentOrgName, studentDepartName),
   },
   {
     title: "加入方式",
@@ -433,7 +443,15 @@ const tablecolumns = ref([
     align: "center",
     customRender: ({ record: { source } }) =>
       // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
-      ({ 0: "手动加入", 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名", 5: "手动加入", 6: "手动加入"}[source]),
+      ({
+        0: "手动加入",
+        1: "手动加入",
+        2: "手动加入",
+        3: "手动加入",
+        4: "报名",
+        5: "手动加入",
+        6: "手动加入",
+      }[source]),
   },
   ...props.columns,
   {
@@ -447,9 +465,14 @@ const tablecolumns = ref([
 ]);
 
 function allDepartShow(a, b) {
-  let org = (a=="" || a == null || a == undefined) ? a = "" : a.slice(0,1) =='/' ? a.slice(1,a.length) : a;
+  let org =
-  let depart = (b=="" || b == null || b == undefined) ? b = "" : b;
+    a == "" || a == null || a == undefined
-  let allname = org == "" && depart == "" ? '-' : org + depart;
+      ? (a = "")
+      : a.slice(0, 1) == "/"
+      ? a.slice(1, a.length)
+      : a;
+  let depart = b == "" || b == null || b == undefined ? (b = "") : b;
+  let allname = org == "" && depart == "" ? "-" : org + depart;
   return allname;
 }
 
@@ -565,14 +588,14 @@ function bathDel() {
 
 function del(id) {
   Modal.confirm({
-    title: () => '确定删除?',
+    title: () => "确定删除?",
     icon: () => createVNode(ExclamationCircleOutlined),
-    content: () => '数据删除后不可恢复！',
+    content: () => "数据删除后不可恢复！",
-    okText: () => '确定',
+    okText: () => "确定",
-    okType: 'danger',
+    okType: "danger",
-    cancelText: () => '取消',
+    cancelText: () => "取消",
     onOk() {
-      id && delStudentList({ids: [id]}).then(() => getStuList())
+      id && delStudentList({ ids: [id] }).then(() => getStuList());
     },
   });
 }
@@ -913,8 +936,6 @@ const AddImpStuvisibleClose = (isget) => {
       background-image: url("@/assets/images/coursewareManage/export.png");
     }
   }
-
- 
 }
 /*.delete {
   z-index: 9999;

src/views/courselibrary/CoursewareManage.vue

@@ -1719,18 +1719,18 @@ import { useStore } from "vuex";
 
 //列表表格
 const columns1 = [
-  // {
+  {
-  //   title: "序号",
+    title: "课程编号",
-  //   width: 100,
+    width: 100,
-  //   dataIndex: "num",
+    dataIndex: "num",
-  //   key: "num",
+    key: "num",
-  //   align: "center",
+    align: "center",
-  //   customRender: ({ index, record }) => {
+    customRender: ({ index, record }) => {
-  //     const pageNum =
+      const pageNum =
-  //       Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
-  //     return index + 1 + pageNum;
+      return index + 1 + pageNum;
-  //   },
+    },
-  // },
+  },
   {
     title: "名称",
     width: 400,

src/views/learningpath/LevelAdd.vue

@@ -195,7 +195,9 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="chapterOverviewList[choosedStageIndex]?.completeCourseRatio"
+                  :percent="
+                    chapterOverviewList[choosedStageIndex]?.completeCourseRatio
+                  "
                   :width="140"
                 />
                 <div class="protext">课程完成率</div>
@@ -204,7 +206,9 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="chapterOverviewList[choosedStageIndex]?.completeExamRatio"
+                  :percent="
+                    chapterOverviewList[choosedStageIndex]?.completeExamRatio
+                  "
                   :width="140"
                 />
                 <div class="protext">考试通过率</div>
@@ -213,39 +217,65 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="chapterOverviewList[choosedStageIndex]?.completeRatio"
+                  :percent="
+                    chapterOverviewList[choosedStageIndex]?.completeRatio
+                  "
                   :width="140"
                 />
                 <div class="protext">作业完成率</div>
               </div>
               <div class="proright">
                 <div class="pronub" style="margin-left: 142px">
-                  {{ chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalTaskCnt:0 }}
+                  {{
+                    chapterOverviewList[choosedStageIndex]
+                      ? chapterOverviewList[choosedStageIndex].totalTaskCnt
+                      : 0
+                  }}
                 </div>
                 <div class="proright1">
                   <span class="textpro">关卡任务总数</span>
                   <a-progress
-                    :percent="chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalTaskCnt:0"
+                    :percent="
+                      chapterOverviewList[choosedStageIndex]
+                        ? chapterOverviewList[choosedStageIndex].totalTaskCnt
+                        : 0
+                    "
                     style="width: 369px"
                   />
                 </div>
                 <div class="pronub" style="margin-left: 142px">
-                  {{ chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalReqCnt:0 }}
+                  {{
+                    chapterOverviewList[choosedStageIndex]
+                      ? chapterOverviewList[choosedStageIndex].totalReqCnt
+                      : 0
+                  }}
                 </div>
                 <div class="proright1">
                   <span class="textpro">必修课</span>
                   <a-progress
-                    :percent="chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalReqCnt:0"
+                    :percent="
+                      chapterOverviewList[choosedStageIndex]
+                        ? chapterOverviewList[choosedStageIndex].totalReqCnt
+                        : 0
+                    "
                     style="width: 369px"
                   />
                 </div>
                 <div class="pronub" style="margin-left: 142px">
-                  {{ chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalOptCnt:0 }}
+                  {{
+                    chapterOverviewList[choosedStageIndex]
+                      ? chapterOverviewList[choosedStageIndex].totalOptCnt
+                      : 0
+                  }}
                 </div>
                 <div class="proright1">
                   <span class="textpro">选修课</span>
                   <a-progress
-                    :percent="chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalOptCnt:0"
+                    :percent="
+                      chapterOverviewList[choosedStageIndex]
+                        ? chapterOverviewList[choosedStageIndex].totalOptCnt
+                        : 0
+                    "
                     style="width: 369px"
                   />
                 </div>
@@ -431,13 +461,19 @@
                         <a-progress
                           :showInfo="false"
                           :percent="
-                            parseInt((item.finishStuNum / item.totalStuNum) * 100)
+                            parseInt(
+                              (item.finishStuNum / item.totalStuNum) * 100
+                            )
                           "
                           strokeColor="#FFC067"
                           trailColor="rgba(253, 209, 98, 0.2)"
                         />
                         <span class="progresstext" style="margin-left: 10px"
-                          >{{parseInt((item.finishStuNum / item.totalStuNum) * 100) || 0}}%</span
+                          >{{
+                            parseInt(
+                              (item.finishStuNum / item.totalStuNum) * 100
+                            ) || 0
+                          }}%</span
                         >
                       </div>
                     </div>
@@ -500,6 +536,8 @@
                             ? evaluationModel(item, value.name)
                             : item.type === 12
                             ? voteModel(item, value.name)
+                            : item.type === 13
+                            ? projectModel(item, value.name)
                             : null
                         "
                       >
@@ -1273,6 +1311,15 @@
       :levelName="voteLevelName"
     />
     <!-- 投票管理抽屉 结束-->
+
+    <!-- 项目管理抽屉 开始-->
+    <router-project-manage
+      v-model:PjModelVisible="pjModelVisible"
+      :title="pjModelVisibleTitle"
+      :datasource="pjData"
+      :levelName="pjLevelName"
+    />
+    <!-- 项目管理抽屉 结束-->
   </div>
 </template>
 <script>
@@ -1310,6 +1357,7 @@ import RouterEvaluationManage from "../../components/drawers/router/RouterEvalua
 import RouterHomeworkManage from "../../components/drawers/router/RouterHomeworkManage";
 import RouterCommonManage from "../../components/drawers/router/RouterCommonManage";
 import RouterVoteManage from "../../components/drawers/router/RouterVoteManage";
+import RouterProjectManage from "../../components/drawers/router/RouterProjectManage";
 
 export default {
   name: "LevelAdd",
@@ -1333,12 +1381,14 @@ export default {
     RouterEvaluationManage,
     RouterHomeworkManage,
     RouterCommonManage,
-    RouterVoteManage
+    RouterVoteManage,
+    RouterProjectManage,
   },
   setup() {
     const router = useRouter();
     // const store = useStore();
     const state = reactive({
+      pjModelVisible: false,
       hasTask: false,
       stage: [],
       statess: [],
@@ -1504,19 +1554,22 @@ export default {
       previewEndNum: 0,
       studyStartNum: 0,
       studyEndNum: 0,
-
+      pjModelVisible: false,
       faceTeachModelVisible: false,
       examinationModelVisible: false,
       evaluationModelVisible: false,
       homeworkModelVisible: false,
       commonModelVisible: false,
       voteModelVisible: false,
+      projectModelVisible: false,
       faceTeachModelVisibleTitle: "",
       examinationModelVisibleTitle: "",
       evaluationModelVisibleTitle: "",
       homeworkModelVisibleTitle: "",
       commonModelVisibleTitle: "",
       voteModelVisibleTitle: "",
+      projectModelVisibleTitle: "",
+      pjModelVisibleTitle: "",
 
       faceData: "",
       examinationData: "",
@@ -1525,10 +1578,14 @@ export default {
       commonData: "",
       liveData: "",
       voteData: "",
+      projectData: "",
+      pjData: "",
       commonLevelName: "",
       examLevelName: "",
       evaluationLevelName: "",
       voteLevelName: "",
+      projectLevelName: "",
+      pjLevelName: "",
 
       facestudent: "",
       locationHref:
@@ -1843,6 +1900,15 @@ export default {
       state.voteData = data;
       // 投票弹框名称 RouterVoteManage
     };
+    // 项目点击管理弹框
+    const projectModel = (data, levelsName) => {
+      console.log(data, levelsName);
+      state.pjModelVisible = true;
+      state.pjLevelName = levelsName;
+      state.pjModelVisibleTitle = data.name;
+      state.pjData = data;
+      // 项目弹框名称 RouterProjectManage
+    };
     // 作业点击管理弹框
     const homeworkModel = (data) => {
       console.log(data);
@@ -2094,13 +2160,17 @@ export default {
     const reget = () => {
       GetRouterDetail(state.routerId, "N").then((res) => {
         console.log("获取路径图详情", res);
-        console.log(!!res.data.data?.chapterList.some(({taskList})=>taskList.length));
+        console.log(
+          !!res.data.data?.chapterList.some(({ taskList }) => taskList.length)
+        );
         state.styTitle = res.data.data.routerInfo.name;
         state.cretime = res.data.data.routerInfo.createTime;
         state.picUrl = res.data.data.routerInfo.picUrl;
         state.action = res.data.data.routerInfo.status;
         state.remark = res.data.data.routerInfo.remark;
-        state.hasTask = !!res.data.data?.chapterList.some(({taskList})=>taskList.length);
+        state.hasTask = !!res.data.data?.chapterList.some(
+          ({ taskList }) => taskList.length
+        );
         state.act =
           state.action == 0
             ? "发布"
@@ -2115,7 +2185,7 @@ export default {
     const getOverview = () => {
       getRouterOverview(state.routerId)
         .then((res) => {
-          console.log('学习路径图概览数据获取', res);
+          console.log("学习路径图概览数据获取", res);
           Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
             levelList.routerInfoOverview[item] =
               res.data.data.routerInfoOverview[item] || 0;
@@ -2635,6 +2705,7 @@ export default {
       examinationModel,
       evaluationModel,
       voteModel,
+      projectModel,
       homeworkModel,
       commonModel,
       downloadFile,

src/views/projectcenter/ProjectAdd.vue

@@ -3,8 +3,7 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-      >{{
+        >{{ projectInfo.projectId ? "编辑" : "创建"
-          projectInfo.projectId ? "编辑" : "创建"
         }}{{ ptojectType == "3" ? "班级" : "项目" }}</span
       >
       <div
@@ -194,30 +193,28 @@
           </div>
           <div class="in ggysxz" v-if="courseSyncFlag">
             <!-- :disabled="viewDetail ? true : false" -->
-            <a-checkbox
+            <a-checkbox v-model:checked="courseSyncFlag" disabled>
-                v-model:checked="courseSyncFlag"
-                disabled>
               <span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">
+                "
+              >
                 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
               </span>
             </a-checkbox>
           </div>
           <div class="in" v-else>
             <!-- :disabled="viewDetail ? true : false" -->
-            <a-checkbox
+            <a-checkbox v-model:checked="courseSyncFlag" disabled>
-                v-model:checked="courseSyncFlag"
-                disabled>
               <span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">
+                "
+              >
                 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
               </span>
             </a-checkbox>
@@ -306,7 +303,6 @@ import * as api2 from "../../api/indexAudit";
 import { validateName } from "@/api/index1";
 import dayjs from "dayjs";
 import { scrollLoad } from "@/api/method";
-
 export default {
   name: "projectAdd",
   components: {
@@ -379,7 +375,9 @@ export default {
               ...res.data.data.projectInfo,
               ...state.projectInfo,
             };
-            !routers.query.projectId && !!routers.query.parentId && (state.projectInfo.name = '')
+            !routers.query.projectId &&
+              !!routers.query.parentId &&
+              (state.projectInfo.name = "");
             state.projectInfo.rangeTime = [
               state.projectInfo.beginTime,
               state.projectInfo.endTime,
@@ -504,9 +502,9 @@ export default {
       }
       state.projectInfo.type = 3;
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
-      state.loading = true
+      state.loading = true;
       api.createProject(state.projectInfo).then((res) => {
-        state.loading = false
+        state.loading = false;
         message.destroy();
         message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
         // router.back();
@@ -519,14 +517,14 @@ export default {
     };
 
     function managerChange(e, l, d, t, orgName) {
-      console.log(e, l)
+      console.log(e, l);
-      state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongId = d;
-      state.projectInfo.sourceBelongName = t
+      state.projectInfo.sourceBelongName = t;
-      state.projectInfo.sourceBelongFullName = orgName
+      state.projectInfo.sourceBelongFullName = orgName;
     }
 
     const disabledDate = (current) => {
-      return current && current < dayjs().startOf('day');
+      return current && current < dayjs().startOf("day");
     };
 
     return {
@@ -545,10 +543,9 @@ export default {
 };
 </script>
 <style lang="scss">
-
 .ggysxz {
   .ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
-    border-color: #FFF !important;
+    border-color: #fff !important;
   }
   .ant-checkbox-disabled .ant-checkbox-inner {
     background-color: #1890ff !important;

src/views/projectcenter/TaskPage.vue

@@ -334,7 +334,7 @@
                 :key="item.stageId"
                 @click="stageChange(item, index)"
               >
-                {{ item.name || '无阶段' }}
+                {{ item.name || "无阶段" }}
               </div>
               <!-- <div class="stage1">阶段1</div>
               <div class="stage2">阶段2</div> -->
@@ -348,7 +348,9 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="stageOverviewList[choosedStageIndex]?.completeCourseRatio"
+                  :percent="
+                    stageOverviewList[choosedStageIndex]?.completeCourseRatio
+                  "
                   :width="140"
                 />
                 <div class="protext">课程完成率</div>
@@ -357,7 +359,9 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="stageOverviewList[choosedStageIndex]?.completeExamRatio"
+                  :percent="
+                    stageOverviewList[choosedStageIndex]?.completeExamRatio
+                  "
                   :width="140"
                 />
                 <div class="protext">考试通过率</div>
@@ -378,7 +382,9 @@
                 <div class="proright1">
                   <span class="textpro">阶段任务总数</span>
                   <a-progress
-                    :percent="stageOverviewList[choosedStageIndex]?.totalTaskCnt"
+                    :percent="
+                      stageOverviewList[choosedStageIndex]?.totalTaskCnt
+                    "
                     style="width: 369px"
                   />
                 </div>
@@ -540,17 +546,27 @@
                       </div>
                       <div class="progress">
                         <div class="progresstext">
-                          {{item.finishStuCnt || 0 }}/{{item.totalStuCnt || 0}}人
+                          {{ item.finishStuCnt || 0 }}/{{
+                            item.totalStuCnt || 0
+                          }}人
                         </div>
                         <div style="display: flex">
                           <a-progress
                             :showInfo="false"
-                            :percent="parseInt((item.finishStuCnt / item.totalStuCnt) * 100)"
+                            :percent="
+                              parseInt(
+                                (item.finishStuCnt / item.totalStuCnt) * 100
+                              )
+                            "
                             strokeColor="#FFC067"
                             trailColor="rgba(253, 209, 98, 0.2)"
                           />
                           <span class="progresstext" style="margin-left: 10px"
-                            >{{parseInt((item.finishStuCnt / item.totalStuCnt) * 100) || 0 }}%</span
+                            >{{
+                              parseInt(
+                                (item.finishStuCnt / item.totalStuCnt) * 100
+                              ) || 0
+                            }}%</span
                           >
                         </div>
                       </div>
@@ -701,11 +717,120 @@
                   :visable="tabFlag"
                 >
                   <template #extension="{ data: { record } }">
-                    <a-button @click="showStudent(record)" type="link">查看</a-button>
+                    <a-button @click="showStudent(record)" type="link"
-                    <a-button @click="settingTopFlag(record)" type="link">{{ record.topFlag ? "取消优秀" : "优秀学员" }}</a-button>
+                      >查看</a-button
+                    >
+                    <a-button @click="settingTopFlag(record)" type="link">{{
+                      record.topFlag ? "取消优秀" : "优秀学员"
+                    }}</a-button>
+                    <a-button type="link" @click="showChangeGroupModal()"
+                      >换组</a-button
+                    >
                   </template>
                 </TableStudent>
               </a-tab-pane>
+
+              <a-tab-pane key="9" tab="小组管理" force-render>
+                <div class="group">
+                  <div class="groupleft">
+                    <div class="groupname">小组名称：</div>
+                    <a-input
+                      v-model:value="valuestugn"
+                      placeholder="请输入小组名称"
+                    />
+                  </div>
+                  <div class="groupright">
+                    <div class="btn1" @click="searchGroup">
+                      <img src="../../assets/images/courseManage/search0.png" />
+                      <span class="btn1text">搜索</span>
+                    </div>
+                    <div class="btn2" @click="resetGroupName">
+                      <img src="../../assets/images/courseManage/reset1.png" />
+                      <span class="btn2text">重置</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="second2">
+                  <div class="btn1" @click="showModal2(1, null)">
+                    <img src="../../assets/images/courseManage/add0.png" />
+                    <span class="btn1text">创建小组</span>
+                  </div>
+                  <div class="btn2" @click="showSubset">
+                    <img src="../../assets/images/courseManage/reset2.png" />
+                    <span class="btn2text">随机分组</span>
+                  </div>
+                  <div class="btn2">
+                    <span class="btn2text">导出小组</span>
+                  </div>
+                  <div class="btn2">
+                    <span class="btn2text">导入小组长</span>
+                  </div>
+                </div>
+                <!-- 小组列表  -->
+                <div class="groupmain">
+                  <div
+                    class="groupbox"
+                    v-for="item in groupList"
+                    :key="item.projectGroupId"
+                  >
+                    <div style="width: 90%">
+                      <div class="grouptitle">
+                        <div class="goodgruop">{{ item.groupName }}</div>
+                        <div class="more">
+                          <span
+                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
+                            >. . .</span
+                          >
+                          <div class="moreItems">
+                            <div class="sammo" @click="showModal2(2, item)">
+                              编辑
+                            </div>
+                            <div
+                              class="sammo"
+                              @click="deleteGroupBtn(item.projectGroupId)"
+                            >
+                              删除
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="leader">组长：{{ item.leaderName }}</div>
+                      <div class="grocenter">
+                        <div class="leader1">进度</div>
+                        <a-progress :percent="item.completeRatio" />
+                      </div>
+                      <div
+                        class="grofooter"
+                        @click="showMemberList(item.projectGroupId)"
+                      >
+                        <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>
+              </a-tab-pane>
             </a-tabs>
           </div>
         </a-tab-pane>
@@ -723,11 +848,9 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-        <!-- 2022-11-30注释 后面放开 -->
         <a-tab-pane key="5" tab="项目积分">
           <ProjectScore :projectId="projectId"></ProjectScore>
         </a-tab-pane>
-        <!-- 2022-11-30注释 后面放开 -->
         <a-tab-pane key="6" tab="排行榜">
           <div class="split"></div>
           <div class="content6">
@@ -735,7 +858,6 @@
             <div class="line"></div>
             <div class="search">
               <div class="left">
-               
                 <div class="time">
                   <div class="text">选择时间：</div>
                   <a-range-picker
@@ -846,35 +968,109 @@
         <a-tab-pane key="7" tab="证书">
           <div class="split"></div>
           <!-- 没有证书显示的页面 -->
-          <div v-if="3>7" style="display:flex; justify-content:center; align-items:center;height: 600px;flex-direction:column;">
+          <div
+            v-if="3 > 7"
+            style="
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              height: 600px;
+              flex-direction: column;
+            "
+          >
             <img
               src="@/assets/images/nodata.png"
-              style=" width: 212px; height: 212px;"
+              style="width: 212px; height: 212px"
               alt=""
             />
-            <button class="xkbtn11" @click="addCertificate">
+            <button class="xkbtn11" @click="addCertificate">添加证书</button>
-              添加证书
-            </button>
           </div>
           <!-- 有证书显示的页面 -->
-          <div v-else style="padding: 36px; display: flex;min-height: 400px;">
+          <div v-else style="padding: 36px; display: flex; min-height: 400px">
-            <div style="width:170px;height:200px;border:1px solid #b1b3b8;display: flex;justify-content: center;align-items: center;color: #4ea6ff;cursor: pointer;" @click="addCertificate">
+            <div
+              style="
+                width: 170px;
+                height: 200px;
+                border: 1px solid #b1b3b8;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                color: #4ea6ff;
+                cursor: pointer;
+              "
+              @click="addCertificate"
+            >
               <div class="ant-upload-text">+添加证书</div>
             </div>
 
-            <div style="width:170px;height:200px;border:1px solid #b1b3b8;margin-left: 32px;display: flex;justify-content: center;align-items: center;flex-direction:column;">
+            <div
+              style="
+                width: 170px;
+                height: 200px;
+                border: 1px solid #b1b3b8;
+                margin-left: 32px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                flex-direction: column;
+              "
+            >
               <img
                 @click="previewPic"
                 style="cursor: pointer"
                 width="140"
                 height="160"
-                src="https://picb6.photophoto.cn/32/552/32552236_1.jpg" alt="" srcset="">
+                src="https://picb6.photophoto.cn/32/552/32552236_1.jpg"
-              <div style="display:flex;height: 26px;justify-content: space-around;align-items: center;">
+                alt=""
-                <div style="font-size:14px; width: 85px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">培训认证证书</div>
+                srcset=""
-                <div style="font-size:12px;color:#999;width:50px;margin-left: 6px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">完成项目</div>
+              />
-                <div style="cursor:pointer;position: relative;">
+              <div
+                style="
+                  display: flex;
+                  height: 26px;
+                  justify-content: space-around;
+                  align-items: center;
+                "
+              >
+                <div
+                  style="
+                    font-size: 14px;
+                    width: 85px;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                  "
+                >
+                  培训认证证书
+                </div>
+                <div
+                  style="
+                    font-size: 12px;
+                    color: #999;
+                    width: 50px;
+                    margin-left: 6px;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                  "
+                >
+                  完成项目
+                </div>
+                <div style="cursor: pointer; position: relative">
                   ...
-                  <div style="position:absolute;width: 45px;height: 60px;background: #fff;display: flex;flex-direction: column;justify-content: center;align-items: center;border: 1px solid #b1b3b8;">
+                  <div
+                    style="
+                      position: absolute;
+                      width: 45px;
+                      height: 60px;
+                      background: #fff;
+                      display: flex;
+                      flex-direction: column;
+                      justify-content: center;
+                      align-items: center;
+                      border: 1px solid #b1b3b8;
+                    "
+                  >
                     <div style="font-size: 12px; color: #999">查看</div>
                     <div style="font-size: 12px; color: #999">编辑</div>
                     <div style="font-size: 12px; color: #999">删除</div>
@@ -1027,7 +1223,13 @@
                         >
                         <img
                           src="@/assets/images/basicinfo/cloud.png"
-                          style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;"
+                          style="
+                            cursor: pointer;
+                            width: 24px;
+                            height: 24px;
+                            margin-left: 8px;
+                            margin-bottom: 3px;
+                          "
                           alt=""
                         />
                       </a-upload>
@@ -1062,26 +1264,74 @@
                           "
                           alt=""
                         /> -->
-                        <img v-if="
+                        <img
+                          v-if="
                             item.name.indexOf('jpg') !== -1 ||
                             item.name.indexOf('jpeg') !== -1 ||
                             item.name.indexOf('png') !== -1
                           "
-                            style="width: 27px;height: 32px;margin-right: 40px;"
+                          style="width: 27px; height: 32px; margin-right: 40px"
-                            src="@/assets/images/coursewareManage/pngpic.png" />
+                          src="@/assets/images/coursewareManage/pngpic.png"
+                        />
                         <div v-else>
-                          <img v-if="item.name.indexOf('doc') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
+                          <img
+                            v-if="item.name.indexOf('doc') !== -1"
+                            style="
+                              width: 27px;
+                              height: 32px;
+                              margin-right: 40px;
+                            "
+                            src="@/assets/images/coursewareManage/docpic.png"
+                          />
                           <div v-else>
-                            <img v-if="item.name.indexOf('xls') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/xlspic.png" />
+                            <img
+                              v-if="item.name.indexOf('xls') !== -1"
+                              style="
+                                width: 27px;
+                                height: 32px;
+                                margin-right: 40px;
+                              "
+                              src="@/assets/images/coursewareManage/xlspic.png"
+                            />
                             <div v-else>
-                              <img v-if="item.name.indexOf('ppt') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pptpic.png" />
+                              <img
+                                v-if="item.name.indexOf('ppt') !== -1"
+                                style="
+                                  width: 27px;
+                                  height: 32px;
+                                  margin-right: 40px;
+                                "
+                                src="@/assets/images/coursewareManage/pptpic.png"
+                              />
                               <div v-else>
-                                <img v-if="item.name.indexOf('pdf') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pdfpic.png" />
+                                <img
+                                  v-if="item.name.indexOf('pdf') !== -1"
+                                  style="
+                                    width: 27px;
+                                    height: 32px;
+                                    margin-right: 40px;
+                                  "
+                                  src="@/assets/images/coursewareManage/pdfpic.png"
+                                />
                                 <div v-else>
-                                  <img v-if="item.name.indexOf('zip') !== -1"
+                                  <img
-                                    style="width: 27px;height: 32px;margin-right: 40px;"
+                                    v-if="item.name.indexOf('zip') !== -1"
-                                    src="@/assets/images/coursewareManage/zippic.png" />
+                                    style="
-                                  <img v-else  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
+                                      width: 27px;
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/zippic.png"
+                                  />
+                                  <img
+                                    v-else
+                                    style="
+                                      width: 27px;
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/docpic.png"
+                                  />
                                 </div>
                               </div>
                             </div>
@@ -1101,8 +1351,14 @@
                         >
                         <a
                           href="javascript:void(0);"
-                          @click="downloadFile(item.response ? item.response.data : '')"  
+                          @click="
-                          style="margin-left: 5px">下载</a>
+                            downloadFile(
+                              item.response ? item.response.data : ''
+                            )
+                          "
+                          style="margin-left: 5px"
+                          >下载</a
+                        >
                         <span
                           style="color: #4ea6ff; float: right; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -1114,7 +1370,6 @@
                 </div>
               </div>
             </a-tab-pane>
-           
           </a-tabs>
         </a-tab-pane>
       </a-tabs>
@@ -1174,14 +1429,10 @@
     />
 
     <!-- 添加证书抽屉 -->
-    <AddCertificate 
+    <AddCertificate v-model:ACertificate="ACertificate" />
-      v-model:ACertificate="ACertificate"
-    />
 
     <!-- 创建证书抽屉 -->
-    <CreateCertificate 
+    <CreateCertificate v-model:CCertificate="CCertificate" />
-      v-model:CCertificate="CCertificate"
-    />
 
     <!-- 预览 -->
     <a-modal
@@ -1189,12 +1440,15 @@
       width="60%"
       :footer="null"
       v-model:visible="modal1Visible"
-      style="display:flex; justify-content:center; align-items:center;"
+      style="display: flex; justify-content: center; align-items: center"
       @ok="setModal1Visible(false)"
     >
       <img
         :width="screenWidth * 0.55"
-        src="https://picb6.photophoto.cn/32/552/32552236_1.jpg" alt="" srcset="">
+        src="https://picb6.photophoto.cn/32/552/32552236_1.jpg"
+        alt=""
+        srcset=""
+      />
     </a-modal>
 
     <!-- 学员（小组管理）创建小组抽屉 -->
@@ -1792,6 +2046,10 @@
       type="课程二维码"
     />
     <!-- 二维码弹窗 -->
+
+    <!-- 换组弹窗 -->
+    <ChangeGroupModal v-model:changegroupV="changegroupV" />
+    <!-- 换组弹窗 -->
   </div>
 </template>
 <script>
@@ -1847,6 +2105,7 @@ import TrainClass from "@/components/project/TrainClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import TableStudent from "@/components/student/TableStudent";
 import { getStuPage } from "@/api/index1";
+import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
 export default {
   name: "taskPage",
   components: {
@@ -1877,7 +2136,8 @@ export default {
     TableStudent,
     AddCertificate,
     CreateCertificate,
-    ProjectVoteManage
+    ProjectVoteManage,
+    ChangeGroupModal,
   },
   setup() {
     const store = useStore();
@@ -1915,7 +2175,11 @@ export default {
           ellipsis: true,
           customRender: ({ record }) => (
             <div>
-              {record.finishTaskNum ==0?"未开始":record.finishTaskNum == record.totalTaskNum?"已完成":"进行中"}
+              {record.finishTaskNum == 0
+                ? "未开始"
+                : record.finishTaskNum == record.totalTaskNum
+                ? "已完成"
+                : "进行中"}
             </div>
           ),
         },
@@ -2515,7 +2779,7 @@ export default {
       showWorkText: "",
       //直播、活动页面传递参数
       showkaoqinText: "直播",
-      liveData:'',
+      liveData: "",
       //所有抽屉的传过去的type
       itemstype: null,
 
@@ -2567,11 +2831,13 @@ export default {
       evaltype: "",
       evalData: "",
       voteData: "",
-      voteModelVisibleTitle:'',
+      voteModelVisibleTitle: "",
-      voteLevelName:'',
+      voteLevelName: "",
       facestudent: "",
 
       modal1Visible: false, // 证书预览
+
+      changegroupV: false, //换组弹窗
     });
 
     const levelList = reactive({
@@ -2593,7 +2859,7 @@ export default {
           totalTaskCnt: 0,
           totalReqCnt: 0,
           totalOptCnt: 0,
-        }
+        },
       ],
       stageList: [
         // 阶段列表
@@ -2634,7 +2900,7 @@ export default {
                 }
               }
             }
-            levelList.stageList = res.data.data.stageList
+            levelList.stageList = res.data.data.stageList;
             //暂时传个固定的id用 到时候看数据里面是否有在更换
             // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
             let leng = res.data.data.stageList.length;
@@ -2777,6 +3043,12 @@ export default {
       state.canclestu1 = false;
     };
 
+    //显示学员换组弹窗
+    const showChangeGroupModal = () => {
+      state.changegroupV = true;
+      console.log("点击换组", state.changegroupV);
+    };
+
     const showModal2 = (classify, item) => {
       state.stuMemberClassify = classify;
       state.projectGroupId =
@@ -2848,10 +3120,12 @@ export default {
       state.chooseGroupId = id;
     };
     //活动考勤的抽屉
-    {/* const showAA = (title) => {
+    {
+      /* const showAA = (title) => {
       state.AAvisible = true;
       state.showkaoqinText = title;
-    }; */}
+    }; */
+    }
     //考勤的抽屉
     const showAA = (course, a, data) => {
       state.AAvisible = true;
@@ -2866,14 +3140,16 @@ export default {
       state.projectTaskId = id;
       state.projectTaskInfo = item;
     };
-    {/* 直播管理的抽屉 */}
+    {
+      /* 直播管理的抽屉 */
+    }
     const showVote = (name, id, data) => {
-      console.log(name, id, data)
+      console.log(name, id, data);
       state.projectVoteModelVisible = true;
       state.voteData = data;
       state.voteModelVisibleTitle = name;
-      state.voteLevelName = '无阶段任务';
+      state.voteLevelName = "无阶段任务";
-    }
+    };
     //考试管理的抽屉
     const showTest = (name, id, data) => {
       state.examData = data;
@@ -3609,7 +3885,9 @@ export default {
           state.noticeFlag = info.noticeFlag;
           state.switchopen = info.attachSwitch == 1 ? true : false;
           state.docChecked = info.attachSwitch == 1 ? true : false;
-          state.hasTask = !!res.data.data?.stageList.some(({taskList})=>taskList.length);
+          state.hasTask = !!res.data.data?.stageList.some(
+            ({ taskList }) => taskList.length
+          );
           // state.attach = info.attach;
           // state.templateId = info.templateId;
           state.sourceBelong =
@@ -4232,9 +4510,9 @@ export default {
 
     // 共享文档文件下载
     const downloadFile = (url) => {
-      console.log(url)
+      console.log(url);
       if (url) {
-        window.open(url)
+        window.open(url);
       }
       // if(url){
       //   const filename = '操作指南'
@@ -4251,13 +4529,15 @@ export default {
       //   }
       //   x.send()
       // }
-    }
+    };
     function stageChange(item, index) {
-      state.choosedStageId = item.stageId
+      state.choosedStageId = item.stageId;
       state.choosedStageIndex = index;
     }
 
-    {/* 证书 */}
+    {
+      /* 证书 */
+    }
     function addCertificate() {
       state.ACertificate = true;
     }
@@ -4344,6 +4624,7 @@ export default {
       searchGroup,
       cancelyou,
       cancelcanyou,
+      showChangeGroupModal,
       changePaginationStu,
       handleChange,
       toEdit,
@@ -4376,7 +4657,7 @@ export default {
       checkType,
       downloadFile,
       addCertificate,
-      previewPic
+      previewPic,
     };
   },
 };
@@ -5952,7 +6233,7 @@ export default {
 
       .groupright {
         display: flex;
-
+        margin-left: 48px;
         .btn1 {
           width: 100px;
           height: 40px;