diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index db32a1eb..41f726fc 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -210,7 +210,7 @@ async function confirm() { } else { const data = props.taskList[taskIndex.value]; data.name = formData.value.evaluationName; - data.info = formData.value; + data.info = {...formData.value}; data.duration = dayjs(formData.value.evaluationEndTime).diff( formData.value.evaluationStartTime, "minutes" diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 201ee932..bc689a0f 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -138,7 +138,7 @@ function confirm() { } else { const data = props.taskList[taskIndex.value] data.name = formData.value.workName - data.info = formData.value + data.info = {...formData.value} data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes') } emit('update:taskList', [...props.taskList]) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index db151e35..4d15fe10 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -4,7 +4,7 @@
关卡
-
+
添加关卡
@@ -33,7 +33,7 @@
-
+
@@ -376,7 +376,6 @@ import dialog from "@/utils/dialog"; const { query: { routerId } } = useRoute(); const modal = ref(false); -const ischapterEdit = ref(false); const visiblene = ref(false); const cancleLoading = ref(false); const confirmLoading = ref(false); @@ -408,18 +407,14 @@ watch(() => routerInfo.value.chapterList, () => { }); }, { deep: true }); -const showModal = (e, type) => { - ischapterEdit.value = (type === "edit"); - console.log(ischapterEdit.value); - if (type == "edit") { - console.log("关卡信息:" + e.name); - formValue.value = e;//回传修改的信息 - } else { - //关卡信息初始化 - formValue.value = {}; - } +const showModal = () => { + formValue.value = {draftTaskList: []} modal.value = true; }; +function showEditModal(ele){ + formValue.value =ele; + modal.value = true; +} const closeModal = () => { modal.value = false; }; @@ -429,11 +424,12 @@ const editChapter = () => { if (!formValue.value.name) { return message.warning("请输入关卡名称"); } - if (ischapterEdit.value) { - routerInfo.value.chapterList = [{ ...formValue.value, draftTaskList: [] }]; - } else { - routerInfo.value.chapterList.push({ ...formValue.value, draftTaskList: [] }); + if(formValue.value.id){ + closeModal(); + return } + routerInfo.value.chapterList.push({ ...formValue.value, draftTaskList: [] }); + activeIndex.value = activeIndex.value + 1 formValue.value = { draftTaskList: [] }; closeModal(); }; diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index a5c779b1..e00e397c 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -35,7 +35,7 @@ 说明
-
+
@@ -513,6 +513,11 @@ const closeModal = () => { }; //显示添加阶段弹窗 const showModal = () => { + formValue.value = {taskDraftDtoList: []} + stage.value = true +}; +const editModal = () => { + formValue.value = projectInfo.value.stageList[activeIndex.value] stage.value = true }; @@ -522,6 +527,10 @@ function editStage() { message.warning("请输入阶段名称!"); return } + if(formValue.value.id){ + stage.value = false + return + } //替换 默认阶段 if (projectInfo.value.stageList.length === 1 && projectInfo.value.stageList[0].id === '0') { formValue.value.taskDraftDtoList = [...projectInfo.value.stageList[0].taskDraftDtoList]