From 5f398d6540696836fa5eeb16cde5dd463cd20060 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Thu, 19 Dec 2024 15:10:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20exam/=E4=BF=AE=E6=94=B9=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E8=80=83=E8=AF=95=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=20=E5=92=8C=20=E5=88=A0=E9=99=A4=E5=88=86=E7=B1=BB=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/api/exam.js               |  2 +-
 client/src/views/exam/examRecord.vue | 10 +++++-----
 client/src/views/exam/questions.vue  |  2 +-
 server/apps/exam/filters.py          |  2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/src/api/exam.js b/client/src/api/exam.js
index fbc3b24..c77d8eb 100644
--- a/client/src/api/exam.js
+++ b/client/src/api/exam.js
@@ -27,7 +27,7 @@ export function updateQuestioncat(id, data) {
   //删除题目类型
 export function deleteQuestioncat(id) {
   return request({
-    url: `/exam/question/${id}/`,
+    url: `/exam/questioncat/${id}/`,
     method: 'delete'
   })
 }
diff --git a/client/src/views/exam/examRecord.vue b/client/src/views/exam/examRecord.vue
index a199991..7e81091 100644
--- a/client/src/views/exam/examRecord.vue
+++ b/client/src/views/exam/examRecord.vue
@@ -22,9 +22,9 @@
         align="right"
         unlink-panels
         range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        :picker-options="pickerOptions">
+        start-placeholder="考试开始日期"
+        end-placeholder="考试结束日期"
+        >
       </el-date-picker>
       <el-input
           v-model="listQuery.search"
@@ -275,8 +275,8 @@
         }).catch(e=>{loading.close()})
       },
       setTimeRange(){
-        this.listQuery.start = this.value[0],
-        this.listQuery.end = this.value[1],
+        this.listQuery.create_time__gte = this.value[0],
+        this.listQuery.create_time__lte = this.value[1],
         this.getList()
       },
       changeSort (val) {
diff --git a/client/src/views/exam/questions.vue b/client/src/views/exam/questions.vue
index 0b7d515..a4df08a 100644
--- a/client/src/views/exam/questions.vue
+++ b/client/src/views/exam/questions.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
         <div style="margin-top:10px">
-            <el-select v-model="listQuery.questioncat" placeholder="题目分类" clearable style="width: 200px" class="filter-item"
+            <el-select v-model="listQuery.questioncat" placeholder="题目分类" clearable filterable style="width: 200px" class="filter-item"
                 @change="handleFilter">
                 <el-option v-for="item in questioncatData" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
diff --git a/server/apps/exam/filters.py b/server/apps/exam/filters.py
index 05e97ed..0b1ea6f 100644
--- a/server/apps/exam/filters.py
+++ b/server/apps/exam/filters.py
@@ -8,6 +8,8 @@ class ExamRecordFilter(filters.FilterSet):
         model = ExamRecord
         fields = {
             'start_time': ['exact', 'gte', 'lte'],
+            'end_time': ['exact', 'gte', 'lte'],
+            'create_time': ['exact', 'gte', 'lte'],
             'is_pass': ['exact'],
             'type': ['exact'],
             'is_submited': ['exact'],