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/paper/list.vue | 10 +++++-----
src/views/class-management/Class.vue | 17 ++++++++++++++---
src/views/user/student/list.vue | 10 +++++-----
src/views/class-management/ClassStaff.vue | 3 +--
4 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/views/class-management/Class.vue b/src/views/class-management/Class.vue
index 1e93db5..7cf959e 100644
--- a/src/views/class-management/Class.vue
+++ b/src/views/class-management/Class.vue
@@ -127,7 +127,8 @@
title="鐝骇閫氱煡"
:visible.sync="notifyOpen"
width="600px"
- :before-close="handleClose">
+ :before-close="handleNotifyClose"
+ :close-on-click-modal="false">
<el-form :model="notifyForm" :rules="notifyRules" ref="notifyForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="閫氱煡鐝骇锛�" prop="className">
<span>{{ notifyForm.className }}</span>
@@ -331,10 +332,20 @@
this.form = row
this.open = true
},
- handleClose (done) {
+ handleClose () {
this.open = false
this.resetForm()
- done()
+ },
+ handleNotifyClose () {
+ this.notifyOpen = false
+ this.resetNotifyForm()
+ },
+ resetNotifyForm () {
+ this.notifyForm = {
+ className: '',
+ notifyContent: '',
+ classesId: null
+ }
},
handlerAdd () {
this.open = true
diff --git a/src/views/class-management/ClassStaff.vue b/src/views/class-management/ClassStaff.vue
index 2bc943b..1fc7551 100644
--- a/src/views/class-management/ClassStaff.vue
+++ b/src/views/class-management/ClassStaff.vue
@@ -14,7 +14,7 @@
placeholder="瀛﹀憳濮撳悕"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="page">鏌ヨ</el-button>
+ <el-button type="primary" @click="page" size="small">鏌ヨ</el-button>
</el-form-item>
</el-form>
</div>
@@ -79,7 +79,6 @@
:before-close="handleAddClose"
:close-on-click-modal="false">
<el-form :model="studentForm" :rules="studentRules" ref="studentForm" label-width="100px" class="demo-ruleForm">
- <el-form-item label="瀛﹀彿" prop="id" v-show="false"/>
<el-form-item label="濮撳悕" prop="realName">
<el-input v-model="studentForm.realName"></el-input>
</el-form-item>
diff --git a/src/views/exam/paper/list.vue b/src/views/exam/paper/list.vue
index 057b6d8..3563202 100644
--- a/src/views/exam/paper/list.vue
+++ b/src/views/exam/paper/list.vue
@@ -2,16 +2,16 @@
<div class="app-container">
<el-form :model="queryParam" ref="queryForm" :inline="true">
<el-form-item label="璇曞嵎ID锛�">
- <el-input v-model="queryParam.id" clearable></el-input>
+ <el-input v-model="queryParam.id" clearable @input="search"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="submitForm">鏌ヨ</el-button>
+ <el-button type="primary" @click="submitForm" size="small">鏌ヨ</el-button>
<router-link :to="{ path: '/exam/paper/edit' }" class="link-left">
- <el-button type="primary" >娣诲姞</el-button>
+ <el-button type="primary" size="small">娣诲姞</el-button>
</router-link>
- <el-button class="link-left" type="danger" @click="downloadImportTemplate">涓嬭浇妯℃澘</el-button>
+ <el-button class="link-left" type="danger" @click="downloadImportTemplate" size="small">涓嬭浇妯℃澘</el-button>
<router-link :to="{ path: '/exam/paper/import' }" class="link-left">
- <el-button type="success">瀵煎叆</el-button>
+ <el-button type="success" size="small">瀵煎叆</el-button>
</router-link>
</el-form-item>
</el-form>
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 82fee4d..e258c70 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -2,14 +2,14 @@
<div class="app-container">
<el-form :model="queryParam" ref="queryForm" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶏細">
- <el-input v-model="queryParam.userName"></el-input>
+ <el-input v-model="queryParam.userName" @input="search"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="submitForm">鏌ヨ</el-button>
+ <el-button type="primary" @click="submitForm" size="small">鏌ヨ</el-button>
<router-link :to="{path:'/user/student/edit'}" class="link-left">
- <el-button type="primary">娣诲姞</el-button>
+ <el-button type="primary" size="small">娣诲姞</el-button>
</router-link>
- <el-button class="link-left" type="danger" @click="exportExcel">涓嬭浇妯℃澘</el-button>
+ <el-button class="link-left" type="danger" @click="exportExcel" size="small">涓嬭浇妯℃澘</el-button>
<el-upload
class="link-left"
style="display: inline;"
@@ -19,7 +19,7 @@
:with-credentials="true"
:on-success="importSuccess"
:show-file-list="false">
- <el-button type="success">瀵煎叆</el-button>
+ <el-button type="success" size="small">瀵煎叆</el-button>
</el-upload>
</el-form-item>
</el-form>
--
Gitblit v1.8.0