From a09bbd6fde1fd0bfadfd977d95f062cfd6b0b707 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 4 Dec 2022 17:51:53 +0800
Subject: [PATCH] =?UTF-8?q?--=E9=A1=B9=E7=9B=AE=20=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectManage.vue |    1 +
 src/views/projectcenter/TaskAdd.vue       |  195 +--
 src/views/projectcenter/TaskPage.vue      | 1717 +++++++++++----------
 3 files changed, 962 insertions(+), 951 deletions(-)

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 889990b4..93034fa7 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1526,6 +1526,7 @@ export default {
                               onClick={() => {
                                 router.push({
                                   path: "/taskpage",
+                                  query: {projectId: value.record.projectId}
                                 });
                                 storage.set("projectId", value.record.projectId);
                               }}
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index e0431530..9201c955 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1027,7 +1027,7 @@
 </template>
 
 <script>
-import {reactive, toRefs, onMounted, onUnmounted, onUpdated} from "vue";
+import {reactive, toRefs, onMounted, onUnmounted, onUpdated, watch} from "vue";
 import AddOnline from "../../components/drawers/AddOnline.vue";
 import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
 import AddCase from "../../components/drawers/AddCase.vue";
@@ -1048,7 +1048,7 @@ import draggable from "vuedraggable";
 import {storage} from "../../api/storage";
 // import UnlockMode from "../../components/drawers/UnlockMode.vue";
 // import * as api1 from "../../api/index1";
-import {useRouter} from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 
 export default {
   name: "TaskAdd",
@@ -1070,10 +1070,9 @@ export default {
   },
   setup() {
     const router = useRouter();
+    const route = useRoute();
     const state = reactive({
-      projectId: storage.get("projectId")
-          ? JSON.parse(storage.get("projectId"))
-          : null,
+      projectId: route.query.projectId,
       chooseStageId: null,
       removeStageId: null,
       edit: false,
@@ -1160,6 +1159,10 @@ export default {
       console.log("visible", bool);
     };
 
+    watch(route, () => {
+      console.log(route)
+    })
+
     // 把数据放到state里
     const getTableData = (tableData) => {
       let data = tableData;
@@ -1360,90 +1363,86 @@ export default {
 
     //获取任务列表
     const getTask = async () => {
-      // console.log("state.projectId", state.projectId);
       let obj = {
         projectId: state.projectId,
-        // projectId: 28,
       };
       await api
           .getTask(obj)
           .then((res) => {
-            if (res.status == 200) {
-              console.log("22222", res.data.data.stageList);
-              // console.log("22222", res.data.data.stageList);
-              state.projectTitle = res.data.data.projectInfo.name;
-              state.picUrl = res.data.data.projectInfo.picUrl;
-              state.stageList = res.data.data.stageList;
-              let leng = res.data.data.stageList.length;
-              if (leng > 0) {
-                let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null;
-
-                // console.log("stage",Object.prototype.toString.call(stage))
-                getStageData(res.data.data.stageList);
-                if (stage != null) {
-                  console.log(stage);
-                  let stageList = res.data.data.stageList; //阶段数组
-                  let result = stageList.find((item) => item.stageId == stage);
-                  console.log("又找到了", result);
-                  if (result != null) {
-                    getTableData(result.taskList);
-                  } else {
-                    //没有选中的阶段时，获取全部的任务
-                    console.log(stage);
-                    let stageList = res.data.data.stageList; //阶段数组
-                    if (stageList != null) {
-                      let taskListAll;
-                      stageList.forEach((item) => {
-                        taskListAll = [...item.taskList];
-                      });
-                      console.log("taskListAll", taskListAll);
-                      getTableData(taskListAll);
-                    }
-                  }
-                } else {
-                  console.log(stage);
-                  let stageList = res.data.data.stageList; //阶段数组
-                  if (stageList != null) {
-                    let taskListAll;
-                    stageList.forEach((item) => {
-                      taskListAll = [...item.taskList];
-                    });
-                    console.log("taskListAll", taskListAll);
-                    getTableData(taskListAll);
-                  }
-                }
-                // 每次都获取了第一条taskList
-                // let arr = res.data.data.stageList[0].taskList;
-                // console.log("任务列表", stage, arr);
-                // getTableData(arr);
-              }
-              // //获取阶段列表
-              let stagearr = res.data.data.stageList;
-              // let arrlist = state.curLevel;
-              console.log(stagearr, 111111);
-              if (stagearr.length > 0) {
-                getStageData(stagearr);
-                // stagearr.map((value) => {
-                //   console.log(value);
-                //   // arrlist.push(value);
-                // });
-              }
-              //给阶段id赋初始值
-              let stageid = localStorage.getItem("stageId")
-                  ? localStorage.getItem("stageId")
-                  : null;
-              if (stageid !== "null") {
-                state.chooseStageId = stageid;
-              } else {
-                state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
-              }
-              let final = state.level.find((item) => item.id == state.chooseStageId);
-              getTableData(final.taskList);
-            }
+            console.log("22222", res.data.data.stageList);
+            state.projectTitle = res.data.data.projectInfo.name;
+            state.picUrl = res.data.data.projectInfo.picUrl;
+            state.stageList = res.data.data.stageList;
+            getStageData(res.data.data.stageList);
+            updateStageChoosd()
+            // let leng = res.data.data.stageList.length;
+            // if (leng > 0) {
+            //   let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null;
+            //
+            //   // console.log("stage",Object.prototype.toString.call(stage))
+            //   if (stage != null) {
+            //     console.log(stage);
+            //     let stageList = res.data.data.stageList; //阶段数组
+            //
+            //
+            //
+            //     let result = stageList.find((item) => item.stageId == stage);
+            //     console.log("又找到了", result);
+            //     if (result != null) {
+            //       getTableData(result.taskList);
+            //     } else {
+            //       //没有选中的阶段时，获取全部的任务
+            //       console.log(stage);
+            //       let stageList = res.data.data.stageList; //阶段数组
+            //       if (stageList != null) {
+            //         let taskListAll;
+            //         stageList.forEach((item) => {
+            //           taskListAll = [...item.taskList];
+            //         });
+            //         console.log("taskListAll", taskListAll);
+            //         getTableData(taskListAll);
+            //       }
+            //     }
+            //   } else {
+            //     console.log(stage);
+            //     let stageList = res.data.data.stageList; //阶段数组
+            //     if (stageList != null) {
+            //       let taskListAll;
+            //       stageList.forEach((item) => {
+            //         taskListAll = [...item.taskList];
+            //       });
+            //       console.log("taskListAll", taskListAll);
+            //       getTableData(taskListAll);
+            //     }
+            //   }
+            //   // 每次都获取了第一条taskList
+            //   // let arr = res.data.data.stageList[0].taskList;
+            //   // console.log("任务列表", stage, arr);
+            //   // getTableData(arr);
+            // }
+            // // //获取阶段列表
+            // let stagearr = res.data.data.stageList;
+            // // let arrlist = state.curLevel;
+            // console.log(stagearr, 111111);
+            // if (stagearr.length > 0) {
+            //   getStageData(stagearr);
+            //   // stagearr.map((value) => {
+            //   //   console.log(value);
+            //   //   // arrlist.push(value);
+            //   // });
+            // }
+            // //给阶段id赋初始值
+            // let stageid = localStorage.getItem("stageId")
+            //     ? localStorage.getItem("stageId")
+            //     : null;
+            // if (stageid !== "null") {
+            //   state.chooseStageId = stageid;
+            // } else {
+            //   state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
+            // }
+            // let final = state.level.find((item) => item.id == state.chooseStageId);
+            // getTableData(final.taskList);
           })
-          .catch((err) => {
-            console.log("获取任务列表失败", err);
-          });
     };
 
     //获取修改、删除id（投票)
@@ -1459,18 +1458,28 @@ export default {
     };
 
     //删除任务
-    const deleteTask = () => {
-      let obj = {projectTaskIds: state.deleteID};
-      api
-          .deleteTask(obj)
-          .then((res) => {
-            console.log(res);
-          })
-          .catch((err) => {
-            console.log(err);
-          });
+    const deleteTask = async () => {
+      await api.deleteTask({projectTaskIds: state.deleteID})
+      //删除后更新索引
     };
 
+    function updateStageChoosd() {
+      console.log('updateStageChoosd')
+      console.log(state.chooseStageId)
+      if (state.chooseStageId && state.stageList.find(e => e.stageId == state.chooseStageId)) {
+        getTableData(state.stageList.find(e => e.stageId == state.chooseStageId)?.taskList);
+        return
+      }
+      state.chooseStageId = ''
+      const arr = state.stageList.filter(e => e.name);
+      arr && arr.length && (state.chooseStageId = arr[0].stageId);
+      if (!state.chooseStageId) {
+        getTableData(state.stageList[0].taskList)
+        return
+      }
+      getTableData(state.stageList.find(e => e.stageId == state.chooseStageId)?.taskList);
+    }
+
     const showChangeModal = () => {
       if (state.selectRow.length == 0) {
         message.destroy();
@@ -1771,7 +1780,7 @@ export default {
       state.selectAll = 0; //0：未选择，1：全选，2：部分选择
       console.log("state.level", id, state.level);
       state.chooseStageId = id;
-      let final = state.level.find((item) => item.id === id);
+      let final = state.level.find((item) => item.id == id);
       getTableData(final.taskList);
     };
 
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 6eb9d0d1..5b094277 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3,7 +3,7 @@
   <div class="taskpage">
     <div class="addhead" style="flex-shrink: 0">
       <div class="leftimg">
-        <img class="img" :src="picUrl" />
+        <img class="img" :src="picUrl"/>
       </div>
       <div class="imgfor">
         <div class="forz">{{ name }}</div>
@@ -11,29 +11,29 @@
         <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div>
       </div>
       <div class="right">
-        <img class="img1" src="../../assets/images/leveladd/ma.png" />
+        <img class="img1" src="../../assets/images/leveladd/ma.png"/>
         <div class="line" v-if="action == 1 || action == 0"></div>
         <img
-          v-if="action == 1 || action == 0"
-          class="img2"
-          src="../../assets/images/leveladd/pub.png"
+            v-if="action == 1 || action == 0"
+            class="img2"
+            src="../../assets/images/leveladd/pub.png"
         />
         <!-- <div class="pub">发布</div> -->
         <!-- 已发布的显示 -->
         <div
-          class="pub"
-          style="width: 28px"
-          v-if="action == 1"
-          @click="showBackModal"
+            class="pub"
+            style="width: 28px"
+            v-if="action == 1"
+            @click="showBackModal"
         >
           {{ act }}
         </div>
         <!-- 未发布/草稿的显示 -->
         <div
-          class="pub"
-          style="width: 28px"
-          v-if="action == 0"
-          @click="showProjectPub"
+            class="pub"
+            style="width: 28px"
+            v-if="action == 0"
+            @click="showProjectPub"
         >
           {{ act }}
         </div>
@@ -43,9 +43,9 @@
         </div> -->
         <div class="line"></div>
         <img
-          style="margin-right: 15px"
-          class="img2"
-          src="../../assets/images/leveladd/more.png"
+            style="margin-right: 15px"
+            class="img2"
+            src="../../assets/images/leveladd/more.png"
         />
         <!-- <div class="more">
           <span style="color: #7096e3; cursor: pointer">更多</span>
@@ -88,7 +88,7 @@
         <div class="line"></div>
         <router-link to="/projectmanage">
           <div style="display: flex">
-            <img class="img2" src="../../assets/images/leveladd/back.png" />
+            <img class="img2" src="../../assets/images/leveladd/back.png"/>
             <div class="return">返回</div>
           </div>
         </router-link>
@@ -97,11 +97,11 @@
     <div class="split" style="flex-shrink: 0"></div>
     <div class="content">
       <a-tabs
-        class="tab"
-        v-model:activeKey="activeKey"
-        size="large"
-        :tabBarStyle="{ marginLeft: '10px', marginTop: '5px' }"
-        @change="tabsChange"
+          class="tab"
+          v-model:activeKey="activeKey"
+          size="large"
+          :tabBarStyle="{ marginLeft: '10px', marginTop: '5px' }"
+          @change="tabsChange"
       >
         <a-tab-pane key="1" tab="概览">
           <div class="split"></div>
@@ -112,18 +112,18 @@
             </div>
             <div class="second">
               <div
-                class="taskbox"
-                @click="totask"
-                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+                  class="taskbox"
+                  @click="totask"
+                  style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left1.png" />
+                  <img src="../../assets/images/taskpage/left1.png"/>
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture1.png" />
+                  <img src="../../assets/images/taskpage/picture1.png"/>
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right1.png" />
+                  <img src="../../assets/images/taskpage/right1.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
                   添加任务
@@ -131,18 +131,18 @@
                 <div class="centermain">快速添加任务/阶段</div>
               </div>
               <div
-                class="taskbox"
-                @click="tostudent"
-                style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+                  class="taskbox"
+                  @click="tostudent"
+                  style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png" />
+                  <img src="../../assets/images/taskpage/left2.png"/>
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture2.png" />
+                  <img src="../../assets/images/taskpage/picture2.png"/>
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png" />
+                  <img src="../../assets/images/taskpage/right2.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   添加学员
@@ -180,27 +180,27 @@
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
                 <span class="nub1">{{
-                  projectInfoOverview.totalStudentCnt
-                }}</span>
+                    projectInfoOverview.totalStudentCnt
+                  }}</span>
                 <div class="nub2">总人数</div>
               </div>
               <div class="nubbox">
                 <span class="nub1" style="color: #ff90ae">{{
-                  projectInfoOverview.studyStudentCnt
-                }}</span>
+                    projectInfoOverview.studyStudentCnt
+                  }}</span>
                 <div class="nub2">学习人数</div>
               </div>
               <div class="nubbox">
                 <span class="nub1" style="color: #a497ff">{{
-                  projectInfoOverview.completeStudentCnt
-                }}</span>
+                    projectInfoOverview.completeStudentCnt
+                  }}</span>
                 <div class="nub2">完成人数</div>
               </div>
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #5dc988">{{
-                    projectInfoOverview.onlineCourseCnt
-                  }}</span
+                      projectInfoOverview.onlineCourseCnt
+                    }}</span
                   ><span style="color: #5dc988; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">在线课程数</div>
@@ -208,8 +208,8 @@
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #ff90ae">{{
-                    projectInfoOverview.offLineCourseCnt
-                  }}</span
+                      projectInfoOverview.offLineCourseCnt
+                    }}</span
                   ><span style="color: #ff90ae; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">面授课程数</div>
@@ -217,8 +217,8 @@
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #a497ff">{{
-                    projectInfoOverview.completeRatio
-                  }}</span
+                      projectInfoOverview.completeRatio
+                    }}</span
                   ><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">总完成率</div>
@@ -233,13 +233,13 @@
             </div> -->
             <div class="stagemess">
               <div
-                v-for="item in stageList"
-                :class="{
+                  v-for="item in stageList"
+                  :class="{
                   stage1: item.stageId == choosedStageId,
                   stage2: item.stageId != choosedStageId,
                 }"
-                :key="item.stageId"
-                @click="choosedStageId = item.stageId"
+                  :key="item.stageId"
+                  @click="choosedStageId = item.stageId"
               >
                 {{ item.stage }}
               </div>
@@ -253,28 +253,28 @@
             <div class="stagelast">
               <div class="stagepro">
                 <a-progress
-                  type="dashboard"
-                  gapDegree="0"
-                  :percent="stageOverviewList.completeCourseRatio"
-                  :width="140"
+                    type="dashboard"
+                    gapDegree="0"
+                    :percent="stageOverviewList.completeCourseRatio"
+                    :width="140"
                 />
                 <div class="protext">课程完成率</div>
               </div>
               <div class="stagepro">
                 <a-progress
-                  type="dashboard"
-                  gapDegree="0"
-                  :percent="stageOverviewList.completeExamRatio"
-                  :width="140"
+                    type="dashboard"
+                    gapDegree="0"
+                    :percent="stageOverviewList.completeExamRatio"
+                    :width="140"
                 />
                 <div class="protext">考试通过率</div>
               </div>
               <div class="stagepro" style="margin-right: 0">
                 <a-progress
-                  type="dashboard"
-                  gapDegree="0"
-                  :percent="stageOverviewList.completeRatio"
-                  :width="140"
+                    type="dashboard"
+                    gapDegree="0"
+                    :percent="stageOverviewList.completeRatio"
+                    :width="140"
                 />
                 <div class="protext">作业完成率</div>
               </div>
@@ -285,8 +285,8 @@
                 <div class="proright1">
                   <span class="textpro">阶段任务总数</span>
                   <a-progress
-                    :percent="stageOverviewList.totalTaskCnt"
-                    style="width: 369px"
+                      :percent="stageOverviewList.totalTaskCnt"
+                      style="width: 369px"
                   />
                 </div>
                 <div class="pronub" style="margin-left: 206px">
@@ -295,8 +295,8 @@
                 <div class="proright1">
                   <span class="textpro">必修课</span>
                   <a-progress
-                    :percent="stageOverviewList.totalReqCnt"
-                    style="width: 369px"
+                      :percent="stageOverviewList.totalReqCnt"
+                      style="width: 369px"
                   />
                 </div>
                 <div class="pronub" style="margin-left: 142px">
@@ -305,8 +305,8 @@
                 <div class="proright1">
                   <span class="textpro">选修课</span>
                   <a-progress
-                    :percent="stageOverviewList.totalOptCnt"
-                    style="width: 369px"
+                      :percent="stageOverviewList.totalOptCnt"
+                      style="width: 369px"
                   />
                 </div>
               </div>
@@ -323,11 +323,11 @@
               <!-- <button class="btn" @click="showFaceIn" v-if="morFaceT">
                 批量面授报名
               </button> -->
-              <router-link to="/taskadd">
-                <button to="/taskadd" class="edit">
+              <router-link :to="{path:`/taskadd`,query:{projectId:projectId}}">
+                <button class="edit">
                   <img
-                    class="editimg"
-                    src="../../assets/images/projectadd/edit.png"
+                      class="editimg"
+                      src="../../assets/images/projectadd/edit.png"
                   />
                   <span class="editext">编辑</span>
                 </button>
@@ -344,8 +344,8 @@
               </router-link>
             </div> -->
             <div
-              class="taskSyllabus"
-              v-if="
+                class="taskSyllabus"
+                v-if="
                 taskSyllabus &&
                 taskSyllabus.length &&
                 (taskSyllabus.length > 1 || taskSyllabus[0].name)
@@ -354,12 +354,12 @@
               <a-collapse v-model:activeKey="taskSyllabusActive" accordion>
                 <template #expandIcon="{ isActive }">
                   <img
-                    :style="{
+                      :style="{
                       width: isActive ? 9.1 : 8.1,
                       height: isActive ? 8.1 : 9.1,
                       'margin-right': isActive ? '12px' : '13px',
                     }"
-                    :src="
+                      :src="
                       isActive
                         ? require('../../assets/images/projectadd/open.png')
                         : require('../../assets/images/projectadd/close.png')
@@ -367,29 +367,30 @@
                   />
                   <div></div>
                 </template>
-                <a-collapse-panel
-                  v-for="(value, index) in taskSyllabus"
-                  :key="index"
-                  :header="value.name"
-                >
-                  <div
-                    class="course"
-                    v-for="(item, key) in value.taskList"
-                    :key="key"
+                <template v-for="(value, index) in taskSyllabus">
+                  <a-collapse-panel
+                      :key="index"
+                      v-if="value.name"
+                      :header="value.name"
                   >
-                    <div class="first">
-                      <div class="icon">
-                        <div
-                          style="
+                    <div
+                        class="course"
+                        v-for="(item, key) in value.taskList"
+                        :key="key"
+                    >
+                      <div class="first">
+                        <div class="icon">
+                          <div
+                              style="
                             width: 31px;
                             height: 28px;
                             display: flex;
                             align-items: center;
                             justify-content: center;
                           "
-                        >
-                          <img
-                            :src="
+                          >
+                            <img
+                                :src="
                               item.type == 1
                                 ? require('../../assets/images/leveladd/zai.png')
                                 : item.type == 2
@@ -418,139 +419,140 @@
                                 ? require('../../assets/images/leveladd/tou.png')
                                 : require('../../assets/images/leveladd/xiangmu.png')
                             "
-                          />
+                            />
+                          </div>
+                        </div>
+                        <div>
+                          <div class="iconame">「{{ item.name }}」</div>
+                          <div class="icontext">{{ item.name }}</div>
                         </div>
                       </div>
-                      <div>
-                        <div class="iconame">「{{ item.name }}」</div>
-                        <div class="icontext">{{ item.name }}</div>
-                      </div>
-                    </div>
-                    <div class="type">
-                      <div
-                        :class="item.flag == true ? 'typename1' : 'typename'"
-                      >
-                        <span v-if="item.flag">必修</span>
-                        <span v-else>选修</span>
-                      </div>
-                    </div>
-                    <div class="time">
-                      <div class="timetext">开始时间</div>
-                      <div class="timetext">
-                        {{
-                          item.startTime !== null ? item.startTime: ''
-                        }}
-                      </div>
-                    </div>
-                    <div class="progress">
-                      <div class="progresstext">
-                        {{
-                          item.finishStuCnt && item.finishStuCnt !== null
-                            ? item.finishStuCnt
-                            : 0
-                        }}/{{
-                          item.totalStuCnt && item.totalStuCnt !== null
-                            ? item.totalStuCnt
-                            : 0
-                        }}人
-                      </div>
-                      <div style="display: flex">
-                        <a-progress
-                          :showInfo="false"
-                          :percent="item.percent"
-                          strokeColor="#FFC067"
-                          trailColor="rgba(253, 209, 98, 0.2)"
-                        />
-                        <span class="progresstext" style="margin-left: 10px"
-                          >{{
-                            (item.finishStuCnt && item.finishStuCnt !== null
-                              ? item.finishStuCnt
-                              : 0 / item.totalStuCnt &&
-                                item.totalStuCnt !== null
-                              ? item.totalStuCnt
-                              : 0) * 100
-                          }}%</span
+                      <div class="type">
+                        <div
+                            :class="item.flag == true ? 'typename1' : 'typename'"
                         >
+                          <span v-if="item.flag">必修</span>
+                          <span v-else>选修</span>
+                        </div>
+                      </div>
+                      <div class="time">
+                        <div class="timetext">开始时间</div>
+                        <div class="timetext">
+                          {{
+                            item.startTime !== null ? item.startTime : ''
+                          }}
+                        </div>
+                      </div>
+                      <div class="progress">
+                        <div class="progresstext">
+                          {{
+                            item.finishStuCnt && item.finishStuCnt !== null
+                                ? item.finishStuCnt
+                                : 0
+                          }}/{{
+                            item.totalStuCnt && item.totalStuCnt !== null
+                                ? item.totalStuCnt
+                                : 0
+                          }}人
+                        </div>
+                        <div style="display: flex">
+                          <a-progress
+                              :showInfo="false"
+                              :percent="item.percent"
+                              strokeColor="#FFC067"
+                              trailColor="rgba(253, 209, 98, 0.2)"
+                          />
+                          <span class="progresstext" style="margin-left: 10px"
+                          >{{
+                              (item.finishStuCnt && item.finishStuCnt !== null
+                                  ? item.finishStuCnt
+                                  : 0 / item.totalStuCnt &&
+                                  item.totalStuCnt !== null
+                                      ? item.totalStuCnt
+                                      : 0) * 100
+                            }}%</span
+                          >
+                        </div>
+                      </div>
+                      <div class="operations">
+                        <!-- 2022-11-30注释 后面放开 -->
+                        <!-- <div
+                          class="operation"
+                          style="cursor: pointer"
+                          :style="{
+                            display: item.type == '2' ? 'flex' : 'none',
+                          }"
+                          @click="showFS"
+                        >
+                          学员
+                        </div> -->
+                        <!-- <div
+                          class="operation"
+                          style="cursor: pointer"
+                          @click="showAA(item.name)"
+                          :style="{
+                            display:
+                              item.type == '6' || item.type == '9'
+                                ? 'flex'
+                                : 'none',
+                          }"
+                        >
+                          考勤
+                        </div> -->
+                        <div
+                            class="operation"
+                            style="cursor: pointer"
+                            @click="showCodeModal"
+                        >
+                          二维码
+                        </div>
+                        <!-- 2022-11-30注释 后面放开 -->
+                        <!-- <div
+                          class="operation"
+                          style="cursor: pointer; margin-right: 35px"
+                          @click="
+                            item.type == '1' ||
+                            item.type == '3' ||
+                            item.type == '7' ||
+                            item.type == '8' ||
+                            item.type == '9' ||
+                            item.type == '11' ||
+                            item.type == '12'
+                              ? showTime(item.name, item.projectTaskId, item.type)
+                              : item.type == '5' || item.type == '10'
+                              ? showTest(item.name, item.projectTaskId, item.type)
+                              : item.type == '2' || item.type == '6'
+                              ? showFace(item.name, item.projectTaskId)
+                              : item.type == '4'
+                              ? showWork(item.name, item.projectTaskId)
+                              : null
+                          "
+                        >
+                          管理
+                        </div> -->
                       </div>
                     </div>
-                    <div class="operations">
-                      <!-- 2022-11-30注释 后面放开 -->
-                      <!-- <div
-                        class="operation"
-                        style="cursor: pointer"
-                        :style="{
-                          display: item.type == '2' ? 'flex' : 'none',
-                        }"
-                        @click="showFS"
-                      >
-                        学员
-                      </div> -->
-                      <!-- <div
-                        class="operation"
-                        style="cursor: pointer"
-                        @click="showAA(item.name)"
-                        :style="{
-                          display:
-                            item.type == '6' || item.type == '9'
-                              ? 'flex'
-                              : 'none',
-                        }"
-                      >
-                        考勤
-                      </div> -->
-                      <div
-                        class="operation"
-                        style="cursor: pointer"
-                        @click="showCodeModal"
-                      >
-                        二维码
-                      </div>
-                      <!-- 2022-11-30注释 后面放开 -->
-                      <!-- <div
-                        class="operation"
-                        style="cursor: pointer; margin-right: 35px"
-                        @click="
-                          item.type == '1' ||
-                          item.type == '3' ||
-                          item.type == '7' ||
-                          item.type == '8' ||
-                          item.type == '9' ||
-                          item.type == '11' ||
-                          item.type == '12'
-                            ? showTime(item.name, item.projectTaskId, item.type)
-                            : item.type == '5' || item.type == '10'
-                            ? showTest(item.name, item.projectTaskId, item.type)
-                            : item.type == '2' || item.type == '6'
-                            ? showFace(item.name, item.projectTaskId)
-                            : item.type == '4'
-                            ? showWork(item.name, item.projectTaskId)
-                            : null
-                        "
-                      >
-                        管理
-                      </div> -->
-                    </div>
-                  </div>
-                </a-collapse-panel>
+                  </a-collapse-panel>
+                </template>
               </a-collapse>
               <!-- 无数据创建任务  v-if="taskSyllabus.length == 0"-->
               <router-link
-                to="/taskadd"
-                class="taskbox"
-                style="
+                  :to="{path:`/taskadd`,query:{projectId:projectId}}"
+                  class="taskbox"
+                  style="
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
                   display: block;
                 "
-                v-if="taskSyllabus.length == 0"
+                  v-if="taskSyllabus.length == 0"
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png" />
+                  <img src="../../assets/images/taskpage/left2.png"/>
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture8.png" />
+                  <img src="../../assets/images/taskpage/picture8.png"/>
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png" />
+                  <img src="../../assets/images/taskpage/right2.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   创建任务
@@ -561,22 +563,22 @@
             </div>
             <div v-else>
               <div
-                class="taskbox"
-                @click="
+                  class="taskbox"
+                  @click="
                   () => {
-                    routered.push({ path: '/taskadd' });
+                    routered.push({ path: `/taskadd`,query:{projectId:projectId} });
                   }
                 "
-                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+                  style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left1.png" />
+                  <img src="../../assets/images/taskpage/left1.png"/>
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture1.png" />
+                  <img src="../../assets/images/taskpage/picture1.png"/>
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right1.png" />
+                  <img src="../../assets/images/taskpage/right1.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
                   添加任务
@@ -595,7 +597,7 @@
                 <div class="group">
                   <div class="groupleft">
                     <div
-                      style="
+                        style="
                         display: flex;
                         align-items: center;
                         margin-right: 10px;
@@ -604,12 +606,12 @@
                     >
                       <div class="groupname" style="width: 42px">姓名：</div>
                       <a-input
-                        v-model:value="valuestun"
-                        placeholder="请输入姓名"
+                          v-model:value="valuestun"
+                          placeholder="请输入姓名"
                       />
                     </div>
                     <div
-                      style="
+                        style="
                         display: flex;
                         align-items: center;
                         margin-right: 10px;
@@ -618,8 +620,8 @@
                     >
                       <div class="groupname">小组名称：</div>
                       <a-input
-                        v-model:value="valuestugroup"
-                        placeholder="请输入小组名称"
+                          v-model:value="valuestugroup"
+                          placeholder="请输入小组名称"
                       />
                     </div>
                     <!-- 2022-11-30注释 后面放开 -->
@@ -674,18 +676,18 @@
                   </div>
                   <div class="groupright">
                     <div class="btn1" @click="searchStu">
-                      <img src="../../assets/images/courseManage/search0.png" />
+                      <img src="../../assets/images/courseManage/search0.png"/>
                       <span class="btn1text">搜索</span>
                     </div>
                     <div class="btn2" @click="resetCancel">
-                      <img src="../../assets/images/courseManage/reset1.png" />
+                      <img src="../../assets/images/courseManage/reset1.png"/>
                       <span class="btn2text">重置</span>
                     </div>
                   </div>
                 </div>
                 <div class="second2" style="margin-top: 20px">
                   <div class="btn1" @click="showStuAdd">
-                    <img src="../../assets/images/courseManage/add0.png" />
+                    <img src="../../assets/images/courseManage/add0.png"/>
                     <span class="btn1text">添加学员</span>
                   </div>
                   <!-- 2022-11-30注释 后面放开 -->
@@ -694,12 +696,12 @@
                     <span class="btn2text">导入学员</span>
                   </div> -->
                   <div class="btn2" @click="showAllDelete">
-                    <img src="../../assets/images/projectadd/delete.png" />
+                    <img src="../../assets/images/projectadd/delete.png"/>
                     <span class="btn2text">批量删除</span>
                   </div>
                 </div>
                 <div class="talk">
-                  <img class="im" src="../../assets/images/leveladd/gan.png" />
+                  <img class="im" src="../../assets/images/leveladd/gan.png"/>
                   <div class="xu">
                     <span class="yi">已选择</span>
                     <div style="width: 5px; display: inline-block"></div>
@@ -714,15 +716,15 @@
                 </div>
                 <div class="tab" style="margin: 20px 32px 30px 32px">
                   <a-table
-                    style="border: 1px solid #f2f6fe"
-                    :columns="studentColumns()"
-                    :data-source="tabledata"
-                    expandRowByClick="true"
-                    :scroll="{ x: 1400 }"
-                    @expand="expandTable"
-                    :pagination="false"
-                    :loading="loading"
-                    :row-selection="{
+                      style="border: 1px solid #f2f6fe"
+                      :columns="studentColumns()"
+                      :data-source="tabledata"
+                      expandRowByClick="true"
+                      :scroll="{ x: 1400 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :loading="loading"
+                      :row-selection="{
                       columnWidth: 30,
                       selectedRowKeys: selectedRowKeys,
                       onChange: onSelectChange,
@@ -738,15 +740,15 @@
                   </div>
                   <div class="pa">
                     <a-pagination
-                      v-if="total > 10"
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="stupageSize"
-                      :current="currentPageStu"
-                      :total="total"
-                      class="pagination"
-                      @change="changePaginationStu"
+                        v-if="total > 10"
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="stupageSize"
+                        :current="currentPageStu"
+                        :total="total"
+                        class="pagination"
+                        @change="changePaginationStu"
                     />
                   </div>
                 </div>
@@ -756,51 +758,51 @@
                   <div class="groupleft">
                     <div class="groupname">小组名称：</div>
                     <a-input
-                      v-model:value="valuestugn"
-                      placeholder="请输入小组名称"
+                        v-model:value="valuestugn"
+                        placeholder="请输入小组名称"
                     />
                   </div>
                   <div class="groupright">
                     <div class="btn1" @click="searchGroup">
-                      <img src="../../assets/images/courseManage/search0.png" />
+                      <img src="../../assets/images/courseManage/search0.png"/>
                       <span class="btn1text">搜索</span>
                     </div>
                     <div class="btn2" @click="resetGroupName">
-                      <img src="../../assets/images/courseManage/reset1.png" />
+                      <img src="../../assets/images/courseManage/reset1.png"/>
                       <span class="btn2text">重置</span>
                     </div>
                   </div>
                 </div>
                 <div class="second2">
                   <div class="btn1" @click="showModal2">
-                    <img src="../../assets/images/courseManage/add0.png" />
+                    <img src="../../assets/images/courseManage/add0.png"/>
                     <span class="btn1text">创建小组</span>
                   </div>
                   <div class="btn2" @click="showSubset">
-                    <img src="../../assets/images/courseManage/reset2.png" />
+                    <img src="../../assets/images/courseManage/reset2.png"/>
                     <span class="btn2text">随机分组</span>
                   </div>
                 </div>
                 <!-- 小组列表 -->
                 <div class="groupmain">
                   <div
-                    class="groupbox"
-                    v-for="item in groupList"
-                    :key="item.projectGroupId"
+                      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
+                              style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
+                          >. . .</span
                           >
                           <div class="moreItems">
                             <div class="sammo">编辑</div>
                             <div
-                              class="sammo"
-                              @click="deleteGroupBtn(item.projectGroupId)"
+                                class="sammo"
+                                @click="deleteGroupBtn(item.projectGroupId)"
                             >
                               删除
                             </div>
@@ -810,11 +812,11 @@
                       <div class="leader">组长：{{ item.leaderName }}</div>
                       <div class="grocenter">
                         <div class="leader1">进度</div>
-                        <a-progress :percent="item.completeRatio" />
+                        <a-progress :percent="item.completeRatio"/>
                       </div>
                       <div
-                        class="grofooter"
-                        @click="showMemberList(item.projectGroupId)"
+                          class="grofooter"
+                          @click="showMemberList(item.projectGroupId)"
                       >
                         <div class="ftext">组员名单 ></div>
                         <!-- <div class="peoples">
@@ -1008,9 +1010,9 @@
                     <div class="setc_name"><span>封面图：</span></div>
                     <div class="setc_main">
                       <img
-                        style="width: 151px; height: 84px"
-                        :src="picUrl"
-                        alt=""
+                          style="width: 151px; height: 84px"
+                          :src="picUrl"
+                          alt=""
                       />
                     </div>
                   </div>
@@ -1018,7 +1020,7 @@
                     <div class="setc_name"><span>项目时间：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                        >{{ startTime }} ～ {{ endTime }}</span
+                      >{{ startTime }} ～ {{ endTime }}</span
                       >
                     </div>
                   </div>
@@ -1044,9 +1046,9 @@
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
                       <a-radio v-model:checked="checkedSty" :disabled="true"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
                       >
                     </div>
                   </div>
@@ -1054,10 +1056,10 @@
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                        ><ProjectLevel
+                      ><ProjectLevel
                           v-model:value="level"
                           :disabled="true"
-                        ></ProjectLevel
+                      ></ProjectLevel
                       ></span>
                     </div>
                   </div>
@@ -1065,10 +1067,10 @@
                     <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                        ><TrainClass
+                      ><TrainClass
                           v-model:value="systemId"
                           :disabled="true"
-                        ></TrainClass
+                      ></TrainClass
                       ></span>
                     </div>
                   </div>
@@ -1076,7 +1078,7 @@
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
                       <a-radio v-model:checked="checkedBOEU" :disabled="true"
-                        ><span style="color: #333333">BOEU实施</span></a-radio
+                      ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
@@ -1097,54 +1099,54 @@
                     </div>
                     <div class="btnbox" style="margin: 20px">
                       <a-upload
-                        v-if="docChecked == true"
-                        v-model:file-list="fileList"
-                        name="file"
-                        action="/manageApi/file/upload"
-                        @change="handleChange"
+                          v-if="docChecked == true"
+                          v-model:file-list="fileList"
+                          name="file"
+                          action="/manageApi/file/upload"
+                          @change="handleChange"
                       >
                         <span
-                          class="xkbtn"
-                          style="cursor: pointer; font-size: 17px"
-                          >上传</span
+                            class="xkbtn"
+                            style="cursor: pointer; font-size: 17px"
+                        >上传</span
                         >
                         <img
-                          src="@/assets/images/basicinfo/cloud.png"
-                          style="cursor: pointer; width: 34px; height: 34px"
-                          alt=""
+                            src="@/assets/images/basicinfo/cloud.png"
+                            style="cursor: pointer; width: 34px; height: 34px"
+                            alt=""
                         />
                       </a-upload>
                       <div
-                        v-if="docChecked == true"
-                        class="btnbox"
-                        style="margin: 20px"
+                          v-if="docChecked == true"
+                          class="btnbox"
+                          style="margin: 20px"
                       >
                         <span style="color: #999999">
                           支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
                         </span>
                       </div>
                       <div
-                        v-for="item in fileList"
-                        :key="item.uid"
-                        class="docListStyle"
+                          v-for="item in fileList"
+                          :key="item.uid"
+                          class="docListStyle"
                       >
                         <img
-                          src="@/assets/images/basicinfo/download.png"
-                          style="
+                            src="@/assets/images/basicinfo/download.png"
+                            style="
                             cursor: pointer;
                             width: 40px;
                             height: 40px;
                             margin-right: 40px;
                           "
-                          alt=""
+                            alt=""
                         />
                         <span style="font: oblique bold 16px Sans-serif">{{
-                          item.name
-                        }}</span>
+                            item.name
+                          }}</span>
                         <span
-                          style="color: #4ea6ff; float: right; cursor: pointer"
-                          @click="deFile(item.uid)"
-                          >删除</span
+                            style="color: #4ea6ff; float: right; cursor: pointer"
+                            @click="deFile(item.uid)"
+                        >删除</span
                         >
                       </div>
                     </div>
@@ -1158,88 +1160,88 @@
     </div>
     <!-- 时间管理抽屉 -->
     <time-manage
-      v-model:Tvisible="visible"
-      :projectTaskId="projectTaskId"
-      :title="showTimeText"
-      :itemsType="itemstype"
+        v-model:Tvisible="visible"
+        :projectTaskId="projectTaskId"
+        :title="showTimeText"
+        :itemsType="itemstype"
     />
     <!-- 面授管理抽屉 -->
     <face-manage
-      v-model:Fvisible="FaceVisivle"
-      :projectTaskId="projectTaskId"
-      :title="showFaceText"
+        v-model:Fvisible="FaceVisivle"
+        :projectTaskId="projectTaskId"
+        :title="showFaceText"
     />
     <!-- 学员（小组管理）创建小组抽屉 -->
-    <subset-manage v-model:Svisible="subsetVisivle" />
+    <subset-manage v-model:Svisible="subsetVisivle"/>
     <!-- 学员管理-添加学员抽屉 -->
     <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
     <!-- 添加学员抽屉 -->
     <proj-check-ship
-      v-model:ProjCheckvisible="Stuvisible"
-      :selectProjectId="projectId"
-      v-model:addAuthList="addAuthList"
-      :authClassify="authClassify"
-      classify="addstudent"
+        v-model:ProjCheckvisible="Stuvisible"
+        :selectProjectId="projectId"
+        v-model:addAuthList="addAuthList"
+        :authClassify="authClassify"
+        classify="addstudent"
     />
     <!-- 学员管理-导入学员抽屉 -->
-    <import-stu v-model:Importvisible="Importvisible" />
+    <import-stu v-model:Importvisible="Importvisible"/>
     <!-- 查看学员 传入查看学员的id-->
     <see-stu
-      v-model:Seevisible="Seevisible"
-      v-model:checkStuId="checkStuId"
-      v-model:projectId="projectId"
+        v-model:Seevisible="Seevisible"
+        v-model:checkStuId="checkStuId"
+        v-model:projectId="projectId"
     />
     <!-- 学员换组 -->
     <change-group
-      v-model:Changevisible="Changevisible"
-      v-model:projectId="projectId"
-      v-model:ChangeGroupStuId="ChangeGroupStuId"
-      v-model:ChangeGroupStuName="ChangeGroupStuName"
-      v-model:ChangeGroupId="ChangeGroupId"
-      @changeD="changeGrouped"
+        v-model:Changevisible="Changevisible"
+        v-model:projectId="projectId"
+        v-model:ChangeGroupStuId="ChangeGroupStuId"
+        v-model:ChangeGroupStuName="ChangeGroupStuName"
+        v-model:ChangeGroupId="ChangeGroupId"
+        @changeD="changeGrouped"
     />
     <!-- 组员名单抽屉 -->
     <member-list
-      v-model:Lvisible="Lvisible"
-      v-model:chooseGroupId="chooseGroupId"
-      v-model:projectId="projectId"
+        v-model:Lvisible="Lvisible"
+        v-model:chooseGroupId="chooseGroupId"
+        v-model:projectId="projectId"
     />
     <!-- 面授学员抽屉 -->
-    <face-stu v-model:FSvisible="FSvisible" />
+    <face-stu v-model:FSvisible="FSvisible"/>
     <!-- 活动考勤抽屉 -->
-    <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
+    <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText"/>
     <!-- 作业管理抽屉 -->
     <work-manage
-      v-model:Wvisible="Wvisible"
-      :projectTaskId="projectTaskId"
-      :title="showWorkText"
+        v-model:Wvisible="Wvisible"
+        :projectTaskId="projectTaskId"
+        :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
     <test-manage
-      v-model:TMvisible="TMvisible"
-      :title="showTestText"
-      :projectTaskId="projectTaskId"
-      :itemsType="itemstype"
+        v-model:TMvisible="TMvisible"
+        :title="showTestText"
+        :projectTaskId="projectTaskId"
+        :itemsType="itemstype"
     />
     <!-- 批量面授报名 -->
-    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
+    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible"/>
 
     <!-- 概览（无数据）-项目发布弹窗 -->
     <div>
       <a-modal
-        v-model:visible="pubproject"
-        :title="null"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        :centered="true"
-        wrapClassName="pubproject"
-        width="679px"
-        height="437px"
+          v-model:visible="pubproject"
+          :title="null"
+          @ok="closeModal"
+          :footer="null"
+          :closable="false"
+          :centered="true"
+          wrapClassName="pubproject"
+          width="679px"
+          height="437px"
       >
         <div
-          class="modalHeader"
-          style="
+            class="modalHeader"
+            style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -1249,18 +1251,18 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span style="width: 15px; height: 15px"
-              ><img src="../../assets/images/taskpage/pub.png"
+            ><img src="../../assets/images/taskpage/pub.png"
             /></span>
             <span
-              class="headerLeftText"
-              style="font-size: 16px; margin-left: 10px"
-              >项目发布</span
+                class="headerLeftText"
+                style="font-size: 16px; margin-left: 10px"
+            >项目发布</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
             <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
@@ -1281,15 +1283,15 @@
             </div>
           </div>
           <div class="send">
-            <a-switch v-model:checked="checked" size="small" />
+            <a-switch v-model:checked="checked" size="small"/>
             <span class="sendtext">发送项目通知</span>
           </div>
           <div class="ckb">
             <a-checkbox v-model:checked="checked1"
-              ><span class="sendpeo">发给老师</span></a-checkbox
+            ><span class="sendpeo">发给老师</span></a-checkbox
             >
             <a-checkbox v-model:checked="checked2"
-              ><span class="sendpeo">发给学员</span></a-checkbox
+            ><span class="sendpeo">发给学员</span></a-checkbox
             >
           </div>
           <div class="pubtn">
@@ -1303,19 +1305,19 @@
     <!-- 学员-创建小组弹窗 -->
     <div>
       <a-modal
-        v-model:visible="stugroup"
-        :title="null"
-        @ok="closeModal2"
-        :footer="null"
-        :closable="false"
-        :centered="true"
-        wrapClassName="doublepro"
-        width="624px"
-        height="332px"
+          v-model:visible="stugroup"
+          :title="null"
+          @ok="closeModal2"
+          :footer="null"
+          :closable="false"
+          :centered="true"
+          wrapClassName="doublepro"
+          width="624px"
+          height="332px"
       >
         <div
-          class="modalHeader"
-          style="
+            class="modalHeader"
+            style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -1328,8 +1330,8 @@
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
             <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
@@ -1337,32 +1339,32 @@
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">小组名称:</div>
             <div class="in">
               <a-input
-                v-model:value="valueaddg"
-                placeholder="请输入小组名称"
-                style="border-radius: 8px; height: 40px"
+                  v-model:value="valueaddg"
+                  placeholder="请输入小组名称"
+                  style="border-radius: 8px; height: 40px"
               />
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                style="width: 10px; height: 10px; margin-left: 15px"
-                src="../../assets/images/basicinfo/asterisk.png"
+                  style="width: 10px; height: 10px; margin-left: 15px"
+                  src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">小组长:</div>
             <div class="in">
               <a-input
-                v-model:value="valueaddm"
-                placeholder="请输入小组长"
-                style="border-radius: 8px; height: 40px"
+                  v-model:value="valueaddm"
+                  placeholder="请输入小组长"
+                  style="border-radius: 8px; height: 40px"
               />
             </div>
           </div>
@@ -1377,12 +1379,12 @@
     <!-- 取消学员弹窗 -->
     <div>
       <a-modal
-        v-model:visible="canclestu"
-        :footer="null"
-        :closable="close"
-        wrapClassName="canclestu"
-        centered="true"
-        @cancel="closeModal1"
+          v-model:visible="canclestu"
+          :footer="null"
+          :closable="close"
+          wrapClassName="canclestu"
+          centered="true"
+          @cancel="closeModal1"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1410,11 +1412,11 @@
     <!-- 优秀学员弹窗 -->
     <div>
       <a-modal
-        v-model:visible="canclestu1"
-        :footer="null"
-        :closable="close"
-        wrapClassName="canclestu1"
-        centered="true"
+          v-model:visible="canclestu1"
+          :footer="null"
+          :closable="close"
+          wrapClassName="canclestu1"
+          centered="true"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1442,11 +1444,11 @@
     <!-- 删除学员弹窗 -->
     <div>
       <a-modal
-        v-model:visible="deleteOneStu"
-        :footer="null"
-        :closable="close"
-        wrapClassName="canclestu1"
-        centered="true"
+          v-model:visible="deleteOneStu"
+          :footer="null"
+          :closable="close"
+          wrapClassName="canclestu1"
+          centered="true"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1475,12 +1477,12 @@
     <!-- 删除弹窗 -->
     <div>
       <a-modal
-        v-model:visible="delete_hs"
-        :footer="null"
-        :closable="closableQR"
-        wrapClassName="DelModal"
-        style="margin-top: 400px"
-        @cancel="delete_exit"
+          v-model:visible="delete_hs"
+          :footer="null"
+          :closable="closableQR"
+          wrapClassName="DelModal"
+          style="margin-top: 400px"
+          @cancel="delete_exit"
       >
         <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
           <div class="del_header"></div>
@@ -1510,11 +1512,11 @@
     <!-- 批量删除弹窗 -->
     <div>
       <a-modal
-        v-model:visible="allDelete"
-        :footer="null"
-        :closable="close"
-        wrapClassName="canclestu1"
-        centered="true"
+          v-model:visible="allDelete"
+          :footer="null"
+          :closable="close"
+          wrapClassName="canclestu1"
+          centered="true"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1539,30 +1541,30 @@
       </a-modal>
     </div>
     <!-- 编辑项目弹窗 -->
-    <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
+    <proj-set v-model:editHs="editHs" v-model:projectId="projectId"/>
 
     <!-- 二维码弹窗 -->
     <two-dimensional-code
-      v-model:codevisible="codevisible"
-      :codeInfo="codeInfo"
-      index="0"
-      type="课程二维码"
+        v-model:codevisible="codevisible"
+        :codeInfo="codeInfo"
+        index="0"
+        type="课程二维码"
     />
     <!-- 二维码弹窗 -->
 
     <!-- 发布弹窗 -->
     <a-modal
-      v-model:visible="projectPub"
-      :title="null"
-      :footer="null"
-      :closable="false"
-      wrapClassName="projectPub"
-      width="679px"
-      height="437px"
+        v-model:visible="projectPub"
+        :title="null"
+        :footer="null"
+        :closable="false"
+        wrapClassName="projectPub"
+        width="679px"
+        height="437px"
     >
       <div
-        class="modalHeader"
-        style="
+          class="modalHeader"
+          style="
           width: 100%;
           height: 68px;
           display: flex;
@@ -1572,21 +1574,21 @@
       >
         <div class="headerLeft" style="margin-left: 32px">
           <span style="width: 15px; height: 15px"
-            ><img src="../../assets/images/taskpage/pub.png"
+          ><img src="../../assets/images/taskpage/pub.png"
           /></span>
           <span
-            class="headerLeftText"
-            style="font-size: 16px; margin-left: 10px"
-            >项目发布</span
+              class="headerLeftText"
+              style="font-size: 16px; margin-left: 10px"
+          >项目发布</span
           >
         </div>
         <div
-          style="cursor: pointer; margin-right: 32px"
-          @click="closeProjectPub"
+            style="cursor: pointer; margin-right: 32px"
+            @click="closeProjectPub"
         >
           <img
-            style="width: 22px; height: 22px"
-            src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
@@ -1627,11 +1629,11 @@
 
     <!-- 撤回弹窗 -->
     <a-modal
-      v-model:visible="backModal"
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="backModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1659,11 +1661,11 @@
 
     <!-- 结束项目弹窗 -->
     <a-modal
-      v-model:visible="stopModal"
-      :footer="null"
-      :closable="closeStop"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="stopModal"
+        :footer="null"
+        :closable="closeStop"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1693,11 +1695,11 @@
 
     <!-- 存为模版弹窗 -->
     <a-modal
-      v-model:visible="startModal"
-      :footer="null"
-      :closable="closeStart"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="startModal"
+        :footer="null"
+        :closable="closeStart"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1724,9 +1726,9 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted, watch, computed } from "vue";
-import { useRoute } from "vue-router";
-import { useRouter } from "vue-router";
+import {reactive, toRefs, onMounted, watch, computed} from "vue";
+import {useRoute} from "vue-router";
+import {useRouter} from "vue-router";
 // import { CaretRightOutlined } from "@ant-design/icons-vue";
 import TimeManage from "../../components/drawers/TimeManage";
 import FaceManage from "../../components/drawers/FaceManage";
@@ -1745,7 +1747,7 @@ import NoticePub from "../../components/drawers/NoticePub";
 import NoticeHis from "../../components/drawers/NoticeHis";
 // import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
-import { storage } from "../../api/storage";
+import {storage} from "../../api/storage";
 import * as api from "../../api/index1";
 import * as apiproj from "../../api/index";
 import {
@@ -1756,15 +1758,15 @@ import {
   editGroup,
   topStudent,
 } from "../../api/indexProjStu";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
 import * as apitl from "../../api/index";
-import { getTask } from "../../api/indexTaskadd";
-import { editProj } from "../../api/indexTaskadd";
-import { toDate } from "../../api/method";
+import {getTask} from "../../api/indexTaskadd";
+import {editProj} from "../../api/indexTaskadd";
+import {toDate} from "../../api/method";
 import projSet from "../../components/Modals/projSet";
-import { overview } from "../../api/indexProjStu";
+import {overview} from "../../api/indexProjStu";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
-import { useStore } from "vuex";
+import {useStore} from "vuex";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
 
@@ -1795,11 +1797,10 @@ export default {
   },
   setup() {
     const store = useStore();
+    const route = useRoute();
     const state = reactive({
       loading: false,
-      projectId: storage.get("projectId")
-        ? JSON.parse(storage.get("projectId"))
-        : null,
+      projectId: route.query.projectId,
       isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null,
       // pN: storage.get("pN") ? JSON.parse(storage.get("pN")) : null,
       pN: storage.get("pN"),
@@ -1864,23 +1865,23 @@ export default {
       projectTaskId: "", //项目任务任务id
       //进度排行学员
       rankjindu: [
-        { value: "学员", label: "学员" },
-        { value: "小组", label: "小组" },
+        {value: "学员", label: "学员"},
+        {value: "小组", label: "小组"},
       ],
       valuestu1: "学员",
       //进度排行阶段
-      rankjieduan: [{ value: "第一阶段", label: "第一阶段" }],
+      rankjieduan: [{value: "第一阶段", label: "第一阶段"}],
       valuestu2: "第一阶段",
       //积分排行
       rankxuefen: [
-        { value: "学员", label: "学员" },
-        { value: "小组", label: "小组" },
+        {value: "学员", label: "学员"},
+        {value: "小组", label: "小组"},
       ],
       valuestu3: "学员",
       //学时排行
       rankxueshi: [
-        { value: "学员", label: "学员" },
-        { value: "小组", label: "小组" },
+        {value: "学员", label: "学员"},
+        {value: "小组", label: "小组"},
       ],
       valuestu4: "学员",
       visible: false, //时间管理
@@ -2021,24 +2022,24 @@ export default {
           customRender: (text) => {
             if (text.record.rank == "1") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/one.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/one.png")}
+                  />
               );
             } else if (text.record.rank == "2") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/two.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/two.png")}
+                  />
               );
             } else if (text.record.rank == "3") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/three.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/three.png")}
+                  />
               );
             } else {
               return <div>{text.record.rank}</div>;
@@ -2128,24 +2129,24 @@ export default {
           customRender: (text) => {
             if (text.record.rank == "1") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/one.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/one.png")}
+                  />
               );
             } else if (text.record.rank == "2") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/two.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/two.png")}
+                  />
               );
             } else if (text.record.rank == "3") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/three.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/three.png")}
+                  />
               );
             } else {
               return <div>{text.record.rank}</div>;
@@ -2235,24 +2236,24 @@ export default {
           customRender: (text) => {
             if (text.record.rank == "1") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/one.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/one.png")}
+                  />
               );
             } else if (text.record.rank == "2") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/two.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/two.png")}
+                  />
               );
             } else if (text.record.rank == "3") {
               return (
-                <img
-                  style={{ width: 24, height: 24 }}
-                  src={require("../../assets/images/taskpage/three.png")}
-                />
+                  <img
+                      style={{width: 24, height: 24}}
+                      src={require("../../assets/images/taskpage/three.png")}
+                  />
               );
             } else {
               return <div>{text.record.rank}</div>;
@@ -2457,38 +2458,38 @@ export default {
     //任务大纲渲染
     const getTaskList = () => {
       let objtl = {
-        projectId: storage.get("projectId"),
+        projectId: state.projectId,
       };
       apitl
-        .getProjectDetail(objtl)
-        .then((res) => {
-          if (res.status == 200) {
-            console.log("阶段列表", res.data.data.stageList);
-            for (let i = 0; i < res.data.data.stageList.length; i++) {
-              for (
-                let k = 0;
-                k < res.data.data.stageList[i].taskList.length;
-                k++
-              ) {
-                if (res.data.data.stageList[i].taskList[k].name == "面授") {
-                  state.morFaceT = true;
-                  break;
+          .getProjectDetail(objtl)
+          .then((res) => {
+            if (res.status == 200) {
+              console.log("阶段列表", res.data.data.stageList);
+              for (let i = 0; i < res.data.data.stageList.length; i++) {
+                for (
+                    let k = 0;
+                    k < res.data.data.stageList[i].taskList.length;
+                    k++
+                ) {
+                  if (res.data.data.stageList[i].taskList[k].name == "面授") {
+                    state.morFaceT = true;
+                    break;
+                  }
                 }
               }
-            }
 
-            //暂时传个固定的id用 到时候看数据里面是否有在更换
-            // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
-            let leng = res.data.data.stageList.length;
-            if (leng > 0) {
-              let taskarr = res.data.data.stageList;
-              state.taskSyllabus = taskarr;
+              //暂时传个固定的id用 到时候看数据里面是否有在更换
+              // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
+              let leng = res.data.data.stageList.length;
+              if (leng > 0) {
+                let taskarr = res.data.data.stageList;
+                state.taskSyllabus = taskarr;
+              }
             }
-          }
-        })
-        .catch((err) => {
-          console.log("获取任务列表失败", err);
-        });
+          })
+          .catch((err) => {
+            console.log("获取任务列表失败", err);
+          });
     };
 
     //学员学员管理渲染
@@ -2588,16 +2589,16 @@ export default {
         topFlag: 1,
       };
       topStudent(obj)
-        .then((res) => {
-          console.log(`优秀学员授予成功${res.data}`);
-          message.success("优秀学员称号授予成功");
+          .then((res) => {
+            console.log(`优秀学员授予成功${res.data}`);
+            message.success("优秀学员称号授予成功");
 
-          getStu();
-        })
-        .catch((err) => {
-          console.log(`优秀学员授予成功${err}`);
-          message.warning("优秀学员称号授予失败");
-        });
+            getStu();
+          })
+          .catch((err) => {
+            console.log(`优秀学员授予成功${err}`);
+            message.warning("优秀学员称号授予失败");
+          });
       state.changeGoods = [];
       state.canclestu = false;
     };
@@ -2617,16 +2618,16 @@ export default {
         topFlag: 0,
       };
       topStudent(obj)
-        .then((res) => {
-          console.log(`取消优秀学员称号成功${res}`);
-          message.success("优秀学员称号取消成功");
+          .then((res) => {
+            console.log(`取消优秀学员称号成功${res}`);
+            message.success("优秀学员称号取消成功");
 
-          getStu();
-        })
-        .catch((err) => {
-          console.log(`取消优秀学员称号失败${err}`);
-          message.warning("优秀学员称号取消失败");
-        });
+            getStu();
+          })
+          .catch((err) => {
+            console.log(`取消优秀学员称号失败${err}`);
+            message.warning("优秀学员称号取消失败");
+          });
       state.changeGoods = [];
       state.canclestu1 = false;
     };
@@ -2863,29 +2864,29 @@ export default {
           customRender: (text) => {
             console.log(text.excellent);
             return (
-              <div>
-                {text.record.excellent ? (
-                  <div
-                    style={{
-                      display: "flex",
-                      alignItems: "center",
-                    }}
-                  >
-                    <span class="stydentName">{text.value}</span>
-                    <div class="studentExcellent">
-                      <img
-                        class="studentExcellentImg"
-                        src={require("../../assets/images/taskpage/excellent.png")}
-                      />
-                      <span class="studentExcellentT">优秀</span>
-                    </div>
-                  </div>
-                ) : (
-                  <div>
-                    <span>{text.value}</span>
-                  </div>
-                )}
-              </div>
+                <div>
+                  {text.record.excellent ? (
+                      <div
+                          style={{
+                            display: "flex",
+                            alignItems: "center",
+                          }}
+                      >
+                        <span class="stydentName">{text.value}</span>
+                        <div class="studentExcellent">
+                          <img
+                              class="studentExcellentImg"
+                              src={require("../../assets/images/taskpage/excellent.png")}
+                          />
+                          <span class="studentExcellentT">优秀</span>
+                        </div>
+                      </div>
+                  ) : (
+                      <div>
+                        <span>{text.value}</span>
+                      </div>
+                  )}
+                </div>
             );
           },
         },
@@ -2956,35 +2957,35 @@ export default {
           // width: 60,
           align: "center",
           className: "h",
-          scopedSlots: { customRender: "action" }, //引入的插槽
+          scopedSlots: {customRender: "action"}, //引入的插槽
           customRender: (text) => {
             // console.log(text);
             return (
-              <div
-                style={{
-                  display: "flex",
-                  alignItems: "center",
-                  justifyContent: "center",
-                }}
-              >
                 <div
-                  class="studentopea1"
-                  onClick={() => {
-                    if (text.record.excellent === false) {
-                      state.canclestu = true;
-                      console.log("youxiu", text.record.studentId);
-                      state.changeGoods.push(text.record.studentId);
-                    } else if (text.record.excellent === true) {
-                      state.canclestu1 = true;
-                      console.log("youxiu", text.record.studentId);
-                      state.changeGoods.push(text.record.studentId);
-                    }
-                  }}
+                    style={{
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "center",
+                    }}
                 >
-                  {text.record.excellent ? "取消优秀" : "优秀学员"}
-                </div>
+                  <div
+                      class="studentopea1"
+                      onClick={() => {
+                        if (text.record.excellent === false) {
+                          state.canclestu = true;
+                          console.log("youxiu", text.record.studentId);
+                          state.changeGoods.push(text.record.studentId);
+                        } else if (text.record.excellent === true) {
+                          state.canclestu1 = true;
+                          console.log("youxiu", text.record.studentId);
+                          state.changeGoods.push(text.record.studentId);
+                        }
+                      }}
+                  >
+                    {text.record.excellent ? "取消优秀" : "优秀学员"}
+                  </div>
 
-                {/**
+                  {/**
                    2022-11-30注释 后面放开
                    <div
                    class="studentopea2"
@@ -2997,39 +2998,39 @@ export default {
                    查看
                    </div>
                    */}
-                <div class="studentSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="换组" label="换组">
-                      <div
-                        onClick={() => {
-                          state.Changevisible = true;
-                          console.log(text, "xixixixix");
-                          state.ChangeGroupStuId = text.record.studentId;
-                          state.ChangeGroupStuName = text.record.name;
-                          state.ChangeGroupId = text.record.groupId;
-                        }}
-                      >
-                        换组
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="删除" label="删除">
-                      <div
-                        onClick={() => {
-                          // console.log("点击了111", text);
-                          showDeleteOne(text.record.studentId);
-                        }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                  </a-select>
+                  <div class="studentSelect">
+                    <a-select
+                        style="width: 50px"
+                        value="更多"
+                        // options={state.projectNameList}
+                        dropdownClassName="tabledropdown"
+                    >
+                      <a-select-option value="换组" label="换组">
+                        <div
+                            onClick={() => {
+                              state.Changevisible = true;
+                              console.log(text, "xixixixix");
+                              state.ChangeGroupStuId = text.record.studentId;
+                              state.ChangeGroupStuName = text.record.name;
+                              state.ChangeGroupId = text.record.groupId;
+                            }}
+                        >
+                          换组
+                        </div>
+                      </a-select-option>
+                      <a-select-option value="删除" label="删除">
+                        <div
+                            onClick={() => {
+                              // console.log("点击了111", text);
+                              showDeleteOne(text.record.studentId);
+                            }}
+                        >
+                          删除
+                        </div>
+                      </a-select-option>
+                    </a-select>
+                  </div>
                 </div>
-              </div>
             );
           },
         },
@@ -3076,13 +3077,13 @@ export default {
         type: type,
       };
       api
-        .billboard(obj)
-        .then((res) => {
-          console.log("获取成功", res);
-        })
-        .catch((err) => {
-          console.log("获取失败", err);
-        });
+          .billboard(obj)
+          .then((res) => {
+            console.log("获取成功", res);
+          })
+          .catch((err) => {
+            console.log("获取失败", err);
+          });
     };
 
     //搜索
@@ -3123,15 +3124,15 @@ export default {
         projectId: state.projectId,
         studentIds: state.chooseDeleteOne,
       })
-        .then((res) => {
-          console.log(res, "单个删除成功");
-          message.success("删除成功");
-          getStu();
-        })
-        .catch((err) => {
-          console.log(err, "单个删除失败");
-          message.warning("删除失败");
-        });
+          .then((res) => {
+            console.log(res, "单个删除成功");
+            message.success("删除成功");
+            getStu();
+          })
+          .catch((err) => {
+            console.log(err, "单个删除失败");
+            message.warning("删除失败");
+          });
       state.chooseDeleteOne = [];
     };
     //批量删除学员弹窗
@@ -3154,16 +3155,16 @@ export default {
         projectId: state.projectId,
         studentIds: state.selectedRows,
       })
-        .then((res) => {
-          console.log(res, "删除成功");
-          message.success("删除成功");
-          state.selectedRows = [];
-          getStu();
-        })
-        .catch((err) => {
-          console.log(err, "删除失败");
-          message.warning("删除失败");
-        });
+          .then((res) => {
+            console.log(res, "删除成功");
+            message.success("删除成功");
+            state.selectedRows = [];
+            getStu();
+          })
+          .catch((err) => {
+            console.log(err, "删除失败");
+            message.warning("删除失败");
+          });
       state.allDelete = false;
     };
     const handleChangeGood = (value) => {
@@ -3192,15 +3193,15 @@ export default {
           excellent: value.topFlag == 1 ? true : false, //是否优秀学员
           progress: value.completeStageCnt + "/" + value.totalStageCnt,
           putin:
-            value.source == 0
-              ? "报名加入"
-              : value.source == 1
-              ? "指定添加"
-              : value.source == 2
-              ? "组织添加"
-              : value.source == 3
-              ? "受众添加"
-              : "-", //加入方式
+              value.source == 0
+                  ? "报名加入"
+                  : value.source == 1
+                      ? "指定添加"
+                      : value.source == 2
+                          ? "组织添加"
+                          : value.source == 3
+                              ? "受众添加"
+                              : "-", //加入方式
           stutime: toDate(value.beginStudyTime, "Y-M-D"), //开始学习时间
         };
         array.push(obj);
@@ -3238,13 +3239,13 @@ export default {
         pageSize: 10,
         projectId: state.projectId,
         topFlag:
-          state.valuegood == "优秀学员"
-            ? 1
-            : state.valuegood == "普通学员"
-            ? 0
-            : state.valuegood == "全部"
-            ? ""
-            : "",
+            state.valuegood == "优秀学员"
+                ? 1
+                : state.valuegood == "普通学员"
+                    ? 0
+                    : state.valuegood == "全部"
+                        ? ""
+                        : "",
       };
       //重新获取列表
       getStu(obj);
@@ -3280,9 +3281,9 @@ export default {
     //学员重置
     const resetCancel = () => {
       (state.valuestun = null),
-        (state.valuestugroup = null),
-        (state.valuestub = null),
-        (state.valuegood = null);
+          (state.valuestugroup = null),
+          (state.valuestub = null),
+          (state.valuegood = null);
       getStu();
     };
     //获取学员列表
@@ -3298,22 +3299,22 @@ export default {
         topFlag: "",
       };
       getProjStu(objf)
-        .then((res) => {
-          console.log("获取学员列表", res.data);
-          if (res.data.code === 200) {
-            let leng = res.data.data.rows.length;
-            state.total = res.data.data.total;
-            if (leng > 0) {
-              let arr = res.data.data.rows;
-              getTableDataList(arr);
-              // studentData();
+          .then((res) => {
+            console.log("获取学员列表", res.data);
+            if (res.data.code === 200) {
+              let leng = res.data.data.rows.length;
+              state.total = res.data.data.total;
+              if (leng > 0) {
+                let arr = res.data.data.rows;
+                getTableDataList(arr);
+                // studentData();
+              }
             }
-          }
-          state.loading = false;
-        })
-        .catch((err) => {
-          console.log("获取学员列表失败", err);
-        });
+            state.loading = false;
+          })
+          .catch((err) => {
+            console.log("获取学员列表失败", err);
+          });
     };
     //获取项目信息
     const getTaskInfo = () => {
@@ -3382,17 +3383,17 @@ export default {
         projectId: state.projectId,
       };
       getGroupList(objf)
-        .then((res) => {
-          console.log(res.data.data.rows, "获取小组列表成功");
-          let leng = res.data.data.rows.length;
-          if (leng > 0) {
-            let arr = res.data.data.rows;
-            setGroupList(arr);
-          }
-        })
-        .catch((err) => {
-          console.log(err, "获取列表失败");
-        });
+          .then((res) => {
+            console.log(res.data.data.rows, "获取小组列表成功");
+            let leng = res.data.data.rows.length;
+            if (leng > 0) {
+              let arr = res.data.data.rows;
+              setGroupList(arr);
+            }
+          })
+          .catch((err) => {
+            console.log(err, "获取列表失败");
+          });
     };
     //删除小组
     const deleteGroupBtn = (projectGroupId) => {
@@ -3414,15 +3415,15 @@ export default {
         projectId: state.projectId,
       };
       editGroup(obj)
-        .then((res) => {
-          console.log("小组创建成功", res);
-          message.success("小组创建成功");
-          getGroup();
-        })
-        .catch((err) => {
-          console.log("小组创建失败", err);
-          message.warning("小组创建失败");
-        });
+          .then((res) => {
+            console.log("小组创建成功", res);
+            message.success("小组创建成功");
+            getGroup();
+          })
+          .catch((err) => {
+            console.log("小组创建失败", err);
+            message.warning("小组创建失败");
+          });
     };
     //搜索小组重置
     const resetGroupName = () => {
@@ -3453,31 +3454,31 @@ export default {
     //start---------项目概览
     // 获取项目概览
     const getOverview = () => {
-      overview({ projectId: state.projectId })
-        .then((res) => {
-          Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
-            levelList.projectInfoOverview[item] =
-              res.data.data.projectInfoOverview[item] || 0;
+      overview({projectId: state.projectId})
+          .then((res) => {
+            Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
+              levelList.projectInfoOverview[item] =
+                  res.data.data.projectInfoOverview[item] || 0;
+            });
+            Object.keys(res.data.data.stageOverviewList).forEach((item) => {
+              levelList.stageOverviewList[item] =
+                  res.data.data.stageOverviewList[item] || 0;
+            });
+            // res.data.data.routerInfoOverview.forEach((r) => {
+            //   console.log(r)
+            // })
+            // state.addLoading = false;
+            console.log("项目概览--" + res);
+          })
+          .catch((err) => {
+            // state.addLoading = false;
+            // message.error("概览获取失败");
+            console.log("获取失败" + err);
           });
-          Object.keys(res.data.data.stageOverviewList).forEach((item) => {
-            levelList.stageOverviewList[item] =
-              res.data.data.stageOverviewList[item] || 0;
-          });
-          // res.data.data.routerInfoOverview.forEach((r) => {
-          //   console.log(r)
-          // })
-          // state.addLoading = false;
-          console.log("项目概览--" + res);
-        })
-        .catch((err) => {
-          // state.addLoading = false;
-          // message.error("概览获取失败");
-          console.log("获取失败" + err);
-        });
     };
     //end---------项目概览
 
-    const handleChange = ({ file, fileList }) => {
+    const handleChange = ({file, fileList}) => {
       let list = [];
       if (file.status !== "uploading") {
         console.log("上传的list", fileList);
@@ -3510,12 +3511,12 @@ export default {
           templateId: state.templateId || 0,
           type: state.type,
         })
-          .then((res) => {
-            console.log("上传成功", res);
-          })
-          .catch((err) => {
-            console.log("上传失败了", err);
-          });
+            .then((res) => {
+              console.log("上传成功", res);
+            })
+            .catch((err) => {
+              console.log("上传失败了", err);
+            });
       }
 
       if (file.status === "done") {
@@ -3564,13 +3565,13 @@ export default {
       }).then((res) => {
         state.action = res.data.data.projectInfo.status;
         state.act =
-          state.action == 0
-            ? "发布"
-            : state.action == 1
-            ? "撤回"
-            : state.action == -1
-            ? ""
-            : "-";
+            state.action == 0
+                ? "发布"
+                : state.action == 1
+                    ? "撤回"
+                    : state.action == -1
+                        ? ""
+                        : "-";
       });
     };
     //打开发布弹窗
@@ -3587,18 +3588,18 @@ export default {
         projectId: state.projectId,
       };
       apiproj
-        .projectStudent(obj)
-        .then((res) => {
-          if (res.status === 200) {
-            // console.log("res", res.data);
-            state.projectStudentsNum = res.data.data.total
-              ? res.data.data.total
-              : 0;
-          }
-        })
-        .catch((err) => {
-          console.log("获取学员人数失败", err);
-        });
+          .projectStudent(obj)
+          .then((res) => {
+            if (res.status === 200) {
+              // console.log("res", res.data);
+              state.projectStudentsNum = res.data.data.total
+                  ? res.data.data.total
+                  : 0;
+            }
+          })
+          .catch((err) => {
+            console.log("获取学员人数失败", err);
+          });
       //获取阶段及任务总数
     };
     //关闭发布弹窗
@@ -3612,17 +3613,17 @@ export default {
         projectId: state.releaseProjectId,
       };
       apiproj
-        .releaseProject(obj)
-        .then((res) => {
-          console.log("发布成功", res);
-          message.destroy();
-          message.success("发布成功");
-          state.projectPub = false;
-          reget();
-        })
-        .catch((err) => {
-          console.log("发布失败", err);
-        });
+          .releaseProject(obj)
+          .then((res) => {
+            console.log("发布成功", res);
+            message.destroy();
+            message.success("发布成功");
+            state.projectPub = false;
+            reget();
+          })
+          .catch((err) => {
+            console.log("发布失败", err);
+          });
     };
 
     //打开撤回弹窗
@@ -3639,17 +3640,17 @@ export default {
         type: 0,
       };
       apiproj
-        .handleProject(obj)
-        .then((res) => {
-          console.log("撤回成功", res);
-          message.destroy();
-          message.success("撤回成功");
-          state.backModal = false;
-          reget();
-        })
-        .catch((err) => {
-          console.log("撤回失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("撤回成功", res);
+            message.destroy();
+            message.success("撤回成功");
+            state.backModal = false;
+            reget();
+          })
+          .catch((err) => {
+            console.log("撤回失败", err);
+          });
     };
     //关闭结束弹窗
     const closeStopModal = () => {
@@ -3662,17 +3663,17 @@ export default {
         type: -1,
       };
       apiproj
-        .handleProject(obj)
-        .then((res) => {
-          console.log("结束成功", res);
-          message.destroy();
-          message.success("已结束");
-          state.stopModal = false;
-          reget();
-        })
-        .catch((err) => {
-          console.log("结束失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("结束成功", res);
+            message.destroy();
+            message.success("已结束");
+            state.stopModal = false;
+            reget();
+          })
+          .catch((err) => {
+            console.log("结束失败", err);
+          });
     };
     //打开结束弹窗
     const showStopModal = () => {
@@ -3693,17 +3694,17 @@ export default {
         type: 1,
       };
       apiproj
-        .handleProject(obj)
-        .then((res) => {
-          console.log("模版保存成功", res);
-          message.destroy();
-          message.success("模版保存成功");
-          state.startModal = false;
-          reget();
-        })
-        .catch((err) => {
-          console.log("模版保存失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("模版保存成功", res);
+            message.destroy();
+            message.success("模版保存成功");
+            state.startModal = false;
+            reget();
+          })
+          .catch((err) => {
+            console.log("模版保存失败", err);
+          });
     };
     //删除文件
     const deFile = (id) => {
@@ -3738,42 +3739,42 @@ export default {
         templateId: state.templateId || 0,
         type: state.type,
       })
-        .then((res) => {
-          console.log("上传成功", res);
-          message.destroy();
-          return message.success("删除成功");
-        })
-        .catch((err) => {
-          console.log("上传失败了", err);
-          message.warning("删除失败");
-        });
+          .then((res) => {
+            console.log("上传成功", res);
+            message.destroy();
+            return message.success("删除成功");
+          })
+          .catch((err) => {
+            console.log("上传失败了", err);
+            message.warning("删除失败");
+          });
     };
 
     //添加学员
     watch(
-      () => state.addAuthList,
-      (res) => {
-        console.log("res", res, state.addAuthList);
-        let obj = {
-          deptList: res[1],
-          groupList: res[2],
-          projectId: state.projectId,
-          studentList: res[0],
-          projectGroupId: 0,
-        };
-        console.log("obj", obj);
-        state.loading = true;
-        api
-          .addStudentProject(obj)
-          .then((res) => {
-            console.log("添加学员成功", res);
-            message.success("添加学员成功");
-            getStu();
-          })
-          .catch((err) => {
-            console.log("添加学员失败", err);
-          });
-      }
+        () => state.addAuthList,
+        (res) => {
+          console.log("res", res, state.addAuthList);
+          let obj = {
+            deptList: res[1],
+            groupList: res[2],
+            projectId: state.projectId,
+            studentList: res[0],
+            projectGroupId: 0,
+          };
+          console.log("obj", obj);
+          state.loading = true;
+          api
+              .addStudentProject(obj)
+              .then((res) => {
+                console.log("添加学员成功", res);
+                message.success("添加学员成功");
+                getStu();
+              })
+              .catch((err) => {
+                console.log("添加学员失败", err);
+              });
+        }
     );
     onMounted(() => {
       getStu();
@@ -3894,8 +3895,8 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-          rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%
         );
       }
 
@@ -3903,9 +3904,9 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -3943,9 +3944,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-              180deg,
-              rgba(254, 243, 221, 1),
-              rgba(255, 250, 240, 1)
+                    180deg,
+                    rgba(254, 243, 221, 1),
+                    rgba(255, 250, 240, 1)
             );
             border-radius: 10px;
             margin-right: 7px;
@@ -3969,9 +3970,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-              180deg,
-              rgba(221, 234, 255, 1),
-              rgba(240, 248, 254, 1)
+                    180deg,
+                    rgba(221, 234, 255, 1),
+                    rgba(240, 248, 254, 1)
             );
             border-radius: 10px;
 
@@ -4090,8 +4091,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -4217,8 +4218,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -4349,8 +4350,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -4450,9 +4451,9 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -4551,8 +4552,8 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-          rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%
         );
       }
 
@@ -4591,9 +4592,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-              180deg,
-              rgba(254, 243, 221, 1),
-              rgba(255, 250, 240, 1)
+                    180deg,
+                    rgba(254, 243, 221, 1),
+                    rgba(255, 250, 240, 1)
             );
             border-radius: 10px;
             margin-right: 7px;
@@ -4617,9 +4618,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-              180deg,
-              rgba(221, 234, 255, 1),
-              rgba(240, 248, 254, 1)
+                    180deg,
+                    rgba(221, 234, 255, 1),
+                    rgba(240, 248, 254, 1)
             );
             border-radius: 10px;
 
@@ -5580,8 +5581,8 @@ export default {
       }
 
       .ant-table-tbody
-        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-        > td {
+      > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      > td {
         background: rgba(250, 250, 250, 1);
       }
 
@@ -5695,8 +5696,8 @@ export default {
         display: inline-block;
 
         .ant-select:not(.ant-select-customize-input)
-          .ant-select-selector
-          .ant-select-selection-search-input {
+        .ant-select-selector
+        .ant-select-selection-search-input {
           background-color: rgba(255, 255, 255, 0);
           border: none;
         }
@@ -5707,12 +5708,12 @@ export default {
         }
 
         .ant-select-single:not(.ant-select-customize-input)
-          .ant-select-selector {
+        .ant-select-selector {
           padding: 0;
         }
 
         .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input)
-          .ant-select-selector {
+        .ant-select-selector {
           box-shadow: none;
         }
 
@@ -6132,8 +6133,8 @@ export default {
           }
 
           .ant-table-tbody
-            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-            > td {
+          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          > td {
             background: #f6f9fd;
           }
         }
@@ -6734,8 +6735,8 @@ export default {
             width: calc(100%);
             height: 40px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
             );
           }