Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-28 c2a1c68a2a398e6d0f2f5854c65127efbff306b1

 src/views/exam/exam/monitor.vue

@@ -2,10 +2,10 @@
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item>
        <el-input v-model="queryParam.keyword" placeholder="请输入名称" clearable></el-input>
        <el-input v-model="queryParam.keyword" placeholder="请输入名称" @input="search" clearable></el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="search">查询</el-button>
        <el-button type="primary" @click="search" size="small">查询</el-button>
      </el-form-item>
    </el-form>

@@ -18,6 +18,7 @@
      <el-table-column label="操作" align="center">
        <template slot-scope="{row}">
          <el-popover
            v-show="row.status === 'temp'"
            placement="right"
            width="400"
            trigger="click">
@@ -34,8 +35,9 @@
            </el-form>
            <el-button size="mini" slot="reference">加时</el-button>
          </el-popover>
          <el-button size="mini" type="danger" @click="handleNullify(row)">作废</el-button>
          <el-button v-show="row.status === 'temp'" size="mini" type="danger" @click="handleNullify(row)">作废</el-button>
          <el-popconfirm
            v-show="row.status === 'temp'"
            title="确定要强制提交该学员的试卷吗？"
            @confirm="handlerForceSubmit(row.userId)"
          >
@@ -44,7 +46,7 @@
        </template>
      </el-table-column>
    </el-table>
    <pagination v-show="total > 0" :total="total" :page.sync="queryParam.pageIndex" :limit.sync="queryParam.pageSize"
    <pagination v-show="total > 0" :total="total" :page.sync="queryParam.currentPage" :limit.sync="queryParam.pageSize"
                @pagination="search"/>

    <el-dialog :visible.sync="visible" width="400px">
@@ -79,7 +81,7 @@
      listLoading: true,
      queryParam: {
        examId: '',
        pageIndex: 1,
        currentPage: 1,
        pageSize: 10
      },
      formLoading: false,
@@ -142,6 +144,7 @@
      this.forceSubmitForm.userId = userId
      forceSubmit(this.forceSubmitForm).then(res => {
        this.$message.success('强制交卷成功')
        this.search()
      })
    },
    handleNullify (row) {