From ca9a92cfc2f2bd8c724020ee5e46094633eb80a5 Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期五, 12 七月 2024 17:39:45 +0800
Subject: [PATCH] 处理冲突
---
src/views/exam-list/data-list/index.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/views/exam-list/data-list/index.vue b/src/views/exam-list/data-list/index.vue
index 12feff2..8f1c21c 100644
--- a/src/views/exam-list/data-list/index.vue
+++ b/src/views/exam-list/data-list/index.vue
@@ -52,7 +52,6 @@
import { getExamInfo } from '@/api/modules/exam.js';
const examStore = useExamStore();
-
const router = useRouter();
const props = defineProps({
@@ -73,7 +72,7 @@
type: 'success',
disabled: false
},
- 3: {
+ 'finished': {
text: '宸茬粨鏉�',
type: 'info',
disabled: true
@@ -84,12 +83,12 @@
console.log(exam);
getExamInfo(exam.id).then((res) => {
examStore.setExamInfo({
- examName: exam.examName
+ id: res.data.id,
+ examName: res.data.examName,
+ suggestTime: res.data.suggestTime,
});
- examStore.setExamDetail(res.data);
- // examStore.setExamInfo(res.data.examInfo);
- // examStore.setExamDetail(res.data.examQuestionList);
- // examStore.initExam();
+ examStore.setExamDetail(res.data.titleList);
+ examStore.initExam(res.data.titleList[0].questionType);
router.push('/exam');
}).catch(err => {
@@ -107,4 +106,4 @@
.bottom-item {
margin-right: 30px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0