Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/components/drawers/AddHomework.vue

@@ -1,43 +1,21 @@
 <template>
-  <a-drawer
+	<a-drawer :visible="addhomeworkVisible" class="drawerStyle addhomeworkDrawer" width="80%" placement="right"
-    :visible="addhomeworkVisible"
+		@after-visible-change="afterVisibleChange">
-    class="drawerStyle addhomeworkDrawer"
-    width="80%"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
 		<div class="drawerMain">
 			<div class="header">
 				<div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
-        <img
+				<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+					@click="closeDrawer2" />
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer2"
-        />
 			</div>
-      <a-form
+			<a-form ref="formRef" name="custom-validation" :model="formState" :rules="rules" v-bind="layout"
-        ref="formRef"
+				@finish="handleFinish" @validate="handleValidate" @finishFailed="handleFinishFailed">
-        name="custom-validation"
-        :model="formState"
-        :rules="rules"
-        v-bind="layout"
-        @finish="handleFinish"
-        @validate="handleValidate"
-        @finishFailed="handleFinishFailed"
-      >
 				<div class="contentMain">
 					<div class="main_left">
 						<div class="main_item">
 							<div class="btnbox">
 								<a-form-item has-feedback label="作业名称" name="workName">
-                  <a-input
+									<a-input v-model:value="formState.workName" style="width: 400px; height: 40px; border-radius: 8px"
-                    v-model:value="formState.workName"
+										placeholder="请输入作业名称" autocomplete="off" show-count :maxlength="20" />
-                    style="width: 400px; height: 40px; border-radius: 8px"
-                    placeholder="请输入作业名称"
-                    autocomplete="off"
-                    show-count
-                    :maxlength="20"
-                  />
 								</a-form-item>
 							</div>
 						</div>
@@ -45,48 +23,30 @@
 						<div class="main_item">
 							<div class="btnbox">
 								<a-form-item has-feedback label="提交时间" name="choosedTime">
-                  <a-range-picker
+									<a-range-picker :disabled-date="disabledDate" :disabled-time="disabledRangeTime" show-time
-                    show-time
+										style="width: 400px; height: 40px; border-radius: 8px" v-model:value="formState.choosedTime"
-                    style="width: 400px; height: 40px; border-radius: 8px"
+										format="YYYY/MM/DD HH:mm" :placeholder="['      开始时间', '        结束时间']" />
-                    v-model:value="formState.choosedTime"
-                    format="YYYY/MM/DD HH:mm"
-                    :placeholder="['      开始时间', '        结束时间']"
-                  />
 								</a-form-item>
 							</div>
 						</div>
 						<div class="main_item2">
 							<a-form-item has-feedback label="作业要求" name="workRequirement">
 								<div class="textarea">
-                  <a-textarea
+									<a-textarea v-model:value="formState.workRequirement" placeholder="请输入作业要求" autocomplete="off"
-                    v-model:value="formState.workRequirement"
+										allow-clear :rows="6" show-count :maxlength="200" />
-                    placeholder="请输入作业要求"
-                    autocomplete="off"
-                    allow-clear
-                    :rows="6"
-                    show-count
-                    :maxlength="200"
-                  />
 								</div>
 							</a-form-item>
 						</div>
 						<div class="main_item">
 							<div class="signbox">
 								<div class="sign">
-                  <img
+									<img src="@/assets/images/coursewareManage/enclosure.png" alt="" />
-                    src="@/assets/images/coursewareManage/enclosure.png"
-                    alt=""
-                  />
 								</div>
 								<span style="margin-right: 3px">附件：</span>
 							</div>
 							<div class="btnbox">
-                <a-upload
+								<a-upload v-model:file-list="fileList" name="file" action="/manageApi/file/upload"
-                  v-model:file-list="fileList"
+									@change="handleChange">
-                  name="file"
-                  action="/manageApi/file/upload"
-                  @change="handleChange"
-                >
 									<button class="xkbtn" type="button">上传附件</button>
 								</a-upload>
 							</div>
@@ -94,9 +54,7 @@
 						<div class="main_item" style="margin-top: -25px">
 							<div class="signbox"></div>
 							<div class="btnbox">
-                <span style="color: #999999"
+								<span style="color: #999999">支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span>
-                  >支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span
-                >
 							</div>
 						</div>
 					</div>
@@ -527,7 +485,33 @@ export default {
 			}
 		};
 
+		const range = (start, end) => {
+			const result = [];
+
+			for (let i = start; i < end; i++) {
+				result.push(i);
+			}
+
+			return result;
+		};
+
+		const disabledDate = (current) => {
+			// Can not select days before today and today
+			console.log('1111', dayjs().endOf('day'))
+			return current && current < dayjs().startOf('day');
+		};
+
+		const disabledDateTime = () => {
 			return {
+				disabledHours: () => range(0, 24).splice(4, 20),
+				disabledMinutes: () => range(30, 60),
+				disabledSeconds: () => [55, 56],
+			};
+		};
+
+		return {
+			disabledDate,
+			disabledDateTime,
 			afterVisibleChange,
 			closeDrawer,
 			closeDrawer2,
@@ -620,6 +604,7 @@ export default {
 					display: flex;
 					align-items: flex-start;
 					margin-bottom: 32px;
+
 					.textarea {
 						width: 400px;
 
@@ -641,6 +626,7 @@ export default {
 							border-radius: 8px;
 						}
 					}
+
 					.signbox {
 						width: 120px;
 						display: flex;

src/components/student/ChangeLevelModal.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-12-20 17:00:37
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-20 17:59:40
+ * @LastEditTime: 2022-12-21 17:54:18
  * @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -28,11 +28,11 @@
           <!-- <div class="cur">当前关卡：关卡2</div> -->
           <div class="select">
             <a-select
-              v-model:value="curLevel"
+              v-model:value="chapterSelect"
               style="width: 100%"
               placeholder="请选择关卡"
-              :options="projectNameList4"
+              :options="chapterList"
-              @change="selectProjectName4"
+              @change="changeChapter"
               allowClear
               showSearch
             ></a-select>
@@ -59,6 +59,9 @@
   </a-modal>
 </template>
 <script>
+import { reactive, toRefs, onMounted } from "vue";
+import { message } from "ant-design-vue";
+import { GetRouterDetail } from "../../api/indexTask";
 export default {
   name: "ChangeLevelModal",
   props: {
@@ -66,19 +69,51 @@ export default {
       type: Boolean,
       default: false,
     },
+    id: String,
   },
   setup(props, ctx) {
+    const state = reactive({
+      chapterList: [],
+      chapterSelect: null, //选择的关卡
+      chapterSelectId: null, //选择关卡的id
+    });
     const closeChangeModal = () => {
       ctx.emit("update:visiblene", false);
+      state.chapterSelect = null; //选择的关卡
+      state.chapterSelectId = null; //选择关卡的id
     };
     const changelevel = () => {
       console.log("点击调整关卡");
     };
     //获取关卡列表
-
+    const getDetail = () => {
+      console.log("props.id", props.id);
+      GetRouterDetail(props.id)
+        .then((res) => {
+          //给level赋初始值
+          state.chapterList = res.data.data.chapterList;
+          //增加两个字段
+          state.chapterList.forEach((item) => {
+            item["value"] = item.chapterId;
+            item["label"] = item.name;
+          });
+          console.log("路径图详情", res);
+        })
+        .catch((err) => {
+          message.error(err);
+        });
+    };
+    const changeChapter = (e, v) => {
+      console.log("eeeeeeeeeee", e, v);
+    };
+    onMounted(() => {
+      getDetail();
+    });
     return {
+      ...toRefs(state),
       closeChangeModal,
       changelevel,
+      changeChapter,
     };
   },
 };

src/components/student/TableStudent.vue

@@ -63,12 +63,12 @@
           批量删除
         </a-button>
       </a-col>
-      <!-- <a-col :span="1.5" v-if="type == 2">
+      <a-col :span="1.5" v-if="type == 2">
         <a-button class="cus-btn white" @click="showChangeModal">
           <template #icon></template>
           批量调整关卡
         </a-button>
-      </a-col> -->
+      </a-col>
     </a-row>
     <div style="margin-top: 20px">
       <a-table
@@ -80,12 +80,44 @@
         :row-selection="stuRowSelection"
       >
         <template #action="{ record }">
+          <div style="display: flex; justify-content: center">
             <div
               @click="del(record.id)"
-            style="color: #4ea6ff; font-size: 14px; text-align: center"
+              style="
+                color: #4ea6ff;
+                font-size: 14px;
+                text-align: center;
+                margin-left: 20px;
+                cursor: pointer;
+              "
+            >
+              查看
+            </div>
+            <div
+              @click="showChangeModal"
+              style="
+                color: #4ea6ff;
+                font-size: 14px;
+                text-align: center;
+                margin-left: 20px;
+                cursor: pointer;
+              "
+            >
+              调整
+            </div>
+            <div
+              @click="del(record.id)"
+              style="
+                color: #4ea6ff;
+                font-size: 14px;
+                text-align: center;
+                margin-left: 20px;
+                cursor: pointer;
+              "
             >
               删除
             </div>
+          </div>
           <!-- <a-row gutter="12">
             <a-col>
               <slot name="extension" v-bind:data="{ record }"></slot>
@@ -109,7 +141,7 @@
     </div>
   </div>
   <!-- 批量调整关卡弹窗 -->
-  <ChangeLevelModal v-model:visiblene="visiblene" />
+  <ChangeLevelModal v-model:visiblene="visiblene" :id="id" />
   <!-- 批量调整关卡弹窗 -->
 </template>
 <script setup>
@@ -266,11 +298,11 @@ function submitCall(flag) {
   flag && getStuList();
 }
 
-//调整关卡
+// 调整关卡;
-// const visiblene = ref(false);
+const visiblene = ref(false);
-// const showChangeModal = () => {
+const showChangeModal = () => {
-//   visiblene.value = true;
+  visiblene.value = true;
-// };
+};
 </script>
 <style>
 .studentopea1 {

src/views/projectcenter/TaskAdd.vue

@@ -5,31 +5,18 @@
 				<div class="leftmain">
 					<div class="tit">
 						阶段
-            <img
+						<img src="../../assets/images/projectadd/right.png" style="margin-left: 10px; cursor: pointer"
-              src="../../assets/images/projectadd/right.png"
+							@click="showCancel" />
-              style="margin-left: 10px; cursor: pointer"
-              @click="showCancel"
-            />
 					</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
+						<draggable v-model="level" chosenClass="chosen" ghostClass="ghost" forceFallback="true" group="stage"
-              v-model="level"
+							animation="500">
-              chosenClass="chosen"
-              ghostClass="ghost"
-              forceFallback="true"
-              group="stage"
-              animation="500"
-            >
 							<template #item="{ element }">
-                <div
+								<div class="items" :class="chooseStageId == element.id ? 'active' : ''" @click="changebgc(element.id)">
-                  class="items"
-                  :class="chooseStageId == element.id ? 'active' : ''"
-                  @click="changebgc(element.id)"
-                >
 									<div class="items1">
 										<div class="boxs_left">
 											<a-popover placement="topLeft" trigger="click">
@@ -42,26 +29,18 @@
 													<span>阶段说明</span>
 												</template>
 												<div class="script">
-                          <span style="font-size: 12px; color: #ffffff"
+													<span style="font-size: 12px; color: #ffffff">说明</span>
-                            >说明</span
-                          >
 												</div>
 											</a-popover>
 
 											<div class="imgIcon" @click="showModal(element)"></div>
 										</div>
 										<div class="boxs_right">
-                      <div
+											<div class="imgIcon" @click="showDeleteStage(element.id)"></div>
-                        class="imgIcon"
-                        @click="showDeleteStage(element.id)"
-                      ></div>
 										</div>
 									</div>
 									<div class="items2">
-                    <a-popover
+										<a-popover placement="topLeft" v-if="element.tit?.length > 10">
-                      placement="topLeft"
-                      v-if="element.tit?.length > 10"
-                    >
 											<template #content>
 												<div style="width: 130px">
 													{{ element.tit }}
@@ -140,14 +119,9 @@
 							<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
             <div class="pub">保存</div>
             <div class="line"></div> -->
-              <router-link
+							<router-link :to="{ path: `/taskpage`, query: { projectId: projectId } }">
-                :to="{ path: `/taskpage`, query: { projectId: projectId } }"
-              >
 								<div style="display: flex">
-                  <img
+									<img class="img2" src="../../assets/images/leveladd/back.png" />
-                    class="img2"
-                    src="../../assets/images/leveladd/back.png"
-                  />
 									<div class="return">返回</div>
 								</div>
 							</router-link>
@@ -164,16 +138,9 @@
 						</div>
 						<!-- 添加在线侧弹窗 -->
 						<div>
-              <add-online
+							<add-online v-model:addonlineVisible="addonlinevisible" @changeData="updateTableData" :isLevel="isLevel"
-                v-model:addonlineVisible="addonlinevisible"
+								v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:projectTaskId="projectTaskId" v-model:EditOnlineId="EditOnlineId" />
-                :isLevel="isLevel"
-                v-model:edit="edit"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:EditOnlineId="EditOnlineId"
-              />
 						</div>
 						<!-- 添加在线侧弹窗 -->
 						<div class="lin"></div>
@@ -187,16 +154,10 @@
 						</div>
 						<!-- 添加面授侧弹窗 -->
 						<div>
-              <add-faceteach
+							<add-faceteach v-model:addfaceteachVisible="addfaceteachvisible" v-model:EditFaceId="EditFaceId"
-                v-model:addfaceteachVisible="addfaceteachvisible"
+								v-model:edit="edit" :isLevel="isLevel" v-model:projectId="projectId"
-                v-model:EditFaceId="EditFaceId"
+								v-model:chooseStageId="chooseStageId" @changeData="updateTableData"
-                v-model:edit="edit"
+								v-model:projectTaskId="projectTaskId" />
-                :isLevel="isLevel"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加面授侧弹窗 -->
 						<div class="lin"></div>
@@ -210,16 +171,9 @@
 						</div>
 						<!-- 添加案例侧弹窗 -->
 						<div>
-              <add-case
+							<add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" :isLevel="isLevel"
-                v-model:addcaseVisible="addcasevisible"
+								v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:projectTaskId="projectTaskId" v-model:EditCaseId="EditCaseId" />
-                :isLevel="isLevel"
-                v-model:edit="edit"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:EditCaseId="EditCaseId"
-              />
 						</div>
 						<!-- 添加案例侧弹窗 -->
 						<div class="lin"></div>
@@ -233,16 +187,10 @@
 						</div>
 						<!-- 添加作业侧弹窗 -->
 						<div>
-              <add-homework
+							<add-homework v-model:addhomeworkVisible="addhomeworkvisible" @changeData="updateTableData"
-                v-model:addhomeworkVisible="addhomeworkvisible"
+								v-model:isLevel="isLevel" v-model:edit="edit" v-model:projectId="projectId"
-                @changeData="updateTableData"
+								v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId"
-                v-model:isLevel="isLevel"
+								v-model:projectTaskId="projectTaskId" />
-                v-model:edit="edit"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:EditWorkId="EditWorkId"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加作业侧弹窗 -->
 						<div class="lin"></div>
@@ -256,16 +204,9 @@
 						</div>
 						<!-- 添加考试侧弹窗 -->
 						<div>
-              <add-test
+							<add-test v-model:addtestVisible="addtestvisible" @changeData="updateTableData" :isLevel="isLevel"
-                v-model:addtestVisible="addtestvisible"
+								v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:EditTestId="EditTestId" v-model:projectTaskId="projectTaskId" />
-                :isLevel="isLevel"
-                v-model:edit="edit"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:EditTestId="EditTestId"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加考试侧弹窗 -->
 						<div class="lin"></div>
@@ -279,16 +220,9 @@
 						</div>
 						<!-- 添加直播侧弹窗 -->
 						<div>
-              <add-live
+							<add-live v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData"
-                v-model:addliveVisible="addlivevisible"
+								v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:edit="edit"
-                :isLevel="isLevel"
+								v-model:EditLiveId="EditLiveId" v-model:projectTaskId="projectTaskId" />
-                @changeData="updateTableData"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:edit="edit"
-                v-model:EditLiveId="EditLiveId"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加直播侧弹窗 -->
 						<div class="lin"></div>
@@ -302,16 +236,9 @@
 						</div>
 						<!-- 添加外链侧弹窗 -->
 						<div>
-              <add-ref
+							<add-ref v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData"
-                v-model:addrefVisible="addrefvisible"
+								v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:edit="edit"
-                :isLevel="isLevel"
+								v-model:EditRefId="EditRefId" v-model:projectTaskId="projectTaskId" />
-                @changeData="updateTableData"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:edit="edit"
-                v-model:EditRefId="EditRefId"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加外链侧弹窗 -->
 						<div class="lin"></div>
@@ -350,16 +277,9 @@
 						</div>
 						<!-- 添加活动侧弹窗 -->
 						<div>
-              <add-active
+							<add-active v-model:addactiveVisible="addactivevisible" v-model:projectId="projectId"
-                v-model:addactiveVisible="addactivevisible"
+								v-model:EditActiveId="EditActiveId" v-model:projectTaskId="projectTaskId" v-model:edit="edit"
-                v-model:projectId="projectId"
+								:isLevel="isLevel" v-model:chooseStageId="chooseStageId" @changeData="updateTableData" />
-                v-model:EditActiveId="EditActiveId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:edit="edit"
-                :isLevel="isLevel"
-                v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
-              />
 						</div>
 						<!-- 添加活动侧弹窗 -->
 						<div class="lin"></div>
@@ -373,16 +293,9 @@
 						</div>
 						<!-- 添加测评侧弹窗 -->
 						<div>
-              <add-eval
+							<add-eval v-model:addevalVisible="addevalvisible" @changeData="updateTableData" v-model:edit="edit"
-                v-model:addevalVisible="addevalvisible"
+								:isLevel="isLevel" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:projectTaskId="projectTaskId" v-model:EditEvalId="EditEvalId" />
-                v-model:edit="edit"
-                :isLevel="isLevel"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:EditEvalId="EditEvalId"
-              />
 						</div>
 						<!-- 添加测评侧弹窗 -->
 						<div class="lin"></div>
@@ -396,16 +309,9 @@
 						</div>
 						<!-- 添加评估侧弹窗 -->
 						<div>
-              <add-invist
+							<add-invist v-model:addinvistVisible="addinvistvisible" @changeData="updateTableData" v-model:edit="edit"
-                v-model:addinvistVisible="addinvistvisible"
+								:isLevel="isLevel" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:projectTaskId="projectTaskId" v-model:EditInvistId="EditInvistId" />
-                v-model:edit="edit"
-                :isLevel="isLevel"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:EditInvistId="EditInvistId"
-              />
 						</div>
 
 						<div class="lin"></div>
@@ -437,7 +343,8 @@
             
             </div>
           </div>
-        --></div>
+        -->
+				</div>
 				<div class="boom">
 					<div class="boomcen">
 						<div class="onerow">
@@ -446,10 +353,7 @@
 								移动任务到阶段
 							</button>
 							<div class="edit" @click="showdeAll">
-                <img
+								<img class="editimg" src="../../assets/images/projectadd/delete.png" />
-                  class="editimg"
-                  src="../../assets/images/projectadd/delete.png"
-                />
 								<span class="editext">批量删除</span>
 							</div>
 						</div>
@@ -484,8 +388,7 @@
               </div>
             </div> -->
 							<div class="tableBox" style="border: 1px solid #f2f6fc">
-                <div
+								<div style="
-                  style="
                     height: 50px;
                     display: flex;
                     justify-content: space-between;
@@ -496,32 +399,25 @@
                     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="
-                      :src="
                       	selectAll === 0
                       		? require('../../assets/images/notSelect.png')
                       		: selectAll === 1
                       			? require('../../assets/images/selectAll.png')
                       			: require('../../assets/images/select.png')
-                      "
+                      " @click="selectRowAll" />
-                      @click="selectRowAll"
-                    />
 										<!-- <a-checkbox
                     v-model:checked="selectAll"
                     @change="selectRowAll"
@@ -532,25 +428,14 @@
 									<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
+									<div style="width: 120px; text-align: center; margin-right: 20px">
-                    style="width: 120px; text-align: center; margin-right: 20px"
-                  >
 										操作
 									</div>
 								</div>
-                <draggable
+								<draggable v-model="tableData" chosenClass="chosen" ghostClass="ghost" forceFallback="true" group="task"
-                  v-model="tableData"
+									animation="500" @start="onStart" @end="onEnd">
-                  chosenClass="chosen"
-                  ghostClass="ghost"
-                  forceFallback="true"
-                  group="task"
-                  animation="500"
-                  @start="onStart"
-                  @end="onEnd"
-                >
 									<template #item="{ element }">
-                    <div
+										<div style="
-                      style="
                         height: 50px;
                         display: flex;
                         justify-content: space-between;
@@ -560,68 +445,46 @@
                         font-weight: 400;
                         color: #4f5156;
                         line-height: 36px;
-                      "
+                      " class="tableRow">
-                      class="tableRow"
+											<div style="
-                    >
-                      <div
-                        style="
                           width: 87px;
                           text-align: center;
                           margin-left: 46px;
                           position: relative;
-                        "
+                        ">
-                      >
 												<div class="racona">
-                          <div
+													<div class="img" style="
-                            class="img"
-                            style="
                               cursor: pointer;
                               margin-top: 2px;
                               margin-right: 9px;
                               position: absolute;
                               left: -25px;
-                            "
+                            "></div>
-                          ></div>
+													<a-checkbox :id="element.id" v-model:checked="element.checked" @change="changeRow">
-                          <a-checkbox
-                            :id="element.id"
-                            v-model:checked="element.checked"
-                            @change="changeRow"
-                          >
 													</a-checkbox>
 													<div style="margin-top: 2px; margin-left: 8px">
 														{{ element.lei }}
 													</div>
 												</div>
 											</div>
-                      <div
+											<div style="
-                        style="
                           width: 120px;
                           text-align: center;
                           overflow: hidden;
                           text-overflow: ellipsis;
                           white-space: nowrap;
-                        "
+                        " :title="element.creater">
-                        :title="element.creater"
-                      >
 												{{ element.creater }}
 											</div>
 											<div style="width: 120px; text-align: center">
 												<div class="opat">
 													<div class="opacationt clearfix">
-                            <a-switch
+														<a-switch style="margin-left: -50px; margin-top: 3px" v-model:checked="element.checked1"
-                              style="margin-left: -50px; margin-top: 3px"
+															size="small" active-color="red" @click="changeCourseType(element)" />
-                              v-model:checked="element.checked1"
-                              size="small"
-                              active-color="red"
-                              @click="changeCourseType(element)"
-                            />
 														<div class="showt clearfix">
-                              <div
+															<div class="bi" :style="{
-                                class="bi"
-                                :style="{
 																'z-index': element.checked1 ? 999 : 998,
-                                }"
+															}">
-                              >
 																必修
 															</div>
 															<div class="xuan">选修</div>
@@ -636,35 +499,27 @@
 															: "-"
 												}}
 											</div>
-                      <div
+											<div style="
-                        style="
                           width: 120px;
                           text-align: center;
                           margin-right: 20px;
-                        "
+                        ">
-                      >
 												<div class="opa">
 													<div class="opacation">
-                            <span
+														<span style="
-                              style="
                                 color: #4ea6ff;
                                 margin-right: 25px;
                                 cursor: pointer;
-                              "
+                              " @click="
-                              @click="
                               	decideType(
                               		element.lei,
                               		element.courseId,
                               		element.id
                               	)
-                              "
+                              ">
-                            >
 															编辑
 														</span>
-                            <span
+														<span style="color: #4ea6ff; cursor: pointer" @click="showDelete(element.id)">
-                              style="color: #4ea6ff; cursor: pointer"
-                              @click="showDelete(element.id)"
-                            >
 															删除
 														</span>
 													</div>
@@ -722,58 +577,32 @@
 
 		<!-- 添加阶段弹窗 -->
 		<div>
-      <a-modal
+			<a-modal v-model:visible="stage" :title="null" @ok="closeModal" :footer="null" :closable="false"
-        v-model:visible="stage"
+				wrapClassName="addstage" width="624px" height="388px" centered="true" @cancel="closeModal">
-        :title="null"
+				<div class="modalHeader" style="
-        @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 class="headerLeftText" style="font-size: 16px">编辑/添加阶段</span>
-              >编辑/添加阶段</span
-            >
 					</div>
 					<div style="cursor: pointer; margin-right: 32px" @click="closeModal">
-            <img
+						<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>
 				<div class="modalMain" style="width: 100%">
 					<div class="name">
 						<div class="namebox">
 							<div>
-                <img
+								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
 							</div>
 							<div class="inname">阶段名称：</div>
 						</div>
 						<div class="in">
-              <a-input
+							<a-input v-model:value="valuesname" show-count :maxlength="20" placeholder="请输入阶段名称" />
-                v-model:value="valuesname"
-                show-count
-                :maxlength="20"
-                placeholder="请输入阶段名称"
-              />
 						</div>
 					</div>
 					<div class="name" style="display: flex; align-items: flex-start">
@@ -781,26 +610,17 @@
 							<div class="inname">阶段说明：</div>
 						</div>
 						<div class="intext" style="margin-left: 14px">
-              <a-textarea
+							<a-textarea v-model:value="valuesnotice" style="height: 88px" show-count :maxlength="100"
-                v-model:value="valuesnotice"
+								placeholder="请输入阶段说明" />
-                style="height: 88px"
-                show-count
-                :maxlength="100"
-                placeholder="请输入阶段说明"
-              />
 						</div>
 					</div>
-          <div
+					<div style="
-            style="
               display: flex;
               width: 100%;
               justify-content: center;
               margin-top: 40px;
-            "
+            ">
-          >
+						<button @click="closeModal" style="
-            <button
-              @click="closeModal"
-              style="
                 cursor: pointer;
                 height: 40px;
                 width: 100px;
@@ -808,13 +628,10 @@
                 border-radius: 4px;
                 color: #4ea6ff;
                 background-color: #ffffff;
-              "
+              ">
-            >
 							取消
 						</button>
-            <button
+						<button @click="editStage" style="
-              @click="editStage"
-              style="
                 cursor: pointer;
                 margin-left: 16px;
                 margin-bottom: 40px;
@@ -824,31 +641,18 @@
                 border-radius: 4px;
                 color: #ffffff;
                 background-color: #4ea6ff;
-              "
+              ">
-            >
 							确定
 						</button>
 					</div>
 				</div>
-        <div
+				<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-          class="aeLoading"
+					<a-spin :spinning="addLoading" :tip="updateStageID ? '修改中...' : ''" />
-          :style="{ display: addLoading ? 'flex' : 'none' }"
-        >
-          <a-spin
-            :spinning="addLoading"
-            :tip="updateStageID ? '修改中...' : ''"
-          />
 				</div>
 			</a-modal>
 		</div>
 		<!-- 确认添加阶段弹窗 -->
-    <a-modal
+		<a-modal v-model:visible="confirmModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
-      v-model:visible="confirmModal"
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -872,13 +676,7 @@
 			</div>
 		</a-modal>
 		<!-- 确认取消阶段弹窗 -->
-    <a-modal
+		<a-modal v-model:visible="cancelModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
-      v-model:visible="cancelModal"
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -902,13 +700,7 @@
 			</div>
 		</a-modal>
 		<!-- 确认删除任务弹窗 -->
-    <a-modal
+		<a-modal v-model:visible="deleteModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
-      v-model:visible="deleteModal"
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -931,13 +723,7 @@
 				</div>
 			</div>
 		</a-modal>
-    <a-modal
+		<a-modal v-model:visible="deAll" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
-      v-model:visible="deAll"
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -961,14 +747,8 @@
 			</div>
 		</a-modal>
 		<!-- 移动任务到阶段 -->
-    <a-modal
+		<a-modal style="padding: 0" :closable="sh" v-model:visible="visiblene" :footer="null" centered="true"
-      style="padding: 0"
+			wrapClassName="moveModal">
-      :closable="sh"
-      v-model:visible="visiblene"
-      :footer="null"
-      centered="true"
-      wrapClassName="moveModal"
-    >
 			<div class="con">
 				<div class="header">
 					<div class="inhe">
@@ -980,29 +760,14 @@
 					<div class="inher">
 						<div class="cur">已选中{{ selectRow.length }}个任务</div>
 						<div class="select">
-              <a-select
+							<a-select v-model:value="curLevel" style="width: 100%" placeholder="请选择阶段" :options="level"
-                v-model:value="curLevel"
+								@change="handleChangeStage" allowClear showSearch></a-select>
-                style="width: 100%"
-                placeholder="请选择阶段"
-                :options="level"
-                @change="handleChangeStage"
-                allowClear
-                showSearch
-              ></a-select>
 						</div>
 						<div class="btn">
-              <button
+							<button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
-                style="cursor: pointer"
-                class="sameb btn1"
-                @click="closeChangeModal"
-              >
 								取消
 							</button>
-              <button
+							<button style="cursor: pointer" class="sameb btn2" @click="moveTask">
-                style="cursor: pointer"
-                class="sameb btn2"
-                @click="moveTask"
-              >
 								确定
 							</button>
 						</div>
@@ -1012,13 +777,8 @@
 		</a-modal>
 
 		<!-- 是否删除阶段弹窗 -->
-    <a-modal
+		<a-modal v-model:visible="deleteStageModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal"
-      v-model:visible="deleteStageModal"
+			centered="true">
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -1028,7 +788,9 @@
 						<div class="close_exit" @click="closeDeleteStage"></div>
 					</div>
 					<div class="body">
-            <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
+						<span style="width:320px;display:flex;justify-content:center;align-items:center;">{{ level.length == 1 ?
+								"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?" : "您确定要删除此阶段"
+						}}</span>
 					</div>
 					<div class="del_btnbox">
 						<div class="del_btn btn1" @click="closeDeleteStage">
@@ -1407,8 +1169,10 @@ export default {
 						}
 					}
 					console.log(arraynew)
+					if (arraynew.length !== 0) {
 						state.chooseStageId = Number(arraynew[arraynew.length - 1].stageId);
 					}
+				}
 
 				state.projectTitle = res.data.data.projectInfo.name;
 				state.picUrl = res.data.data.projectInfo.picUrl;
@@ -2045,10 +1809,8 @@ export default {
 						position: absolute;
 						width: calc(100%);
 						height: 40px;
-            background: linear-gradient(
+						background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0.2) 0%,
+								rgba(78, 166, 255, 0) 100%);
-              rgba(78, 166, 255, 0) 100%
-            );
 					}
 
 					.del_main {
@@ -2147,11 +1909,9 @@ export default {
 			padding: 0 !important;
 
 			.modalHeader {
-        background: linear-gradient(
+				background: linear-gradient(0deg,
-          0deg,
 						rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+						rgba(78, 166, 255, 0.2) 100%);
-        );
 			}
 
 			.modalMain {
@@ -2266,10 +2026,8 @@ export default {
 						position: relative;
 						justify-content: center;
 
-            background: linear-gradient(
+						background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0.2) 0%,
+								rgba(78, 166, 255, 0) 100%);
-              rgba(78, 166, 255, 0) 100%
-            );
 
 						.inhe {
 							width: 80%;
@@ -2375,6 +2133,7 @@ export default {
 		.leftmain {
 			margin-top: 20px;
 			min-height: 800px;
+
 			.tit {
 				margin-left: 20px;
 				font-size: 18px;
@@ -2627,6 +2386,7 @@ export default {
 						.pub {
 							margin-right: 10px;
 						}
+
 						.line {
 							margin-right: 10px;
 						}
@@ -2951,9 +2711,7 @@ export default {
 							background-color: #eff4fc !important;
 						}
 
-            .ant-table-tbody
+						.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;
 						}