From 722e96c6c4f7a49a277877f2604712932228ad4e Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 12 Aug 2024 20:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/wjxCswj/WjxCswjStuList.vue       |  2 +-
 src/views/kc/wjxCswj/WjxCywjV2List.vue        |  3 +++
 .../components/WjxWjxxTmlbAllDjjgsList.vue    | 13 ++++++++--
 .../components/WjxWjxxTmlbDjjgs.data.ts       | 24 +++++++++----------
 .../components/WjxWjxxTmlbDjjgsDcList.vue     | 15 +++++++++---
 .../components/WjxWjxxTmlbDjjgsList.vue       | 13 ++++++++--
 6 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/views/kc/wjxCswj/WjxCswjStuList.vue b/src/views/kc/wjxCswj/WjxCswjStuList.vue
index cc425cb..bb9b4a0 100644
--- a/src/views/kc/wjxCswj/WjxCswjStuList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjStuList.vue
@@ -113,7 +113,7 @@
       createMessage.error('还未到答卷时间！');
       return;
     }
-    let endTimestamp = Date.parse(record.endTime+" 23:59:59");
+    let endTimestamp = Date.parse(record.endTime);
     if(timestamp>endTimestamp){
       createMessage.error('答卷时间已过！');
       return;
diff --git a/src/views/kc/wjxCswj/WjxCywjV2List.vue b/src/views/kc/wjxCswj/WjxCywjV2List.vue
index 40db317..a154eaf 100644
--- a/src/views/kc/wjxCswj/WjxCywjV2List.vue
+++ b/src/views/kc/wjxCswj/WjxCywjV2List.vue
@@ -829,6 +829,7 @@ const disabledDate = (current: Dayjs) => {
 //表单验证
 const validatorRules = {
   title: [{ required: true, message: '请输入测验名称!' }],
+  startTime: [{ required: true, message: '请输入开始时间!' }],
   endTime: [{ required: true, message: '请输入结束时间!' }],
 };
 const { resetFields, validate, validateInfos } = useForm(zyInfo, validatorRules, { immediate: true });
@@ -1406,6 +1407,8 @@ async function submitForm() {
     }
   }else{
     createMessage.error('至少创建一个试题');
+    confirmLoading.value = false;
+    return;
   }
 
   model.list = values;
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue
index 2127f33..a7014bc 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue
@@ -3,16 +3,25 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
+          <a-col :lg="6">
             <a-form-item label="学生姓名">
               <a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="8">
+          <a-col :lg="6">
             <a-form-item label="学生学号">
               <a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :lg="6">
+            <a-form-item label="状态">
+              <a-select placeholder="请选择" v-model:value="queryParam.isFinished">
+                <a-select-option :value="undefined">请选择</a-select-option>
+                <a-select-option value="0">未完成</a-select-option>
+                <a-select-option value="1">已完成</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
index 2fa062b..71de3af 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
@@ -52,12 +52,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'answerSfm',
     width: 80
   },
-  {
-    title: '学期学年',
-    align: "center",
-    dataIndex: 'xqxn',
-    width: 80
-  },
+  // {
+  //   title: '学期学年',
+  //   align: "center",
+  //   dataIndex: 'xqxn',
+  //   width: 80
+  // },
   // {
   //   title: '课程名称',
   //   align: "center",
@@ -121,12 +121,12 @@ export const dccolumns: BasicColumn[] = [
     dataIndex: 'answerSfm',
     width: 80
   },
-  {
-    title: '学期学年',
-    align: "center",
-    dataIndex: 'xqxn',
-    width: 80
-  },
+  // {
+  //   title: '学期学年',
+  //   align: "center",
+  //   dataIndex: 'xqxn',
+  //   width: 80
+  // },
   // {
   //   title: '课程名称',
   //   align: "center",
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
index 81a2dbe..23046d4 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
@@ -3,17 +3,26 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
+          <a-col :lg="6">
             <a-form-item label="学生姓名">
               <a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="8">
+          <a-col :lg="6">
             <a-form-item label="学生学号">
               <a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :lg="6">
+            <a-form-item label="状态">
+              <a-select placeholder="请选择" v-model:value="queryParam.isFinished">
+                <a-select-option :value="undefined">请选择</a-select-option>
+                <a-select-option value="0">未完成</a-select-option>
+                <a-select-option value="1">已完成</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue
index dc48000..7d300d0 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue
@@ -3,16 +3,25 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
+          <a-col :lg="6">
             <a-form-item label="学生姓名">
               <a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="8">
+          <a-col :lg="6">
             <a-form-item label="学生学号">
               <a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :lg="6">
+            <a-form-item label="状态">
+              <a-select placeholder="请选择" v-model:value="queryParam.isFinished">
+                <a-select-option :value="undefined">请选择</a-select-option>
+                <a-select-option value="0">未完成</a-select-option>
+                <a-select-option value="1">已完成</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">