fix -- 评估bug

This commit is contained in:
yuping
2023-03-13 20:31:44 +08:00
parent 155eb86dc5
commit a9b641302a

View File

@@ -23,7 +23,8 @@
<div class="return">
<div style="display: flex" @click="returnclick">
<el-button style="color:#0073FB"><img class="img2" style="margin-right:11px;cursor: pointer;"
src="../../assets/image/return.png" />返回</el-button>
src="../../assets/image/return.png"/>返回
</el-button>
</div>
</div>
</div>
@@ -34,21 +35,14 @@
<!-- 基本信息 -->
<div class="bascinfo">
<div>
<!-- {{ [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
return a[0].orderNumber - b[0].orderNumber
}) }} -->
<div class="question" v-for="(value, index) in questionList " :key="index" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
<div class="question" v-for="(value, index) in questionList " :key="index"
:style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
<div v-if="value.questionType == '4'">
<div class="question" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
<div class="text">{{ value.assessmentScTitle }}</div>
<div class="answer">
<div class="answerL">完全没用</div>
<div class="answerC">
<!-- v-for="(item, key) in Array.from(
{ length: value.assessmentMaxScore },
(k, i) => i
)" -->
<div class="answerCitem"
v-for="(item, key) in orderArr(value.assessmentMinScore,value.assessmentMaxScore)"
:key="key"
@@ -95,16 +89,18 @@
if (data.isSubmit) {
return;
}
value.assessmentSingleChoiceVoList.forEach((e) => {
e.select = false;
});
values.select = true;}
value.assessmentSingleChoiceVoList.forEach((e) => e.select = false);
values.select = true;
}
">
<div style="display:flex">
<img style="width: 19px; height: 18px; cursor: pointer" :src="values.select ? checkbox : checkbox2" />
<img style="width: 19px; height: 18px; cursor: pointer"
:src="values.select ? checkbox : checkbox2"/>
<div class="people">{{ values.singleOptionName }}</div>
</div>
<img v-if="values.singleOptionPictureAddress" style="width: 140px; height: 140px; border-radius: 8px;margin-left: 130px;margin-top: 12px;" :src="values.singleOptionPictureAddress ? fielPath + values.singleOptionPictureAddress : ''" />
<img v-if="values.singleOptionPictureAddress"
style="width: 140px; height: 140px; border-radius: 8px;margin-left: 130px;margin-top: 12px;"
:src="values.singleOptionPictureAddress ? fielPath + values.singleOptionPictureAddress : ''"/>
<div v-else style="width: 140px;height: 140px;"></div>
</div>
</div>
@@ -130,10 +126,13 @@
values.select = !values.select;
}">
<div style="display:flex">
<img style="width: 19px; height: 18px; cursor: pointer" :src="values.select ? checkbox : checkbox2" />
<img style="width: 19px; height: 18px; cursor: pointer"
:src="values.select ? checkbox : checkbox2"/>
<div class="people">{{ values.multipleOptionName }}</div>
</div>
<img v-if="values.multipleOptionPictureAddress" style="width: 140px; height: 140px; border-radius: 8px;margin-left: 130px;margin-top: 12px;" :src="values.multipleOptionPictureAddress ? fielPath + values.multipleOptionPictureAddress : ''" />
<img v-if="values.multipleOptionPictureAddress"
style="width: 140px; height: 140px; border-radius: 8px;margin-left: 130px;margin-top: 12px;"
:src="values.multipleOptionPictureAddress ? fielPath + values.multipleOptionPictureAddress : ''"/>
<div v-else style="width: 140px;height: 140px;"></div>
</div>
</div>
@@ -151,152 +150,15 @@
</div>
</div>
</div>
<!-- <div
class="question"
v-for="(value, index) in data.assessmentScoringQuestionDtoList"
:key="index"
:style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
>
<div class="text">{{ value.assessmentScTitle }}</div>
<div class="answer">
<div class="answerL">完全没用</div>
<div class="answerC">
<div
class="answerCitem"
v-for="(item, key) in Array.from(
{ length: value.assessmentMaxScore },
(k, i) => i
)"
:key="key"
:style="{
'margin-left': key === 0 ? '15px' : '10px',
background:
value.selectAnswer === item
? 'rgba(86, 163, 249, 1)'
: 'rgba(86, 163, 249, 0)',
color:
value.selectAnswer === item
? '#fff'
: 'rgba(86, 163, 249, 1)',
}"
@click="
() => {
if (data.isSubmit) {
return;
}
value.selectAnswer = item;
}
"
>
<div>{{ item + 1 }}</div>
</div>
</div>
<div class="answerR">非常有帮助/启发</div>
</div>
</div>
<div
class="question"
style="margin-top: 41px"
v-if="
data.assessmentSingleChoiceDtoList &&
data.assessmentSingleChoiceDtoList.length
"
>
<div class="text">
{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
</div>
<div
v-for="(value, index) in data.assessmentSingleChoiceDtoList"
:key="index"
style="display: flex; align-items: center"
:style="{
'margin-top': index === 0 ? '29px' : '22px',
cursor: 'pointer',
}"
@click="
() => {
if (data.isSubmit) {
return;
}
data.assessmentSingleChoiceDtoList.forEach((e) => {
e.select = false;
});
value.select = true;
}
"
>
<img
style="width: 19px; height: 18px; cursor: pointer"
:src="value.select ? checkbox : checkbox2"
/>
<div class="people">{{ value.singleOptionName }}</div>
</div>
</div>
<div
class="question"
style="margin-top: 41px"
v-if="
data.assessmentMultipleChoiceDtoList &&
data.assessmentMultipleChoiceDtoList.length
"
>
<div class="text">
{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
</div>
<div
v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
:key="index"
style="display: flex; align-items: center"
:style="{
'margin-top': index === 0 ? '29px' : '22px',
cursor: 'pointer',
}"
@click="
() => {
if (data.isSubmit) {
return;
}
value.select = !value.select;
}
"
>
<img
style="width: 19px; height: 18px; cursor: pointer"
:src="value.select ? checkbox : checkbox2"
/>
<div class="people">{{ value.multipleOptionName }}</div>
</div>
</div>
<div
class="question"
style="margin-top: 41px"
v-for="(item, i) in data.assessmentEssayQuestionDtoList"
:key="i"
>
<div class="text">{{ item.assessmentQaTitle }}</div>
<div style="width: 713px; margin-top: 31px; position: relative">
<el-input
v-model="item.content"
:autosize="{ minRows: 5, maxRows: 5 }"
resize="none"
maxlength="200"
type="textarea"
:readonly="!!data.isSubmit"
/>
<div class="words">{{ item.content?.length || 0 }}/200</div>
</div>
</div> -->
<div style="display: flex; justify-content: center" v-if="
data.essayQuestionVoList?.length ||
data.multipleStemVoList?.length ||
data.scoringQuestionVoList?.length ||
data.singleStemVoList?.length
"> <div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
">
<div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" class="submit"
@click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
提交
</div>
</div>
@@ -309,7 +171,6 @@
</div>
</div>
<!-- 基本信息 -->
<!-- todo 测评页面 没有接口-->
</div>
<el-dialog v-model="centerDialogVisible" title="" width="20%" center :show-close="false" :align-center="true">
<div style="text-align: center;font-size:16px;"> <span style="color:black">
@@ -336,7 +197,7 @@ import { useRoute, useRouter } from "vue-router/dist/vue-router";
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 {ref, watch} from "vue";
import dayjs from "dayjs";
import {useTaskPage} from "@/api/useCommon";
@@ -345,57 +206,50 @@ const {
} = useRoute();
const router = useRouter();
const returnclick = () => {
clearInterval(timers)
router.back();
};
const {nextPage,prevPage,hasPrev, hasNext} = type==3 || type==4 ? '' : useTaskPage()
const { nextPage, prevPage, hasPrev, hasNext } = type == 3 || type == 4 ? "" : useTaskPage();
const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
console.log(data)
console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 })
console.log('我是需要排序得题目', data)
const { data } = useRequest(ASSESSMENT_QUERY(courseId), {
id: courseId,
type,
chapterOrStageId,
targetId: infoId ? infoId : 0
});
// 答题时间
const answerTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
console.log('录入首次进入页面时间', answerTime)
const answerTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
console.log("录入首次进入页面时间", answerTime);
// 数组去空对象
function formateArr(datas) {
let allArr = []
let allArr = [];
for (let i = 0; i < datas.length; i++) {
for (let j = 0; j < datas[i].length; j++) {
allArr.push(datas[i][j])
allArr.push(datas[i][j]);
}
}
let newarr = allArr.sort((a, b) => { return a.orderNumber - b.orderNumber})
console.log('我是排序后的题目', newarr)
return newarr
let newarr = allArr.sort((a, b) => {
return a.orderNumber - b.orderNumber;
});
return newarr;
}
const questionList = ref([])
const questionList = ref([]);
const timers = setInterval(() => {
console.log(data)
console.log(data.value.id)
watch(data, ()=> {
if (data.value.id) {
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])
questionList.value = formateArr([data.value.essayQuestionVoList, data.value.multipleStemVoList, data.value.scoringQuestionVoList, data.value.singleStemVoList]);
}
}, 1000);
setTimeout(() => {
clearInterval(timers);
}, 30000);
});
// 生成数组
function orderArr(a, b) {
let arrs = []
let arrs = [];
for (let i = 0; i < 10; i++) {
if ((i + 1) >= a && (i + 1) <= b) {
arrs.push(i)
arrs.push(i);
}
}
return arrs;
@@ -403,64 +257,25 @@ function orderArr(a,b) {
const centerDialogVisible = ref(false);
const open = () => {
centerDialogVisible.value = true
centerDialogVisible.value = true;
};
function submit() {
console.log('录入首次进入页面时间', answerTime)
if (1 > 0) {
console.log(data)
console.log('我是提交的数据', {
targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
assessmentId: courseId,
taskId: taskId ? taskId : 0,
type,
result: JSON.stringify(data.value),
})
}
console.log("录入首次进入页面时间", answerTime);
if (data.value.isSubmit) {
return;
}
console.log("data.value", data.value);
let list1 = data.value.assessmentEssayQuestionDtoList;
if (list1 && list1.length > 0) {
list1.forEach((item) => {
if (item && !item.content) {
return ElMessage.warning("您有未填写的评估题干");
if (data.value.singleStemVoList?.some(t=>t?.assessmentSingleChoiceVoList?.every(s => !s?.select))) {
return ElMessage.warning("您有未填写的单选评估题干");
}
})
if (data.value.multipleStemVoList?.some(t=>t?.multipleChoiceVoList?.every(s => !s?.select))) {
return ElMessage.warning("您有未填写的多选评估题干");
}
let list2 = data.value.assessmentScoringQuestionDtoList;
if (list2 && list2.length > 0) {
list2.forEach((item) => {
if (item && !item.selectAnswer) {
return ElMessage.warning("您有未填写的评估题干");
}
})
}
let list3 = data.value.assessmentSingleChoiceDtoList;
if (list3 && list3.length > 0) {
let flag = 0;
list3.forEach((item) => {
flag = flag + item.select ? 1 : 0;
})
if (flag == 0) {
return ElMessage.warning("您有未填写的评估题干");
}
}
let list4 = data.value.assessmentMultipleChoiceDtoList;
if (list4 && list4.length > 0) {
let flag = 0;
list4.forEach((item) => {
flag = flag + item.select ? 1 : 0;
})
if (flag == 0) {
return ElMessage.warning("您有未填写的评估题干");
if (data.value.scoringQuestionVoList?.some(s => !s?.selectAnswer)) {
return ElMessage.warning("您有未填写的评分评估题干");
}
if (data.value.essayQuestionVoList?.some(s => !s?.content)) {
return ElMessage.warning("您有未填写的简答评估题干");
}
data.value.isSubmit = !data.value.isSubmit;
@@ -510,6 +325,7 @@ function submit() {
background-image: url("../../assets/image/next.png");
}
}
.surveydetail {
.crumb {
color: #fff;