From b57f2a267747845f2846002e7042c38727f12c45 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 16 十月 2024 10:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/exam/monitor.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/exam/exam/monitor.vue b/src/views/exam/exam/monitor.vue
index 90695bb..3d8a3d4 100644
--- a/src/views/exam/exam/monitor.vue
+++ b/src/views/exam/exam/monitor.vue
@@ -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,
--
Gitblit v1.8.0