Merge remote-tracking branch 'origin/master'

lohir

2024-10-16 d7bee17c1d8fdb9a2a3c0303d7c38bc74a778e31

 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,17 +22,20 @@
        </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-->
@@ -42,6 +45,7 @@
      <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" width="280px">
      <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
@@ -84,7 +89,7 @@
          <el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">
            阅卷
          </el-button>
          <el-button type="warning" size="small" @click="monitor(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>