From 2b6c807e0336063b25ce751dbe7f71de4ebb38e1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 20:41: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 85e9df4..50b1c55 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" size="small" 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)"
>
@@ -49,10 +51,10 @@
<el-dialog :visible.sync="visible" width="400px">
<el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
- <el-form-item label="鍚嶇О锛�" prop="name" required>
+ <el-form-item label="鍚嶇О锛�" prop="name">
<el-input v-model="form.name" maxlength="10" show-word-limit/>
</el-form-item>
- <el-form-item label="鎺掑簭锛�" prop="itemOrder" required>
+ <el-form-item label="鎺掑簭锛�" prop="itemOrder">
<el-input-number v-model="form.itemOrder" type="number" :min="1" :max="100"/>
</el-form-item>
<el-form-item>
@@ -142,6 +144,7 @@
this.forceSubmitForm.userId = userId
forceSubmit(this.forceSubmitForm).then(res => {
this.$message.success('寮哄埗浜ゅ嵎鎴愬姛')
+ this.search()
})
},
handleNullify (row) {
--
Gitblit v1.8.0