From 2ebd49fa2f9c577413295436cd49dd8c4afca405 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 2 Mar 2023 16:31:30 +0800 Subject: [PATCH 1/6] -- fix bug --- src/components/drawers/AddEval.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index add28f11..6cd6935f 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -175,7 +175,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') } emit('update:taskList', [...props.taskList]) From 6dd6208747e6e7ce2dbf86265b8ccdfcaaaedcdc Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 2 Mar 2023 16:34:06 +0800 Subject: [PATCH 2/6] -- fix bug --- src/components/drawers/AddEval.vue | 2 +- src/components/drawers/AddHomework.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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]) From da565f0933186c0bd525d81f7baeac3038b1ddd9 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 2 Mar 2023 16:45:29 +0800 Subject: [PATCH 3/6] -- fix bug --- src/views/projectcenter/TaskAdd.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index a5c779b1..b64bdb60 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 = {} + 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] From 615d1517c4ee10397c9478b042e305abae22bf50 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 2 Mar 2023 16:51:16 +0800 Subject: [PATCH 4/6] -- fix bug --- src/views/learningpath/LevelAddDetail.vue | 30 ++++++++++------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index db151e35..6fd40d65 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 = {}; modal.value = true; }; +function showEditModal(ele){ + formValue.value =ele; + modal.value = false; +} 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(); }; From 8f33a96e67e95fb2f234fd687b70f72ea590594e Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 2 Mar 2023 16:53:27 +0800 Subject: [PATCH 5/6] -- fix bug --- src/views/learningpath/LevelAddDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 6fd40d65..0a33b76b 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -413,7 +413,7 @@ const showModal = () => { }; function showEditModal(ele){ formValue.value =ele; - modal.value = false; + modal.value = true; } const closeModal = () => { modal.value = false; From a9900bc66c0155431f1948ee6e5392109f05c769 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 2 Mar 2023 16:59:23 +0800 Subject: [PATCH 6/6] -- fix bug --- src/views/learningpath/LevelAddDetail.vue | 2 +- src/views/projectcenter/TaskAdd.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 0a33b76b..4d15fe10 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -408,7 +408,7 @@ watch(() => routerInfo.value.chapterList, () => { }, { deep: true }); const showModal = () => { - formValue.value = {}; + formValue.value = {draftTaskList: []} modal.value = true; }; function showEditModal(ele){ diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index b64bdb60..e00e397c 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -513,7 +513,7 @@ const closeModal = () => { }; //显示添加阶段弹窗 const showModal = () => { - formValue.value = {} + formValue.value = {taskDraftDtoList: []} stage.value = true }; const editModal = () => {