From 3511b29e542a9dab5bb821e3a9ea3cb8859613a3 Mon Sep 17 00:00:00 2001
From: zxj <zhang.xijie@iwhalecloud.com>
Date: Mon, 17 Nov 2025 18:04:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=80=89=E4=BF=AE=E8=AF=BE=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskAdd.vue  | 797 ++++++++++++++++++---------
 src/views/projectcenter/TaskPage.vue |  14 +
 2 files changed, 554 insertions(+), 257 deletions(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 5a3fe2b9..13ab5170 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -5,21 +5,37 @@
         <div class="leftmain">
           <div class="tit">
             阶段
-            <img src="../../assets/images/projectadd/right.png" style="margin-left: 10px; cursor: pointer"
-                 @click="removeAllLevel" v-show="projectInfo.stageList[0].id != '0'"/>
+            <img
+              src="../../assets/images/projectadd/right.png"
+              style="margin-left: 10px; cursor: pointer"
+              @click="removeAllLevel"
+              v-show="projectInfo.stageList[0].id != '0'"
+            />
           </div>
           <div class="btn btn3" @click="showModal" style="margin-left: 19px">
             <div class="search"></div>
             <div class="btnText">添加阶段</div>
           </div>
           <div class="maincon" style="background-color: #fff">
-            <Draggable v-model="projectInfo.stageList" chosenClass="chosen" ghostClass="ghost" forceFallback="true"
-                       group="stage" animation="500"
-                       v-if="JSON.stringify(projectInfo.stageList[0].taskDraftDtoList[0]) != '{}'">
-              <template #item="{ element,index }">
-                <div class="items" v-if="element.id !=='0' && !element.deleted"
-                     :class="activeIndex === index ? 'active' : ''"
-                     @click="changeStageIndex(index)">
+            <Draggable
+              v-model="projectInfo.stageList"
+              chosenClass="chosen"
+              ghostClass="ghost"
+              forceFallback="true"
+              group="stage"
+              animation="500"
+              v-if="
+                JSON.stringify(projectInfo.stageList[0].taskDraftDtoList[0]) !=
+                '{}'
+              "
+            >
+              <template #item="{ element, index }">
+                <div
+                  class="items"
+                  v-if="element.id !== '0' && !element.deleted"
+                  :class="activeIndex === index ? 'active' : ''"
+                  @click="changeStageIndex(index)"
+                >
                   <div class="items1">
                     <div class="boxs_left">
                       <a-popover placement="topLeft" trigger="click">
@@ -32,7 +48,9 @@
                           <span>阶段说明</span>
                         </template>
                         <div class="script">
-                          <span style="font-size: 12px; color: #ffffff">说明</span>
+                          <span style="font-size: 12px; color: #ffffff"
+                            >说明</span
+                          >
                         </div>
                       </a-popover>
                       <div class="imgIcon" @click="editModal(index)"></div>
@@ -42,7 +60,10 @@
                     </div>
                   </div>
                   <div class="items2">
-                    <a-popover placement="topLeft" v-if="element.name?.length > 10">
+                    <a-popover
+                      placement="topLeft"
+                      v-if="element.name?.length > 10"
+                    >
                       <template #content>
                         <div style="width: 130px">
                           {{ element.name }}
@@ -67,7 +88,7 @@
           <div class="filt">
             <div class="le">
               <div class="leftimg">
-                <img class="img" :src="projectInfo?.projectInfo?.picUrl"/>
+                <img class="img" :src="projectInfo?.projectInfo?.picUrl" />
               </div>
               <div class="imgfor">
                 <div class="forz" style="font-weight: 700">
@@ -76,21 +97,45 @@
               </div>
             </div>
             <div class="rightt">
-              <div class="select" style="margin-right:90px;">
+              <div class="select" style="margin-right: 90px">
                 <span>学习模式：</span>
                 <span
-                    style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
-									{{ projectInfo?.projectInfo?.unlockMode === 1 ? '自由学习模式' : '闯关模式' }}
-								</span>
+                  style="
+                    border: 1px solid rgba(0, 0, 0, 0.25);
+                    width: 120px;
+                    height: 38px;
+                    border-radius: 10px;
+                    text-align: center;
+                    line-height: 38px;
+                  "
+                >
+                  {{
+                    projectInfo?.projectInfo?.unlockMode === 1
+                      ? "自由学习模式"
+                      : "闯关模式"
+                  }}
+                </span>
                 <unlock-mode :routerInfo="projectInfo.projectInfo" :types="2">
-                  <a-button type="primary" size="large" style="margin-left:10px;border-radius: 10px;">切换模式
+                  <a-button
+                    type="primary"
+                    size="large"
+                    style="margin-left: 10px; border-radius: 10px"
+                    >切换模式
                   </a-button>
                 </unlock-mode>
               </div>
               <div class="line"></div>
-              <router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId, routerEdit: true  } }">
+              <router-link
+                :to="{
+                  path: `/taskpage`,
+                  query: { projectId: route.query.projectId, routerEdit: true },
+                }"
+              >
                 <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>
@@ -98,20 +143,29 @@
           </div>
         </div>
         <div class="mid">
-          <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
-            <div v-if="key!=13">
-              <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="1" :id="projectInfo.projectInfo?.id" :courseSyncFlag="projectInfo.projectInfo?.courseSyncFlag"
-                         v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList" :chapter-list="projectInfo.stageList">
+          <div class="item" v-for="(value, key) in TASK_TYPE" :key="key">
+            <div v-if="key != 13">
+              <component
+                :is="value.component"
+                :ref="(el) => (courseRef['el' + key] = el)"
+                :type="key"
+                :infoType="1"
+                :id="projectInfo.projectInfo?.id"
+                :courseSyncFlag="projectInfo.projectInfo?.courseSyncFlag"
+                v-model:task-list="
+                  projectInfo.stageList[activeIndex].taskDraftDtoList
+                "
+                :chapter-list="projectInfo.stageList"
+              >
                 <div class="itcon">
                   <div class="img">
-                    <img :src="value.img"/>
+                    <img :src="value.img" />
                   </div>
                   <div class="text">{{ value.name }}</div>
                 </div>
               </component>
             </div>
-            <div>
-            </div>
+            <div></div>
             <div class="lin"></div>
           </div>
         </div>
@@ -120,14 +174,21 @@
             <div class="onerow">
               <div class="taskmain">任务列表</div>
               <div class="taskmain_switch">
-                <span class="taskmain_switch_text" :style="{color: switchList ? '#4ea6ff' : '#ffb64e'}">{{switchList ?'自由学习模式':'顺序学习模式'}}</span>
+                <span
+                  class="taskmain_switch_text"
+                  :style="{ color: switchList ? '#4ea6ff' : '#ffb64e' }"
+                  >{{ switchList ? "自由学习模式" : "顺序学习模式" }}</span
+                >
                 <a-switch v-model:checked="switchList" />
               </div>
               <button class="btn" @click="showChangeModal">
                 移动任务到阶段
               </button>
               <div class="edit" @click="deleteTaskAll">
-                <img class="editimg" src="../../assets/images/projectadd/delete1.png"/>
+                <img
+                  class="editimg"
+                  src="../../assets/images/projectadd/delete1.png"
+                />
                 <span class="editext">批量删除</span>
               </div>
             </div>
@@ -149,7 +210,8 @@
             </div>
             <div class="rwbox">
               <div class="tableBox" style="border: 1px solid #f2f6fc">
-                <div style="
+                <div
+                  style="
                     height: 50px;
                     display: flex;
                     justify-content: space-between;
@@ -160,39 +222,54 @@
                     color: #999ba3;
                     line-height: 36px;
                     border-bottom: 1px solid #f2f6fc;
-                  ">
-                  <div style="
+                  "
+                >
+                  <div
+                    style="
                       width: 87px;
                       text-align: center;
                       display: flex;
                       margin-left: 46px;
-                    ">
-                    <img style="
+                    "
+                  >
+                    <img
+                      style="
                         width: 16px;
                         height: 16px;
                         cursor: pointer;
                         margin-top: 12px;
-                      " :src="
-                      	selectAll === 0
-                      		? require('../../assets/images/notSelect.png')
-                      		: selectAll === 1
-                      			? require('../../assets/images/selectAll.png')
-                      			: require('../../assets/images/select.png')
-                     " @click="selectRowAll"/>
+                      "
+                      :src="
+                        selectAll === 0
+                          ? require('../../assets/images/notSelect.png')
+                          : selectAll === 1
+                          ? require('../../assets/images/selectAll.png')
+                          : require('../../assets/images/select.png')
+                      "
+                      @click="selectRowAll"
+                    />
                     <div style="margin-top: 2px; margin-left: 8px">类型</div>
                   </div>
                   <div style="width: 120px; text-align: center">任务名称</div>
                   <div style="width: 120px; text-align: center">必修/选修</div>
                   <div style="width: 87px; text-align: center">时长</div>
-                  <div style="width: 120px; text-align: center; margin-right: 20px">
+                  <div
+                    style="width: 120px; text-align: center; margin-right: 20px"
+                  >
                     操作
                   </div>
                 </div>
-                <Draggable v-model="projectInfo.stageList[activeIndex].taskDraftDtoList" chosenClass="chosen"
-                           ghostClass="ghost"
-                           forceFallback="true" group="task" animation="500">
-                  <template #item="{ element,index }">
-                    <div style="
+                <Draggable
+                  v-model="projectInfo.stageList[activeIndex].taskDraftDtoList"
+                  chosenClass="chosen"
+                  ghostClass="ghost"
+                  forceFallback="true"
+                  group="task"
+                  animation="500"
+                >
+                  <template #item="{ element, index }">
+                    <div
+                      style="
                         height: 50px;
                         display: flex;
                         justify-content: space-between;
@@ -202,44 +279,66 @@
                         font-weight: 400;
                         color: #4f5156;
                         line-height: 36px;
-                      " class="tableRow" v-if="!element.deleted">
-                      <div style="
+                      "
+                      class="tableRow"
+                      v-if="!element.deleted"
+                    >
+                      <div
+                        style="
                           width: 87px;
                           text-align: center;
                           margin-left: 46px;
                           position: relative;
-                        ">
+                        "
+                      >
                         <div class="racona">
-                          <div class="img" style="
+                          <div
+                            class="img"
+                            style="
                               cursor: pointer;
                               margin-top: 2px;
                               margin-right: 9px;
                               position: absolute;
                               left: -25px;
-                            "></div>
-                          <a-checkbox :id="element.id" v-model:checked="element.checked"></a-checkbox>
+                            "
+                          ></div>
+                          <a-checkbox
+                            :id="element.id"
+                            v-model:checked="element.checked"
+                          ></a-checkbox>
                           <div style="margin-top: 2px; margin-left: 8px">
-                            {{ TASK_TYPE[element.type]?.name || '' }}
+                            {{ TASK_TYPE[element.type]?.name || "" }}
                           </div>
                         </div>
                       </div>
-                      <div style="
+                      <div
+                        style="
                           width: 120px;
                           text-align: center;
                           overflow: hidden;
                           text-overflow: ellipsis;
                           white-space: nowrap;
-                        " :title="element.name">
+                        "
+                        :title="element.name"
+                      >
                         {{ element.name }}
                       </div>
                       <div style="width: 120px; text-align: center">
                         <div class="opat">
                           <div class="opacationt clearfix">
-                            <a-switch style="margin-left: -50px; margin-top: 3px"
-                                      v-model:checked="element.flag" size="small"
-                                      active-color="red"/>
+                            <a-switch
+                              style="margin-left: -50px; margin-top: 3px"
+                              v-model:checked="element.flag"
+                              size="small"
+                              active-color="red"
+                            />
                             <div class="showt clearfix">
-                              <div class="bi" :style="{'z-index': element.flag ? 889 : 887,}">必修</div>
+                              <div
+                                class="bi"
+                                :style="{ 'z-index': element.flag ? 889 : 887 }"
+                              >
+                                必修
+                              </div>
                               <div class="xuan">选修</div>
                             </div>
                           </div>
@@ -248,34 +347,45 @@
                       <div style="width: 87px; text-align: center">
                         {{ element.duration ? element.duration + "分钟" : "-" }}
                       </div>
-                      <div style="
+                      <div
+                        style="
                           width: 120px;
                           text-align: center;
                           margin-right: 20px;
-                        ">
+                        "
+                      >
                         <div class="opa">
                           <div class="opacation">
-                            <span 
-                              v-if="element.type==2 && element.id"
-                              style="color: #4ea6ff; cursor: pointer;" 
-                              @click="openCourse(element,index)">
+                            <span
+                              v-if="element.type == 2 && element.id"
+                              style="color: #4ea6ff; cursor: pointer"
+                              @click="openCourse(element, index)"
+                            >
                               开课
                             </span>
-								            <span 
-                              v-if="element.type!==2"
-                              style="color: #4ea6ff;cursor: pointer;" 
-                              @click="editTaskForType(element,index)">
-															编辑
-														</span> 
-                            <span 
-                              v-if="projectInfo.projectInfo.status !==3 && element.type===2"
-                              style="color: #4ea6ff;cursor: pointer;" 
-                              @click="editTaskForType(element,index)">
-															编辑
-														</span>
-                            <span style="color: #4ea6ff; cursor: pointer" @click="confirmDelTask(index)">
-															删除
-														</span>
+                            <span
+                              v-if="element.type !== 2"
+                              style="color: #4ea6ff; cursor: pointer"
+                              @click="editTaskForType(element, index)"
+                            >
+                              编辑
+                            </span>
+                            <span
+                              v-if="
+                                projectInfo.projectInfo.status !== 3 &&
+                                element.type === 2
+                              "
+                              style="color: #4ea6ff; cursor: pointer"
+                              @click="editTaskForType(element, index)"
+                            >
+                              编辑
+                            </span>
+                            <span
+                              style="color: #4ea6ff; cursor: pointer"
+                              @click="confirmDelTask(index)"
+                            >
+                              删除
+                            </span>
                           </div>
                         </div>
                       </div>
@@ -291,91 +401,151 @@
 
     <div class="footbtn footBox">
       <div class="btnbox">
-        <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
-        <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
-        <router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId, routerEdit: true } }">
+        <a-button
+          class="btn btn1"
+          @click="temporaryStorage"
+          :loading="confirmLoading"
+          >暂存</a-button
+        >
+        <a-button
+          class="btn btn1"
+          @click="submitStorage"
+          :loading="confirmLoading"
+          >确定</a-button
+        >
+        <router-link
+          :to="{
+            path: `/taskpage`,
+            query: { projectId: route.query.projectId, routerEdit: true },
+          }"
+        >
           <!-- @click="cancelStorage" -->
           <a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
         </router-link>
       </div>
     </div>
     <div>
-      <div style="height:80px;width:100%;"/>
+      <div style="height: 80px; width: 100%" />
     </div>
     <!-- 添加阶段弹窗 -->
-    <a-modal v-model:visible="stage" :title="null" @ok="closeModal" :footer="null" :closable="false"
-             wrapClassName="addstage" width="624px" height="388px" :centered="true" @cancel="closeModal">
-      <div class="modalHeader" style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          ">
+    <a-modal
+      v-model:visible="stage"
+      :title="null"
+      @ok="closeModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="addstage"
+      width="624px"
+      height="388px"
+      :centered="true"
+      @cancel="closeModal"
+    >
+      <div
+        class="modalHeader"
+        style="
+          width: 100%;
+          height: 68px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
         <div class="headerLeft" style="margin-left: 32px">
-          <span class="headerLeftText" style="font-size: 16px">编辑/添加阶段</span>
+          <span class="headerLeftText" style="font-size: 16px"
+            >编辑/添加阶段</span
+          >
         </div>
         <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
-          <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png"/>
+          <img
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
+          />
         </div>
       </div>
       <div class="modalMain" style="width: 100%">
         <div class="name">
           <div class="namebox">
             <div>
-              <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
+              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
             </div>
             <div class="inname">阶段名称：</div>
           </div>
           <div class="in">
-            <a-input v-model:value="formValue.name" show-count :maxlength="20" placeholder="请输入阶段名称"/>
+            <a-input
+              v-model:value="formValue.name"
+              show-count
+              :maxlength="20"
+              placeholder="请输入阶段名称"
+            />
           </div>
         </div>
         <div class="name" style="display: flex; align-items: flex-start">
           <div class="namebox">
             <div class="inname">阶段说明：</div>
           </div>
-          <div class="intext" style="margin-left: 14px;height:100%;width:100%">
-            <a-textarea v-model:value="formValue.remark" style="height:100%;width:100% " show-count  rows=6 :maxlength="100"
-                        placeholder="请输入阶段说明"/>
+          <div
+            class="intext"
+            style="margin-left: 14px; height: 100%; width: 100%"
+          >
+            <a-textarea
+              v-model:value="formValue.remark"
+              style="height: 100%; width: 100%"
+              show-count
+              rows="6"
+              :maxlength="100"
+              placeholder="请输入阶段说明"
+            />
           </div>
         </div>
-        <div style="
-              display: flex;
-              width: 100%;
-              justify-content: center;
-              margin-top: 40px;
-            ">
-          <button @click="closeModal" style="
-                cursor: pointer;
-                height: 40px;
-                width: 100px;
-                border: 1px solid #4ea6ff;
-                border-radius: 4px;
-                color: #fff;
-                background-color: #4ea6ff;
-              ">
+        <div
+          style="
+            display: flex;
+            width: 100%;
+            justify-content: center;
+            margin-top: 40px;
+          "
+        >
+          <button
+            @click="closeModal"
+            style="
+              cursor: pointer;
+              height: 40px;
+              width: 100px;
+              border: 1px solid #4ea6ff;
+              border-radius: 4px;
+              color: #fff;
+              background-color: #4ea6ff;
+            "
+          >
             取消
           </button>
-          <button @click="editStage" style="
-                cursor: pointer;
-                margin-left: 16px;
-                margin-bottom: 40px;
-                height: 40px;
-                width: 100px;
-                border: 1px solid #4ea6ff;
-                border-radius: 4px;
-                color: #ffffff;
-                background-color: #4ea6ff;
-              ">
+          <button
+            @click="editStage"
+            style="
+              cursor: pointer;
+              margin-left: 16px;
+              margin-bottom: 40px;
+              height: 40px;
+              width: 100px;
+              border: 1px solid #4ea6ff;
+              border-radius: 4px;
+              color: #ffffff;
+              background-color: #4ea6ff;
+            "
+          >
             确定
           </button>
         </div>
       </div>
     </a-modal>
     <!-- 移动任务到阶段 -->
-    <a-modal style="padding: 0" v-model:visible="visiblene" :footer="null" :centered="true"
-             wrapClassName="moveModal">
+    <a-modal
+      style="padding: 0"
+      v-model:visible="visiblene"
+      :footer="null"
+      :centered="true"
+      wrapClassName="moveModal"
+    >
       <div class="con">
         <div class="header">
           <div class="inhe">
@@ -385,19 +555,41 @@
         </div>
         <div class="mid">
           <div class="inher">
-            <div class="cur">已选中{{
-                projectInfo.stageList[activeIndex]?.taskDraftDtoList?.filter(t => t.checked)?.length
+            <div class="cur">
+              已选中{{
+                projectInfo.stageList[activeIndex]?.taskDraftDtoList?.filter(
+                  (t) => t.checked
+                )?.length
               }}个任务
             </div>
             <div class="select">
-              <a-select v-model:value="moveChapterIndex" style="width: 100%" placeholder="请选择阶段" allowClear
-                        :options="projectInfo.stageList.map(({name:label},value)=>({label,value,disabled:value===activeIndex}))"></a-select>
+              <a-select
+                v-model:value="moveChapterIndex"
+                style="width: 100%"
+                placeholder="请选择阶段"
+                allowClear
+                :options="
+                  projectInfo.stageList.map(({ name: label }, value) => ({
+                    label,
+                    value,
+                    disabled: value === activeIndex,
+                  }))
+                "
+              ></a-select>
             </div>
             <div class="btn">
-              <button style="cursor: pointer" class="sameb btn2" @click="closeChangeModal">
+              <button
+                style="cursor: pointer"
+                class="sameb btn2"
+                @click="closeChangeModal"
+              >
                 取消
               </button>
-              <button style="cursor: pointer" class="sameb btn2" @click="moveTask">
+              <button
+                style="cursor: pointer"
+                class="sameb btn2"
+                @click="moveTask"
+              >
                 确定
               </button>
             </div>
@@ -406,118 +598,161 @@
       </div>
     </a-modal>
     <!-- 面授课开课弹框 -->
-    <AddOpenCourse ref="coursePlanRef" :type="1"/>
+    <AddOpenCourse ref="coursePlanRef" :type="1" />
   </div>
 </template>
 
 <script setup>
-import {computed, onMounted, ref, watch,} from "vue";
-import {message} from "ant-design-vue";
+import { computed, onMounted, ref, watch } from "vue";
+import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
 import AddOpenCourse from "@/components/drawers/AddOpenCourse.vue";
 import Draggable from "vuedraggable";
-import {useRoute} from "vue-router";
-import {TASK_TYPE} from "@/utils/const";
-import {request} from "@/api/request";
-import {PROJECT_DETAIL_MODIFY, PROJECT_RELEASE} from "@/api/apis";
+import { useRoute } from "vue-router";
+import { TASK_TYPE } from "@/utils/const";
+import { request } from "@/api/request";
+import { PROJECT_DETAIL_MODIFY, PROJECT_RELEASE } from "@/api/apis";
 import dialog from "@/utils/dialog";
 import { editProjectModel } from "@/api/indexLearningPath";
 const route = useRoute();
-const courseRef = ref({})
+const courseRef = ref({});
 const visiblene = ref(false);
 const stage = ref(false);
 const confirmLoading = ref(false);
 const cancleLoading = ref(false);
 const coursePlanRef = ref();
-const projectInfo = ref({stageList: [{taskDraftDtoList: [{}]}], projectInfo: {}});
+const projectInfo = ref({
+  stageList: [{ taskDraftDtoList: [{}] }],
+  projectInfo: {},
+});
 const activeIndex = ref(0);
 const moveChapterIndex = ref(0);
-const formValue = ref({taskDraftDtoList: []});
-
+const formValue = ref({ taskDraftDtoList: [] });
 
 const selectAll = computed(() => {
-  const selectedNum = projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.filter(t => t.checked)?.length
+  const selectedNum = projectInfo.value?.stageList[
+    activeIndex.value
+  ]?.taskDraftDtoList?.filter((t) => t.checked)?.length;
   if (!selectedNum) {
-    return 0
+    return 0;
   }
-  if (selectedNum === projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.length) {
-    return 1
+  if (
+    selectedNum ===
+    projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.length
+  ) {
+    return 1;
   }
-  return 2
-})
+  return 2;
+});
 
-watch(() => projectInfo.value.stageList, () => {
-  projectInfo.value.stageList.forEach((t, i) => {
-    t.sort = i;
-    t.taskDraftDtoList?.forEach((s, j) => {
-      s.sort = j
-    })
-  })
-}, {deep: true})
+watch(
+  () => projectInfo.value.stageList,
+  () => {
+    projectInfo.value.stageList.forEach((t, i) => {
+      t.sort = i;
+      t.taskDraftDtoList?.forEach((s, j) => {
+        s.sort = j;
+      });
+    });
+  },
+  { deep: true }
+);
 
 function changeStageIndex(index) {
-  activeIndex.value = index
-  projectInfo.value?.stageList[activeIndex.value]?.studyModel == 1 ? switchList.value = false : switchList.value = true
+  activeIndex.value = index;
+  projectInfo.value?.stageList[activeIndex.value]?.studyModel == 1
+    ? (switchList.value = false)
+    : (switchList.value = true);
 }
 
 //获取任务列表
 const getTask = async () => {
-  await api.getDraftTask({projectId: route.query.projectId}).then((res) => {
-    projectInfo.value = res.data.data
-    projectInfo.value?.stageList[activeIndex.value]?.studyModel == 1 ? switchList.value = false : switchList.value = true
-    console.log("获取任务列表:" + JSON.stringify(projectInfo.value) )
+  await api.getDraftTask({ projectId: route.query.projectId }).then((res) => {
+    projectInfo.value = res.data.data;
+    projectInfo.value?.stageList[activeIndex.value]?.studyModel == 1
+      ? (switchList.value = false)
+      : (switchList.value = true);
+    console.log("获取任务列表:" + JSON.stringify(projectInfo.value));
   });
 };
 
 const editTaskForType = (ele, index) => {
-  courseRef.value['el' + ele.type].openDrawer(index, ele)
+  courseRef.value["el" + ele.type].openDrawer(index, ele);
 };
-const switchList = ref(false)
-watch(()=>switchList.value,(newVal)=>{
-  newVal ? projectInfo.value.stageList[activeIndex.value].studyModel = 0 : projectInfo.value.stageList[activeIndex.value].studyModel = 1
-  request(PROJECT_DETAIL_MODIFY, projectInfo.value)
-})
+const switchList = ref(false);
+watch(
+  () => switchList.value,
+  (newVal) => {
+    newVal
+      ? (projectInfo.value.stageList[activeIndex.value].studyModel = 0)
+      : (projectInfo.value.stageList[activeIndex.value].studyModel = 1);
+    request(PROJECT_DETAIL_MODIFY, projectInfo.value);
+  }
+);
 const showChangeModal = () => {
   if (projectInfo.value?.stageList?.length <= 1) {
     message.warning("请添加阶段！");
-    return
+    return;
   }
-  if (!projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.filter(t => t.checked)?.length) {
+  if (
+    !projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.filter(
+      (t) => t.checked
+    )?.length
+  ) {
     message.warning("请选择要移动的任务！");
-    return
+    return;
   }
-  visiblene.value = true
+  visiblene.value = true;
 };
 const closeChangeModal = () => {
   visiblene.value = false;
 };
 //移动任务到阶段
 const moveTask = () => {
-  projectInfo.value.stageList[moveChapterIndex.value].taskDraftDtoList.push(...projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.filter(t => t.checked).map((t) => ({
-    ...t,
-    checked: false
-  })));
-  projectInfo.value.stageList[activeIndex.value].taskDraftDtoList = projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.filter(t => !t.checked);
+  projectInfo.value.stageList[moveChapterIndex.value].taskDraftDtoList.push(
+    ...projectInfo.value.stageList[activeIndex.value].taskDraftDtoList
+      .filter((t) => t.checked)
+      .map((t) => ({
+        ...t,
+        checked: false,
+      }))
+  );
+  projectInfo.value.stageList[activeIndex.value].taskDraftDtoList =
+    projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.filter(
+      (t) => !t.checked
+    );
   visiblene.value = false;
 };
 //批量删除
 const deleteTaskAll = () => {
-  if (!projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.filter(t => t.checked)?.length) {
+  if (
+    !projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.filter(
+      (t) => t.checked
+    )?.length
+  ) {
     message.warning("请选择要删除的任务！");
-    return
+    return;
   }
   dialog({
-    content: '确定要删除所选任务吗?',
+    content: "确定要删除所选任务吗?",
     ok: () => {
-      for (let i = 0; i < projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.length; i++) {
-        const t = projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[i]
+      for (
+        let i = 0;
+        i <
+        projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.length;
+        i++
+      ) {
+        const t =
+          projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[i];
         if (t.checked) {
           if (t.id) {
             t.checked = false;
             t.deleted = true;
           } else {
-            projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(i, 1);
+            projectInfo.value.stageList[
+              activeIndex.value
+            ].taskDraftDtoList.splice(i, 1);
             i--;
           }
         }
@@ -528,63 +763,85 @@ const deleteTaskAll = () => {
 
 const confirmDelTask = (index) => {
   dialog({
-    content: '确定要删除此任务吗?',
+    content: "确定要删除此任务吗?",
     ok: () => {
       message.success("删除成功");
-      projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].id ? (projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].deleted = true) : projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(index, 1)
+      projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].id
+        ? (projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[
+            index
+          ].deleted = true)
+        : projectInfo.value.stageList[
+            activeIndex.value
+          ].taskDraftDtoList.splice(index, 1);
     },
   });
 };
 //关闭添加阶段弹窗
 const closeModal = () => {
-  stage.value = false
+  stage.value = false;
 };
 //显示添加阶段弹窗
 const showModal = () => {
-  formValue.value = {taskDraftDtoList: []}
-  stage.value = true
+  formValue.value = { taskDraftDtoList: [] };
+  stage.value = true;
 };
 const editModal = () => {
-  formValue.value = projectInfo.value.stageList[activeIndex.value]
-  formValue.value.edit = true
-  stage.value = true
+  formValue.value = projectInfo.value.stageList[activeIndex.value];
+  formValue.value.edit = true;
+  stage.value = true;
 };
 
 //添加阶段
 function editStage() {
   if (!formValue.value.name) {
     message.warning("请输入阶段名称！");
-    return
+    return;
   }
-  if(formValue.value.edit){
-    stage.value = false
-    return
+  if (formValue.value.edit) {
+    stage.value = false;
+    return;
   }
-  formValue.value.studyModel = 0
+  formValue.value.studyModel = 0;
   //替换 默认阶段
-  if (projectInfo.value.stageList.length === 1 && projectInfo.value.stageList[0].id === '0') {
-    formValue.value.taskDraftDtoList = [...projectInfo.value.stageList[0].taskDraftDtoList]
-    projectInfo.value.stageList.push({...formValue.value})
-    projectInfo.value.stageList.splice(0, 1)
+  if (
+    projectInfo.value.stageList.length === 1 &&
+    projectInfo.value.stageList[0].id === "0"
+  ) {
+    formValue.value.taskDraftDtoList = [
+      ...projectInfo.value.stageList[0].taskDraftDtoList,
+    ];
+    projectInfo.value.stageList.push({ ...formValue.value });
+    projectInfo.value.stageList.splice(0, 1);
   } else {
-    projectInfo.value.stageList.push({...formValue.value})
-    activeIndex.value = activeIndex.value + 1
+    projectInfo.value.stageList.push({ ...formValue.value });
+    activeIndex.value = activeIndex.value + 1;
   }
-  formValue.value = {taskDraftDtoList: []}
-  stage.value = false
+  formValue.value = { taskDraftDtoList: [] };
+  stage.value = false;
 }
 
 //删除阶段
 const deleteStage = () => {
   dialog({
-    content: projectInfo.value.stageList.length === 1 ? "当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?" : '确认删除此阶段吗?',
+    content:
+      projectInfo.value.stageList.length === 1
+        ? "当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?"
+        : "确认删除此阶段吗?",
     ok: () => {
       message.success("删除成功");
       if (projectInfo.value.stageList[activeIndex.value].id) {
-        projectInfo.value.stageList[activeIndex.value].deleted = true
-        projectInfo.value.stageList[activeIndex.value].taskDraftDtoList?.forEach((t, i) => t.id ? (t.deleted = true) : projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(i, 1));
+        projectInfo.value.stageList[activeIndex.value].deleted = true;
+        projectInfo.value.stageList[
+          activeIndex.value
+        ].taskDraftDtoList?.forEach((t, i) =>
+          t.id
+            ? (t.deleted = true)
+            : projectInfo.value.stageList[
+                activeIndex.value
+              ].taskDraftDtoList.splice(i, 1)
+        );
       } else {
-        projectInfo.value.stageList.splice(activeIndex.value, 1)
+        projectInfo.value.stageList.splice(activeIndex.value, 1);
       }
       activeIndex.value && (activeIndex.value = activeIndex.value - 1);
     },
@@ -596,7 +853,7 @@ onMounted(() => {
 // 删除所有阶段
 const removeAllLevel = () => {
   dialog({
-    content: '确定要删除所有阶段吗?',
+    content: "确定要删除所有阶段吗?",
     ok: () => {
       message.success("删除成功");
       projectInfo.value.stageList.forEach((t, i) => {
@@ -604,72 +861,91 @@ const removeAllLevel = () => {
           t.checked = false;
           t.deleted = true;
         } else {
-          projectInfo.value.stageList.splice(i, 1)
+          projectInfo.value.stageList.splice(i, 1);
         }
-      })
+      });
     },
   });
 };
 //全选任务或全不选任务
 const selectRowAll = () => {
   if (selectAll.value === 1) {
-    projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.forEach(t => t.checked = false)
-    return
+    projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.forEach(
+      (t) => (t.checked = false)
+    );
+    return;
   }
-  projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.forEach(t => t.checked = true)
+  projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.forEach(
+    (t) => (t.checked = true)
+  );
 };
 
 //暂存
 const currentTaskList = computed(() => {
-      return projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList.length;
-    });
-watch(currentTaskList, (oldValue,newValue) => {
-      request(PROJECT_DETAIL_MODIFY, projectInfo.value)
-      // request(PROJECT_RELEASE, {projectId: route.query.projectId})
-      getTask()
+  return projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList
+    .length;
+});
+watch(currentTaskList, (oldValue, newValue) => {
+  request(PROJECT_DETAIL_MODIFY, projectInfo.value);
+  // request(PROJECT_RELEASE, {projectId: route.query.projectId})
+  getTask();
 });
 const temporaryStorage = async () => {
-  confirmLoading.value = true
-  await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
-  await getTask()
+  confirmLoading.value = true;
+  await request(PROJECT_DETAIL_MODIFY, projectInfo.value);
+  await getTask();
   message.success("暂存成功");
-  confirmLoading.value = false
+  confirmLoading.value = false;
 };
 //确定
 const submitStorage = async () => {
+  console.log(projectInfo.value, "@@@");
+  let num = 0;
+  projectInfo.value.map((item) => {
+    item.taskDraftDtoList.map((i) => {
+      if (!i.flag) {
+        num += 1;
+      }
+    });
+  });
+  if (num < projectInfo.value.electiveCourseCount) {
+    message.warning("选修课课程数小于设置的“选修课数量’值");
+    return;
+  }
+
   if (projectInfo.value.projectInfo.status === 3) {
     dialog({
-      content: '该项目已经发布，修改后如未点击暂存当前操作未保存数据将丢失，确认保存?',
+      content:
+        "该项目已经发布，修改后如未点击暂存当前操作未保存数据将丢失，确认保存?",
       ok: async () => {
-        confirmLoading.value = true
-        request(PROJECT_DETAIL_MODIFY, projectInfo.value)
-        await getTask()
-        await request(PROJECT_RELEASE, {projectId: route.query.projectId})
+        confirmLoading.value = true;
+        request(PROJECT_DETAIL_MODIFY, projectInfo.value);
+        await getTask();
+        await request(PROJECT_RELEASE, { projectId: route.query.projectId });
         message.success("保存成功");
         confirmLoading.value = false;
         getTask();
       },
-    })
-    return
+    });
+    return;
   }
-  confirmLoading.value = true
-  await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
-  await getTask()
-  message.success("阶段和任务数据已保存")
-  confirmLoading.value = false
+  confirmLoading.value = true;
+  await request(PROJECT_DETAIL_MODIFY, projectInfo.value);
+  await getTask();
+  message.success("阶段和任务数据已保存");
+  confirmLoading.value = false;
 };
 //取消
 const cancelStorage = async () => {
-  cancleLoading.value = true
-  await getTask()
+  cancleLoading.value = true;
+  await getTask();
   message.success("取消成功");
-  cancleLoading.value = false
+  cancleLoading.value = false;
 };
 
 const openCourse = (ele) => {
   coursePlanRef.value.openDrawer(ele);
-}
-
+};
 </script>
 
 <style lang="scss">
@@ -699,8 +975,10 @@ const openCourse = (ele) => {
             position: absolute;
             width: calc(100%);
             height: 40px;
-            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
           }
 
           .del_main {
@@ -799,9 +1077,11 @@ const openCourse = (ele) => {
       padding: 0 !important;
 
       .modalHeader {
-        background: linear-gradient(0deg,
-            rgba(78, 166, 255, 0) 0%,
-            rgba(78, 166, 255, 0.2) 100%);
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
       }
 
       .modalMain {
@@ -889,11 +1169,8 @@ const openCourse = (ele) => {
       }
     }
     .intext {
-   
-
       .ant-input {
         border-radius: 8px;
-      
       }
     }
   }
@@ -924,8 +1201,10 @@ const openCourse = (ele) => {
             position: relative;
             justify-content: center;
 
-            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
 
             .inhe {
               width: 80%;
@@ -1431,7 +1710,7 @@ const openCourse = (ele) => {
             color: #000000;
             margin-top: 10px;
           }
-          .taskmain_switch{
+          .taskmain_switch {
             position: absolute;
             top: 0;
             right: 268px;
@@ -1442,7 +1721,7 @@ const openCourse = (ele) => {
             text-align: center;
             line-height: 40px;
 
-            .taskmain_switch_text{
+            .taskmain_switch_text {
               margin-right: 10px;
             }
           }
@@ -1630,7 +1909,11 @@ const openCourse = (ele) => {
               background-color: #eff4fc !important;
             }
 
-            .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
+            .ant-table-tbody
+              > tr:hover:not(.ant-table-expanded-row):not(
+                .ant-table-row-selected
+              )
+              > td {
               background: #f6f9fd;
             }
 
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index e7c04496..bb454189 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2838,6 +2838,7 @@ export default {
     const headers = { token: getCookieForName("token") };
 
     const state = reactive({
+      electiveCourseCount:0,
       isNewEmployee: false,
       createId: "",
       permissions: "",
@@ -3889,6 +3890,18 @@ export default {
     };
     // 提交审核
     const submitExamine = () => {
+      let num = 0;
+      state.taskSyllabus.map(item => {
+        item.taskList.map(i => {
+          if(!i.flag){
+            num+=1;
+          }
+        })
+      })
+      if(num<state.electiveCourseCount){
+        message.warning("选修课课程数小于设置的“选修课数量’值，请修改后重新提交");
+        return;
+      }
       state.reviewModal = true;
     };
     const submitReviewProject = () => {
@@ -4492,6 +4505,7 @@ export default {
         }));
         let info = res.data.data.projectInfo;
         console.log(121, info);
+        state.electiveCourseCount = info.electiveCourseCount;
         state.permissions = info.permissions;
         state.createId = info.createId;
         let start = info.beginTime;