diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 6e3674df..672a48e6 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -185,7 +185,7 @@ function confirm() { name: selectsData.value[0].title, type: props.type, courseId: selectsData.value[0].id, - info: selectsData.value[0] + info: {...selectsData.value[0]} }) } else { const data = props.taskList[taskIndex.value] diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index a4194119..ee9d1412 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -168,7 +168,7 @@ async function confirm() { }); if (taskIndex.value === -1) { const list = props.taskList - list.push({name: formData.value.evaluationName, type: props.type, info: formData.value}) + list.push({name: formData.value.evaluationName, type: props.type, info: {...formData.value}}) } else { const data = props.taskList[taskIndex.value] data.name = formData.value.evaluationName diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 88eb4430..1b99db1a 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -134,7 +134,7 @@ const disabledRangeTime = () => ({ function confirm() { if (taskIndex.value === -1) { const list = props.taskList - list.push({name: formData.value.workName, type: props.type, info: formData.value}) + list.push({name: formData.value.workName, type: props.type, info: {...formData.value}}) } else { const data = props.taskList[taskIndex.value] data.name = formData.value.workName diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 92e2c36a..59222db9 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -77,8 +77,9 @@ :disabled-time="disabledRangeTime" style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" + format="YYYY-MM-DD HH:mm" + valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" - format="YYYY/MM/DD HH:mm" :placeholder="[' 开始时间', ' 结束时间']" /> @@ -433,8 +434,6 @@ const range = (start, end) => { function timeChange(time, timeStr) { formData.value.liveStartTime = timeStr[0] - formData.value.submitStartTime = timeStr[0] - formData.value.submitEndTime = timeStr[1] formData.value.liveEndTime = timeStr[1] } @@ -456,6 +455,7 @@ async function confirm() { throw Error("数据校验不通过") }); if (taskIndex.value === -1) { +<<<<<<< HEAD let list = props.taskList list.push( {name: formData.value.liveName, @@ -463,6 +463,10 @@ async function confirm() { info: {...formData.value} }) console.log("list:" + list) +======= + const list = props.taskList + list.push({name: formData.value.liveName, type: props.type, info: {...formData.value}}) +>>>>>>> aa76caecde0cba165ddb01f060970317f34071b3 } else { const data = props.taskList[taskIndex.value] data.name = formData.value.liveName @@ -474,7 +478,7 @@ async function confirm() { function openDrawer(i, row) { row && (formData.value = {...row.info}); - row && (dateTime.value = [dayjs(row.info.submitStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.submitEndTime, "YYYY-MM-DD HH:mm")]); + row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]); (i >= 0) && (taskIndex.value = i) visible.value = true } diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 80c2465b..89ea2348 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -118,7 +118,7 @@ function confirm() { name: selectsData.value[0].name, type: props.type, courseId: selectsData.value[0].id, - info: selectsData.value[0] + info: {...selectsData.value[0]} }) } else { const data = props.taskList[taskIndex.value] diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 331b79d2..2ae81358 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -311,7 +311,7 @@ function confirm() { name: selectsData.value[0].name, type: props.type, courseId: selectsData.value[0].id, - info: selectsData.value[0] + info: {...selectsData.value[0]} }) } else { const data = props.taskList[taskIndex.value] diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 28414a54..6a089d59 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -450,7 +450,7 @@ function confirm() { } if (taskIndex.value === -1) { const list = props.taskList - list.push({name: formData.value.examinationName, type: props.type, info: formData.value}) + list.push({name: formData.value.examinationName, type: props.type, info: {...formData.value}}) } else { const data = props.taskList[taskIndex.value] data.name = formData.value.examinationName @@ -474,7 +474,7 @@ function confirmouter() { if (taskIndex.value === -1) { const list = props.taskList - list.push({name: formDataOuter.value.examinationName, type: props.type, info: formDataOuter.value}) + list.push({name: formDataOuter.value.examinationName, type: props.type, info: {...formDataOuter.value}}) } else { const data = props.taskList[taskIndex.value] data.name = formDataOuter.value.examinationName diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue index b5666926..8469c3e6 100644 --- a/src/components/drawers/AssessmentAll.vue +++ b/src/components/drawers/AssessmentAll.vue @@ -3,10 +3,10 @@