From c2a1c68a2a398e6d0f2f5854c65127efbff306b1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 28 十月 2024 11:36:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/exam/monitor.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/exam/exam/monitor.vue b/src/views/exam/exam/monitor.vue
index 90695bb..0473fb0 100644
--- a/src/views/exam/exam/monitor.vue
+++ b/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) {
--
Gitblit v1.8.0