From 204d2a822b78caac40fa7bb394910a21aa0b96c2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 24 七月 2024 15:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam-list/data-list/index.vue | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/views/exam-list/data-list/index.vue b/src/views/exam-list/data-list/index.vue
index 47c3163..8f1c21c 100644
--- a/src/views/exam-list/data-list/index.vue
+++ b/src/views/exam-list/data-list/index.vue
@@ -5,7 +5,7 @@
<div class="item flex justify-between items-center">
<div class="left-container flex flex-col justify-between">
<div class="top-container flex items-center">
- <div class="title mr-5 text-xl font-bold">{{ item.name }}</div>
+ <div class="title mr-5 text-xl font-bold">{{ item.examName }}</div>
<div class="tag">
<el-tag :type="stateList[item.status].type" effect="light" round>
{{ stateList[item.status].text }}
@@ -20,7 +20,7 @@
鑰冭瘯鏃堕棿: {{ item.startTime }} ~ {{ item.endTime }}
</div>
</div>
- <div class="bottom-container flex text-sm text-gray-400">
+ <!-- <div class="bottom-container flex text-sm text-gray-400">
<div class="bottom-item">
鎬诲垎: {{ item.examScore }}
</div>
@@ -30,11 +30,11 @@
<div class="bottom-item">
绛旈鏃堕棿: {{ item.examTime }}鍒嗛挓
</div>
- </div>
+ </div> -->
</div>
<div class="right-container">
<div class="button-container">
- <el-button type="primary" size="large" @click="examClick"
+ <el-button type="primary" size="large" @click="examClick(item)"
:disabled="stateList[item.status].disabled">寮�濮嬭�冭瘯</el-button>
</div>
</div>
@@ -52,7 +52,6 @@
import { getExamInfo } from '@/api/modules/exam.js';
const examStore = useExamStore();
-
const router = useRouter();
const props = defineProps({
@@ -68,23 +67,28 @@
type: 'primary',
disabled: true
},
- 2: {
+ 'ing': {
text: '杩涜涓�',
type: 'success',
disabled: false
},
- 3: {
+ 'finished': {
text: '宸茬粨鏉�',
type: 'info',
disabled: true
}
};
-const examClick = () => {
- getExamInfo().then((res) => {
- examStore.setExamInfo(res.data.examInfo);
- examStore.setExamDetail(res.data.examQuestionList);
- examStore.initExam();
+const examClick = (exam) => {
+ console.log(exam);
+ getExamInfo(exam.id).then((res) => {
+ examStore.setExamInfo({
+ id: res.data.id,
+ examName: res.data.examName,
+ suggestTime: res.data.suggestTime,
+ });
+ examStore.setExamDetail(res.data.titleList);
+ examStore.initExam(res.data.titleList[0].questionType);
router.push('/exam');
}).catch(err => {
@@ -102,4 +106,4 @@
.bottom-item {
margin-right: 30px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0