Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-17 2a001b84b32b648e24e4c248442133219ceb8efb

 src/views/exam/exam/ExamManage.vue

@@ -73,7 +73,7 @@
          >修改
          </el-button>
          <el-button type="danger" size="small" @click="deleteExam(scope.row.id)">删除</el-button>
          <el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">阅卷</el-button>
          <el-button type="success" size="small" @click="markPaper(scope.row)">阅卷</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -111,7 +111,8 @@
        <el-form-item label="开始时间" :label-width="formLabelWidth" prop="time">
          <el-date-picker
            v-model="examForm.time"
            type="daterange"
            type="datetimerange"
            value-format="yyyy-MM-dd HH:mm:ss"
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期">
@@ -150,8 +151,8 @@
        examPaperType: null,
        examPlace: '',
        status: '',
        startTime: '',
        endTime: '',
        startTime: null,
        endTime: null,
        time: []
      },
      examRules: {
@@ -272,8 +273,9 @@
        examPaperType: '',
        examPlace: '',
        status: '',
        startTime: '',
        endTime: '',
        startTime: null,
        endTime: null,
        time: []
      }
    },
    closeHandler () {