From b30568afb0dbe34944e45e549d8b0da98edfc98d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 29 十月 2024 14:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/grade/components/answer-main/answer-fill/index.vue | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/views/grade/components/answer-main/answer-fill/index.vue b/src/views/grade/components/answer-main/answer-fill/index.vue
index 2546644..4ebc332 100644
--- a/src/views/grade/components/answer-main/answer-fill/index.vue
+++ b/src/views/grade/components/answer-main/answer-fill/index.vue
@@ -1,16 +1,34 @@
<!-- 濉┖棰� -->
<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.questionItemList" :class="answerState(item,index)">
+ <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" v-html="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.answer }}</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>
@@ -19,14 +37,13 @@
import { ref,computed } from 'vue';
import { storeToRefs } from 'pinia';
import ExamInfo from '@/components/ExamInfo/index.vue';
-import { useExamStore } from '@/store/index.js';
-const examStore = useExamStore();
+import { useGradeStore } from '@/store/index.js';
+const gradeStore = useGradeStore();
+const { currentType, currentIndex } = storeToRefs(gradeStore);
-const { currentType, currentIndex } = storeToRefs(examStore);
-
-const activeQuestion = ref(examStore.getActiveQuestion);
+const activeQuestion = ref(gradeStore.getActiveQuestion);
const answerState = (item,index) => {
--
Gitblit v1.8.0