From 4800366c4ae36b4900b34b7f183390fd9cd0d33b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 28 十月 2024 18:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into test
---
src/views/grade/components/answer-main/answer-multiple/index.vue | 153 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 116 insertions(+), 37 deletions(-)
diff --git a/src/views/grade/components/answer-main/answer-multiple/index.vue b/src/views/grade/components/answer-main/answer-multiple/index.vue
index b127aff..e5526fa 100644
--- a/src/views/grade/components/answer-main/answer-multiple/index.vue
+++ b/src/views/grade/components/answer-main/answer-multiple/index.vue
@@ -1,77 +1,119 @@
<template>
- <div class="answer-container w-full h-full">
- <el-scrollbar>
+ <div class="answer-container w-full h-full flex">
+ <el-scrollbar class="flex-1 mr-4">
<ExamInfo class="mb-5" :questionIndex="currentIndex" :activeQuestion="activeQuestion"></ExamInfo>
<div class="answer-content">
- <div class="answer-item flex" v-for="item, index in activeQuestion.items" @click="answerClick(item)"
- :class="answerState(item)">
+ <div class="answer-item flex" v-for="item, index in activeQuestion.questionItemList" :class="answerState(item)">
<div class="answer-icon flex flex-col justify-center items-center flex-shrink-0">{{ item.prefix }}</div>
<div class="answer-text text-gray-700">{{ item.content }}</div>
</div>
</div>
</el-scrollbar>
+
+ <el-scrollbar class="flex-1 ml-4">
+ <div class="analysis-container">
+ <div class="analysis-item" :class="analysisState">
+ <div class="item-label">鎮ㄧ殑绛旀</div>
+ <div class="item-info">{{ activeQuestion.answerList ? activeQuestion.answerList.join(','): '鏈綔绛�' }}</div>
+ </div>
+
+ <div class="analysis-item analysis-right">
+ <div class="item-label">姝ｇ‘绛旀</div>
+ <div class="item-info">{{ activeQuestion.questionAnswer }}</div>
+ </div>
+
+ <div class="analysis-item text-gray-700">
+ <div class="item-label">瑙ｆ瀽</div>
+ <div class="item-info" v-html="activeQuestion.analyze"></div>
+ </div>
+ </div>
+ </el-scrollbar>
</div>
</template>
<script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
import { storeToRefs } from 'pinia';
import ExamInfo from '@/components/ExamInfo/index.vue';
-import { useExamStore } from '@/store/index.js';
+import { useGradeStore } from '@/store/index.js';
+const gradeStore = useGradeStore();
-const examStore = useExamStore();
+const { currentIndex } = storeToRefs(gradeStore);
-const { currentType, currentIndex } = storeToRefs(examStore);
+const activeQuestion = ref(gradeStore.getActiveQuestion);
-const activeQuestion = ref(examStore.getActiveQuestion);
+const formatAnswer = (answer) => {
+ if(Array.isArray(answer)) {
+ return answer;
+ }
+ return answer.split(',');
+};
-const answerClick = (item) => {
- if (item) {
- // resetAnswer();
- item.isActive = !item.isActive;
- const answerList = filterAnswer();
- examStore.setQuestionAnswer(currentType.value, currentIndex.value, answerList.join(','));
+const currentAnswer = formatAnswer(activeQuestion.value.answerList);
+const rightAnswer = formatAnswer(activeQuestion.value.questionAnswer);
+const answerState = (item) => {
+ const flag1 = currentAnswer.includes(item.prefix);
+ const flag2 = rightAnswer.includes(item.prefix);
+
+ if (flag1 && flag2) {
+ return {
+ right: true
+ };
+ } else {
+ if (currentAnswer.length < rightAnswer.length) {
+ if (!flag1 && flag2) {
+ return {
+ wrong: true
+ };
+ }
+ } else if (currentAnswer.length > rightAnswer.length) {
+ if (flag1 && !flag2) {
+ return {
+ wrong: true
+ };
+ } else if (!flag1 && flag2) {
+ return {
+ right: true
+ };
+ }
+ } else {
+ return {
+ right: flag2,
+ wrong: flag1
+ };
+ }
}
};
-const answerState = (item) => {
+const analysisState = computed(() => {
return {
- active: item.isActive
+ 'analysis-right': activeQuestion.value.isRight,
+ 'analysis-wrong': !activeQuestion.value.isRight
};
-};
-
-const filterAnswer = () => {
- return activeQuestion.value.items.filter(item => item.isActive);
-}
+})
</script>
<style lang="scss" scoped>
+.answer-container {
+ --right-color: #67c23a;
+ --wrong-color: #f56c6c;
+}
+
.answer-item {
max-width: 500px;
border-radius: 10px;
border: 1px solid #DCDFE6;
overflow: hidden;
margin-bottom: 20px;
- cursor: pointer;
&:last-of-type {
margin-bottom: 0;
}
-
- &:hover {
- border-color: #3680fa;
-
- .answer-icon {
- color: #3680fa;
- border-color: #3680fa;
- }
- }
-
.answer-icon {
width: 50px;
@@ -86,13 +128,50 @@
}
}
-.active {
- border-color: #409EFF !important;
+
+.right {
+ border-color: var(--right-color) !important;
+ background-color: rgba($color: #67c23a, $alpha: 0.2) !important;
.answer-icon {
color: #ffffff !important;
- border-color: #409EFF !important;
- background-color: #409EFF !important;
+ border-color: var(--right-color) !important;
+ background-color: var(--right-color) !important;
}
+
+ .answer-text {
+ color: var(--right-color) !important;
+ }
+}
+
+.wrong {
+ border-color: var(--wrong-color) !important;
+ background-color: rgba($color: #f56c6c, $alpha: 0.2) !important;
+
+ .answer-icon {
+ color: #ffffff !important;
+ border-color: var(--wrong-color) !important;
+ background-color: var(--wrong-color) !important;
+ }
+
+ .answer-text {
+ color: var(--wrong-color) !important;
+ }
+}
+
+.analysis-item {
+ margin-bottom: 10px;
+
+ .item-label {
+ font-weight: bold;
+ }
+}
+
+.analysis-right {
+ color: var(--right-color);
+}
+
+.analysis-wrong {
+ color: var(--wrong-color);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0