Merge remote-tracking branch 'origin/master'

xiangpei

2024-10-16 b57f2a267747845f2846002e7042c38727f12c45

 src/views/exam/exam/ExamManage.vue

@@ -7,11 +7,11 @@
      <div>
        <el-form :inline="true" :model="searchForm" class="demo-form-inline">
          <el-form-item label="考试名称">
            <el-input v-model="searchForm.examName" @input="page" clearable size="small" clearable @clear="page"
            <el-input v-model="searchForm.examName" @input="page" clearable size="small" @clear="page"
                      placeholder="班级名称"></el-input>
          </el-form-item>
          <el-form-item label="参考班级">
            <el-select v-model="searchForm.classesId" @change="page" clearable @clear="page">
            <el-select v-model="searchForm.classesId" @change="page" clearable size="small" @clear="page">
              <el-option v-for="classes in classesList" :key="classes.id" :value="classes.id"
                         :label="classes.className"/>
            </el-select>
@@ -22,26 +22,30 @@
        </el-form>
      </div>
    </div>
    <el-table :data="tableData" border>
    <el-table :data="tableData" border style="width: 100%">
      <el-table-column
        label="考试名称"
        width="150px"
        prop="examName"
      ></el-table-column>
      <el-table-column
        label="考试试卷"
        prop="examPaperName"
        width="200px"
      ></el-table-column>
      <el-table-column
        label="参考班级"
        width="200px"
        prop="className"
      ></el-table-column>
      <el-table-column
        label="班级人数"
        prop="studentNum"
      ></el-table-column>
      <!--      <el-table-column-->
      <!--        label="班级人数"-->
      <!--        prop="studentNum"-->
      <!--      ></el-table-column>-->
      <el-table-column
        label="考试地点"
        prop="examPlace"
        width="150px"
      ></el-table-column>
      <el-table-column
        label="考试状态"
@@ -61,15 +65,16 @@
      </el-table-column>
      <el-table-column
        label="创建时间"
        width="150px"
        width="160px"
        prop="createTime"
      ></el-table-column>
      <el-table-column label="操作" fiexd="right">
      <el-table-column label="操作" fixed="right" width="220px">
        <template slot-scope="scope">
          <el-button
            type="primary"
            size="small"
            @click="handlerEdit(scope.row)"
            v-if="scope.row.status === 'not_start'"
          >修改
          </el-button>
          <el-popconfirm
@@ -81,7 +86,10 @@
            <el-button slot="reference" type="danger" size="small">删除</el-button>
          </el-popconfirm>

          <el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">阅卷</el-button>
          <el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">
            阅卷
          </el-button>
          <el-button v-if="scope.row.status === 'ing'" type="warning" size="small" @click="monitor(scope.row)">监控</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -203,6 +211,10 @@
    this.MyExamPaperList()
  },
  methods: {
    // 考试监控列表
    monitor (row) {
      this.$router.push({ path: '/exam/monitor', query: { examId: row.id } })
    },
    markPaper (row) {
      // 跳转阅卷页面
      this.$router.push({ path: '/exam/mark/paper', query: { examName: row.examName, examId: row.id } })
@@ -239,16 +251,22 @@
        this.classesList = res.data.data
      })
    },
    deleteExam (id) {
      deleteExamById(id).then(res => {
        this.$message.success('删除成功')
        this.page()
    deleteExam (row) {
      this.$confirm('确认是否删除' + row.examName + '?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        deleteExamById(row.id).then(res => {
          this.$message.success('删除成功')
          this.page()
        })
      })
    },
    handlerEdit (row) {
      this.examForm = {
        ...row,
      time: [row.startTime, row.endTime]
        time: [row.startTime, row.endTime]
      }
      this.title = '修改考试'
      this.open = true