修改bug
This commit is contained in:
parent
598e5c998a
commit
722e96c6c4
|
@ -113,7 +113,7 @@
|
||||||
createMessage.error('还未到答卷时间!');
|
createMessage.error('还未到答卷时间!');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let endTimestamp = Date.parse(record.endTime+" 23:59:59");
|
let endTimestamp = Date.parse(record.endTime);
|
||||||
if(timestamp>endTimestamp){
|
if(timestamp>endTimestamp){
|
||||||
createMessage.error('答卷时间已过!');
|
createMessage.error('答卷时间已过!');
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -829,6 +829,7 @@ const disabledDate = (current: Dayjs) => {
|
||||||
//表单验证
|
//表单验证
|
||||||
const validatorRules = {
|
const validatorRules = {
|
||||||
title: [{ required: true, message: '请输入测验名称!' }],
|
title: [{ required: true, message: '请输入测验名称!' }],
|
||||||
|
startTime: [{ required: true, message: '请输入开始时间!' }],
|
||||||
endTime: [{ required: true, message: '请输入结束时间!' }],
|
endTime: [{ required: true, message: '请输入结束时间!' }],
|
||||||
};
|
};
|
||||||
const { resetFields, validate, validateInfos } = useForm(zyInfo, validatorRules, { immediate: true });
|
const { resetFields, validate, validateInfos } = useForm(zyInfo, validatorRules, { immediate: true });
|
||||||
|
@ -1406,6 +1407,8 @@ async function submitForm() {
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
createMessage.error('至少创建一个试题');
|
createMessage.error('至少创建一个试题');
|
||||||
|
confirmLoading.value = false;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
model.list = values;
|
model.list = values;
|
||||||
|
|
|
@ -3,16 +3,25 @@
|
||||||
<div class="jeecg-basic-table-form-container">
|
<div class="jeecg-basic-table-form-container">
|
||||||
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :lg="8">
|
<a-col :lg="6">
|
||||||
<a-form-item label="学生姓名">
|
<a-form-item label="学生姓名">
|
||||||
<a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
|
<a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="8">
|
<a-col :lg="6">
|
||||||
<a-form-item label="学生学号">
|
<a-form-item label="学生学号">
|
||||||
<a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
|
<a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</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">
|
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||||
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
|
|
|
@ -52,12 +52,12 @@ export const columns: BasicColumn[] = [
|
||||||
dataIndex: 'answerSfm',
|
dataIndex: 'answerSfm',
|
||||||
width: 80
|
width: 80
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
title: '学期学年',
|
// title: '学期学年',
|
||||||
align: "center",
|
// align: "center",
|
||||||
dataIndex: 'xqxn',
|
// dataIndex: 'xqxn',
|
||||||
width: 80
|
// width: 80
|
||||||
},
|
// },
|
||||||
// {
|
// {
|
||||||
// title: '课程名称',
|
// title: '课程名称',
|
||||||
// align: "center",
|
// align: "center",
|
||||||
|
@ -121,12 +121,12 @@ export const dccolumns: BasicColumn[] = [
|
||||||
dataIndex: 'answerSfm',
|
dataIndex: 'answerSfm',
|
||||||
width: 80
|
width: 80
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
title: '学期学年',
|
// title: '学期学年',
|
||||||
align: "center",
|
// align: "center",
|
||||||
dataIndex: 'xqxn',
|
// dataIndex: 'xqxn',
|
||||||
width: 80
|
// width: 80
|
||||||
},
|
// },
|
||||||
// {
|
// {
|
||||||
// title: '课程名称',
|
// title: '课程名称',
|
||||||
// align: "center",
|
// align: "center",
|
||||||
|
|
|
@ -3,17 +3,26 @@
|
||||||
<div class="jeecg-basic-table-form-container">
|
<div class="jeecg-basic-table-form-container">
|
||||||
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :lg="8">
|
<a-col :lg="6">
|
||||||
<a-form-item label="学生姓名">
|
<a-form-item label="学生姓名">
|
||||||
<a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
|
<a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="8">
|
<a-col :lg="6">
|
||||||
<a-form-item label="学生学号">
|
<a-form-item label="学生学号">
|
||||||
<a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
|
<a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</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">
|
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
|
<a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
|
||||||
|
|
|
@ -3,16 +3,25 @@
|
||||||
<div class="jeecg-basic-table-form-container">
|
<div class="jeecg-basic-table-form-container">
|
||||||
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :lg="8">
|
<a-col :lg="6">
|
||||||
<a-form-item label="学生姓名">
|
<a-form-item label="学生姓名">
|
||||||
<a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
|
<a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="8">
|
<a-col :lg="6">
|
||||||
<a-form-item label="学生学号">
|
<a-form-item label="学生学号">
|
||||||
<a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
|
<a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</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">
|
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||||
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
|
|
Loading…
Reference in New Issue