diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue index 8edf879..8c4c55c 100644 --- a/src/views/ballot/BallotPage.vue +++ b/src/views/ballot/BallotPage.vue @@ -209,23 +209,24 @@ const answerTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"); // 增加浏览量 watch(dataInfo, () => { - useRequest(EditVoteInvolvedAndBrowse, {operationType:'2', voteId:dataInfo.value.id }); - const noCommit = () => { - let noCommitParams = { - beginTime: answerTime, - chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, - result: JSON.stringify(dataInfo.value), - targetId: infoId, // 项目 路径图 id - taskId: id, - type: btype, // 1 项目 2 路径图 - voteId: dataInfo.value.id, - voteName: dataInfo.value.voteName, - studentId: userInfo.value.userId, - studentName: userInfo.value.realName, - } - useRequest(NO_COMMIT, noCommitParams); - } - noCommit() + useRequest(EditVoteInvolvedAndBrowse, {operationType:'2', voteId:dataInfo.value.id },(res)=>{ + const noCommit = () => { + let noCommitParams = { + beginTime: answerTime, + chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, + result: JSON.stringify(dataInfo.value), + targetId: infoId, // 项目 路径图 id + taskId: id, + type: btype, // 1 项目 2 路径图 + voteId: dataInfo.value.id, + voteName: dataInfo.value.voteName, + studentId: userInfo.value.userId, + studentName: userInfo.value.realName, + } + useRequest(NO_COMMIT, noCommitParams); + } + noCommit() + }); }) // 选择题目 diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 0c38b2b..16e6a01 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -30,14 +30,14 @@ -
【评估】{{ data.assessmentName }}
+
【评估】{{ data?.assessmentName }}
-
-
项目名称:{{ data.projectInfoList[0].projectName }}
-
开课名称:{{ data.projectInfoList[0].courseName }}
-
培训讲师:{{ data.projectInfoList.map(item => item.teacherName).join(',') }}
+
+
项目名称:{{ data?.projectInfoList[0].projectName }}
+
开课名称:{{ data?.projectInfoList[0].courseName }}
+
培训讲师:{{ data?.projectInfoList.map(item => item.teacherName).join(',') }}
{{ value.assessmentQaTitle }}
+ type="textarea" :readonly="!!data?.isSubmit"/>
{{ value.content?.length || 0 }}/200
+ @click="emptyValuePromp" :style="{ background: data?.isSubmit ? '#999' : '#2478ff' }"> 提交
-
+
提交
@@ -309,6 +309,15 @@ onMounted(() => { chapterOrStageId, targetId: infoId ? infoId : 0 },(res)=>{ + useRequest(TASK_NO_COMMIT, { + targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id + chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空 + assessmentId: courseId, + taskId: taskId ? taskId : 0, + type, + result: JSON.stringify(data.value), + beginTime: answerTime + }) if (res.data.isSubmit) { open(); } @@ -361,18 +370,6 @@ function submit() { }); } -const noCommit = () => { - useRequest(TASK_NO_COMMIT, { - targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id - chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空 - assessmentId: courseId, - taskId: taskId ? taskId : 0, - type, - result: JSON.stringify(data.value), - beginTime: answerTime - }) -} -noCommit()