|
|
@@ -176,7 +176,6 @@
|
|
|
{{ index + 1 }}.{{ question.questionTitleName }}
|
|
|
</span>
|
|
|
<img v-if="IsSplitQuestionnaireFinish(question.studentAnswerStatus)" :src="finishIcon" alt="">
|
|
|
- <!-- question.studentAnswerStatus 学生答题是否完成 0 否 1 是-->
|
|
|
</li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
@@ -494,16 +493,20 @@ const HandleFinishReview = async ()=>{
|
|
|
ElMessage.success('问卷评价提交成功')
|
|
|
// true 表示当前问卷全部填写完成,跳到下一个问卷( false 没有完成的留在当前问卷页)
|
|
|
if(res.data){
|
|
|
+ fullQuestionnaireAnswer.value = {}
|
|
|
+ // 重新查询教师状态和问卷状态
|
|
|
+ await ReloadPageData()
|
|
|
+ // 重查和索引切换顺序不能颠倒
|
|
|
// 找到当前选中的教师
|
|
|
let currentIndex = teacherList.value.findIndex(item=>{
|
|
|
return item.teacherId == currentActiveTeacherId.value
|
|
|
})
|
|
|
// 跳转到下一个教师的问卷
|
|
|
currentActiveTeacherId.value = teacherList.value?.[currentIndex + 1]?.teacherId || ''
|
|
|
- fullQuestionnaireAnswer.value = {}
|
|
|
+ }else{
|
|
|
+ // 重新查询教师状态和问卷状态
|
|
|
+ await ReloadPageData()
|
|
|
}
|
|
|
- // 重新查询教师状态和问卷状态
|
|
|
- await ReloadPageData()
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -757,14 +760,15 @@ const HandleFinishCurrentQuestion = async ()=>{
|
|
|
let res = await saveEvaluationQuestionDataSplitApi(params)
|
|
|
if(res?.code == 200){
|
|
|
ElMessage.success('问卷评价提交成功')
|
|
|
-
|
|
|
- if((currentSelectedQuestionIndex.value + 1) < questionaireMsg.value.questionData?.length){
|
|
|
- currentSelectedQuestionIndex.value += 1
|
|
|
- }
|
|
|
singleQuestionAnswer.value = []
|
|
|
isQuestionEdit.value = false
|
|
|
+ questionTableData.value = []
|
|
|
+ questionTableColumns.value = []
|
|
|
// 重新查询 问卷内容和页面内容
|
|
|
await ReloadPageData()
|
|
|
+ if((currentSelectedQuestionIndex.value + 1) < questionaireMsg.value.questionData?.length){
|
|
|
+ currentSelectedQuestionIndex.value += 1
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -787,7 +791,11 @@ const GetEvaluationProcessMsg = async ()=>{
|
|
|
// 重新加载页面数据
|
|
|
const ReloadPageData = async ()=>{
|
|
|
await GetEvaluationProcessMsg()
|
|
|
- await GetFullQuestionnaireData()
|
|
|
+ if(defaultQuestionnaireMode.value == 'full'){
|
|
|
+ await GetFullQuestionnaireData()
|
|
|
+ }else if(defaultQuestionnaireMode.value == 'split'){
|
|
|
+ await GetSplitQuestionnaireData()
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
watch(()=>questionaireMsg?.value?.deadlineTime,async (newVal)=>{
|