Преглед изворни кода

调查问卷/我的作业/我的考试 状态/操作 按需求处理

canghailong пре 6 месеци
родитељ
комит
96957a8895

+ 1 - 1
src/views/student/exam/components/QuestionAnswerShow.vue

@@ -74,7 +74,7 @@
 					{{ doRightTextFormatter(answer.doRight) }}
 				</a-tag>
 			</div>
-			<div class="question-answer-show-item">
+			<div class="question-answer-show-item" v-if="paperType!=5">
 				<span class="question-show-item">分数:</span>
 				<span>{{ question.score }}</span>
 			</div>

+ 2 - 0
src/views/student/exam/paper/do.vue

@@ -80,6 +80,7 @@
 	import examPaperApi from '@/api/student/examPaper'
 	import examPaperAnswerApi from '@/api/student/examPaperAnswer'
 	import { Modal } from 'ant-design-vue'
+	import EventBus from '@/utils/EventBus'
 	import '../../style.less'
 	const route = useRoute()
 	const router = useRouter()
@@ -161,6 +162,7 @@
 					content: `试卷得分:${re}分`,
 					okText: '返回',
 					onOk: () => {
+						EventBus.emit('getReadList')
 						window.close();
 					}
 				})

+ 1 - 1
src/views/student/exam/paper/read.vue

@@ -24,7 +24,7 @@
 			<a-layout-header class="align-center">
 				<h1>{{ form.name }}</h1>
 				<div>
-					<span class="question-title-padding">试卷得分:{{ answer.score }}</span>
+					<span class="question-title-padding" v-if="form.paperType!=5">试卷得分:{{ answer.score }}</span>
 					<span class="question-title-padding">试卷耗时:{{ formatSeconds(answer.doTime) }}</span>
 				</div>
 			</a-layout-header>

+ 5 - 24
src/views/student/paper/index.vue

@@ -6,12 +6,6 @@
 				<h3 style="border-left: solid 4px #3651d4; padding-left: 8px; margin-bottom: 12px; font-size: 18px">
 					<div>{{ examName }}</div>
 				</h3>
-				<div style="display: flex; align-items: center" class="mb-4" v-if="examType == 4">
-					<div class="mr-4">学科分类</div>
-					<a-select ref="select" v-model:value="tabId" style="width: 120px" allowClear @change="handleChange">
-						<a-select-option :value="item.id" v-for="(item, idx) in subjectList">{{ item.name }}</a-select-option>
-					</a-select>
-				</div>
 				<a-spin :spinning="taskLoading">
 					<a-table
 						ref="paperTableRef"
@@ -48,7 +42,7 @@
 										<a-button type="link" size="small">填写{{ examName }}</a-button>
 									</router-link>
 									<router-link
-										v-if="record.examType != 3 && record.status == 2"
+										v-if="record.status == 2"
 										:to="{ path: '/student/read', query: { id: record.answerId } }"
 										target="_blank"
 									>
@@ -63,9 +57,6 @@
 								<template v-if="column.key === 'paperType'">
 									{{ paperTypeEnum(record.paperType) }}
 								</template>
-								<template v-if="column.key === 'subjectId'">
-									{{ subjectName(record.subjectId) || '--' }}
-								</template>
 								<template v-if="column.key === 'action'">
 									<router-link
 										v-if="!record.status"
@@ -98,6 +89,7 @@
 	import { useRoute } from 'vue-router'
 	import tool from '@/utils/tool'
 	import { parseTime } from '@/utils/exam'
+	import EventBus from '@/utils/EventBus'
 	const route = useRoute()
 	const formatDateTime = (val) => {
 		if (!val) return ''
@@ -154,9 +146,8 @@
 		taskAllColumns.value.filter((r) => r.examType.includes(parseFloat(examType.value)))
 	)
 	const taskAllColumns = ref([
-		{ title: '问卷名称', dataIndex: 'name', key: 'name', examType: [4] },
+		{ title: '作业名称', dataIndex: 'name', key: 'name', examType: [4] },
 		{ title: '试卷类型', dataIndex: 'paperType', key: 'paperType', width: 120, examType: [4] },
-		{ title: '学科', dataIndex: 'subjectId', key: 'subjectId', width: 120, examType: [4] },
 
 		{ title: '问卷名称', dataIndex: 'examName', key: 'examName', examType: [1, 2, 3] },
 		{ title: '问卷类型', dataIndex: 'examType', key: 'examType', width: 120, examType: [1, 2, 3] },
@@ -212,17 +203,6 @@
 			getTaskList()
 		}
 	})
-	const tabId = ref('')
-	const subjectList = ref([])
-	const initSubject = async () => {
-		await examStore.initSubject()
-		subjectList.value = examStore.subjects
-	}
-	const subjectName = computed(() => {
-		return (id) => {
-			return subjectList.value.filter((r) => r.id == id)[0]?.name
-		}
-	})
 	const handleChange = (value) => {
 		pagination.value.subjectId = value
 		getTaskList()
@@ -230,9 +210,10 @@
 	// lifecycle
 	const examType = ref()
 	const paperType = ref(2)
+	EventBus.off('getTaskList', getTaskList)
+	EventBus.on('getTaskList', getTaskList)
 	onMounted(() => {
 		examType.value = route.params && route.params.examType
-		initSubject()
 		getTaskList()
 	})
 </script>