From 8df53386d4f1d598bcec0405fa6daf3637e8cfe5 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 1 Jan 2023 19:35:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=AA=E5=9C=A8=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 2 +- src/views/homework/HomeworkPage.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 914854a..37111e2 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -163,7 +163,7 @@ const download = (url) => { window.open(url); }; const downloads = (url) => { - ElMessage.warning("未到开始时间，请耐心等待！"); + ElMessage.warning("未在有效时间范围内，请耐心等待！"); }; let timer = null; diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 7a74bc6..cdbecea 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -145,7 +145,7 @@
+ style="background:#999;border-radius: 6px;cursor: not-allowed;">未在有效时间范围内
@@ -162,7 +162,7 @@
+ style="background:#999;border-radius: 6px;cursor: not-allowed;">未在有效时间范围内
From c51ebcfc7b2969855db93bf159156994a1c39a38 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 9 Jan 2023 18:12:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 2 +- src/views/survey/SurveyDetail.vue | 108 +++++++++++++++--------------- 2 files changed, 54 insertions(+), 56 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 4c49774..6f0f2b0 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -51,7 +51,7 @@ export const COMMENT_PRAISE = '/comment/praise post' export const COMMENT_COLLECTION = '/comment/collection post' export const ASSESSMENT_SUBMIT_QUERY = assessmentId => `/assessmentSubmit/queryAssessmentSubmitDetailById?assessmentSubmitId=${assessmentId} post` -export const ASSESSMENT_QUERY = assessmentId => `/stu/task/evaluate/get` +export const ASSESSMENT_QUERY = assessmentId => `/stu/task/queryAssessmentDetailById` export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post' export const ACTIVITY = '/activity' diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 4363f44..a09c722 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -44,13 +44,9 @@ return a[0].orderNumber - b[0].orderNumber }) }} --> -
-
-
+
+
+
{{ value.assessmentScTitle }}
完全没用
@@ -84,69 +80,62 @@
-
-
+
+
- {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }} + {{ value?.singleStemName }}
-
- -
{{ value.singleOptionName }}
+ +
{{ values.singleOptionName }}
-
-
+
+
- {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }} + {{ value?.multipleStemName }}
-
- -
{{ value.multipleOptionName }}
+ +
{{ values.multipleOptionName }}
-
-
-
{{ item.assessmentQaTitle }}
+
+
+
{{ value.assessmentQaTitle }}
- -
{{ item.content?.length || 0 }}/200
+
{{ value.content?.length || 0 }}/200
@@ -290,12 +279,11 @@
{{ item.content?.length || 0 }}/200
--> -
提交 @@ -347,26 +335,35 @@ const returnclick = () => { router.back(); }; -// 数组去空对象 -function formateArr(arr1) { - console.log(arr1, arr1[0], arr1[0].length) - let newarr = [] - for (let i = 0; i < arr1.length; i++) { - if (arr1[i].length !== 0) { - newarr.push(arr1[i]) - } - } - return newarr -} - const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }); console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }) console.log('我是需要排序得题目', data) -function goHome() { - +// 数组去空对象 +function formateArr(datas) { + let allArr = [] + for(let i=0;i { return a.orderNumber - b.orderNumber}) + console.log('我是排序后的题目', newarr) + return newarr } +const questionList = ref([]) + +const timers = setInterval(() => { + console.log(data) + console.log(data.value.assessmentId) + if(data.value.assessmentId){ + clearInterval(timers) + console.log([data.value.essayQuestionVoList, data.value.multipleStemVoList, data.value.scoringQuestionVoList, data.value.singleStemVoList]) + questionList.value = formateArr([data.value.essayQuestionVoList, data.value.multipleStemVoList, data.value.scoringQuestionVoList, data.value.singleStemVoList]) + } +}, 1000); + const centerDialogVisible = ref(false); const open = () => { centerDialogVisible.value = true @@ -579,3 +576,4 @@ function submit() { } } + From e67dc797aa5233f3dc31192df5a2c4c35a781570 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 10 Jan 2023 09:13:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/survey/SurveyDetail.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index a09c722..56f3180 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -332,6 +332,7 @@ const { } = useRoute(); const router = useRouter(); const returnclick = () => { + clearInterval(timers) router.back(); }; @@ -339,6 +340,12 @@ const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, ch console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }) console.log('我是需要排序得题目', data) +// 答题时间 +const answerTime = new Date(); + +console.log('录入首次进入页面时间', answerTime) + + // 数组去空对象 function formateArr(datas) { let allArr = [] @@ -364,11 +371,16 @@ const timers = setInterval(() => { } }, 1000); +setTimeout(() => { + clearInterval(timers); +}, 30000); + const centerDialogVisible = ref(false); const open = () => { centerDialogVisible.value = true }; function submit() { + console.log('录入首次进入页面时间', answerTime) if (1 > 0) { console.log(data) console.log('我是提交的数据', { From dabb995a3068fb50731c61a5d8c5cd97f0f89212 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 10 Jan 2023 10:36:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=AD=94=E9=A2=98=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/survey/SurveyDetail.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 56f3180..bcf60e7 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -326,6 +326,7 @@ import { request, usePage, useRequest } from "@/api/request"; import { ASSESSMENT_QUERY, ASSESSMENT_SUBMIT } from "@/api/api"; import { ElMessage } from "element-plus"; import { ref } from "vue"; +import dayjs from "dayjs"; const { query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId, projectStatus, projectEndTime }, @@ -341,7 +342,7 @@ console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageI console.log('我是需要排序得题目', data) // 答题时间 -const answerTime = new Date(); +const answerTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'); console.log('录入首次进入页面时间', answerTime) @@ -445,6 +446,7 @@ function submit() { taskId: taskId ? taskId : 0, type, result: JSON.stringify(data.value), + beginTime: answerTime }).then(() => { open(); });