From bcc67be745fd4b1b9a57e0e8cd7c13cab8dfd2fd Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期四, 17 十月 2024 19:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/admin/list.vue | 7 +++----
src/views/user/teacher/list.vue | 7 +++----
src/views/user/student/list.vue | 8 ++++----
src/views/user/admin/edit.vue | 4 ++--
src/views/user/teacher/edit.vue | 4 ++--
src/views/user/student/edit.vue | 6 +++---
6 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/views/user/admin/edit.vue b/src/views/user/admin/edit.vue
index ac6dc9f..495c32c 100644
--- a/src/views/user/admin/edit.vue
+++ b/src/views/user/admin/edit.vue
@@ -11,7 +11,7 @@
<el-form-item label="鐧诲綍璐﹀彿锛�" prop="userName" required>
<el-input v-model="form.userName"></el-input>
</el-form-item>
- <el-form-item label="鐧诲綍瀵嗙爜锛�" prop="password" required>
+ <el-form-item v-if="!form.id" label="鐧诲綍瀵嗙爜锛�" prop="password" required>
<el-input v-model="form.password" show-password></el-input>
</el-form-item>
<el-form-item label="骞撮緞锛�">
@@ -46,7 +46,7 @@
data () {
var validatePassword = (rule, value, callback) => {
if (value === '') {
- callback(new Error('璇疯緭鍏ュ瘑鐮�'))
+ callback(new Error('璇疯緭鍏ョ櫥褰曞瘑鐮�'))
} else if (!/[A-Z]/.test(value)) {
callback(new Error('瀵嗙爜蹇呴』鍖呭惈鑷冲皯涓�涓ぇ鍐欏瓧姣�'))
} else if (!/[a-z]/.test(value)) {
diff --git a/src/views/user/admin/list.vue b/src/views/user/admin/list.vue
index a6482f7..31a6b46 100644
--- a/src/views/user/admin/list.vue
+++ b/src/views/user/admin/list.vue
@@ -1,8 +1,8 @@
<template>
<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-form-item label="鐪熷疄濮撳悕锛�">
+ <el-input v-model="queryParam.realName"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
@@ -13,7 +13,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" />
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" />
<el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
@@ -53,7 +52,7 @@
data () {
return {
queryParam: {
- userName: '',
+ realName: '',
role: 3,
pageIndex: 1,
pageSize: 10
diff --git a/src/views/user/student/edit.vue b/src/views/user/student/edit.vue
index b31d09e..6a94955 100644
--- a/src/views/user/student/edit.vue
+++ b/src/views/user/student/edit.vue
@@ -11,7 +11,7 @@
<el-form-item label="鐧诲綍璐﹀彿锛�" prop="userName" required>
<el-input v-model="form.userName" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item label="鐧诲綍瀵嗙爜锛�" prop="password" v-if="form.id === null" required>
+ <el-form-item v-if="!form.id" label="鐧诲綍瀵嗙爜锛�" prop="password" required>
<el-input v-model="form.password" show-password autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="骞撮緞锛�">
@@ -51,7 +51,7 @@
data () {
var validatePassword = (rule, value, callback) => {
if (value === '') {
- callback(new Error('璇疯緭鍏ュ瘑鐮�'))
+ callback(new Error('璇疯緭鍏ョ櫥褰曞瘑鐮�'))
} else if (!/[A-Z]/.test(value)) {
callback(new Error('瀵嗙爜蹇呴』鍖呭惈鑷冲皯涓�涓ぇ鍐欏瓧姣�'))
} else if (!/[a-z]/.test(value)) {
@@ -90,7 +90,7 @@
formLoading: false,
rules: {
userName: [
- { required: true, message: '璇疯緭鍏ョ敤鎴峰悕', trigger: 'blur' }
+ { required: true, message: '璇疯緭鍏ョ櫥褰曡处鍙�', trigger: 'blur' }
],
realName: [
{ required: true, message: '璇疯緭鍏ョ湡瀹炲鍚�', trigger: 'blur' }
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 2ba9e46..75db484 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -1,15 +1,15 @@
<template>
<div class="app-container">
<el-form :model="queryParam" ref="queryForm" :inline="true">
- <el-form-item label="鐢ㄦ埛鍚嶏細">
- <el-input v-model="queryParam.userName" @input="search"></el-input>
+ <el-form-item label="鐪熷疄濮撳悕锛�">
+ <el-input v-model="queryParam.realName" @input="search"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm" size="small">鏌ヨ</el-button>
<router-link :to="{path:'/user/student/edit'}" class="link-left">
<el-button type="primary" size="small">娣诲姞</el-button>
</router-link>
- <el-button class="link-left" type="danger" @click="exportExcel" size="small">涓嬭浇妯℃澘</el-button>
+ <el-button class="link-left" type="danger" @click="exportExcel" size="small">涓嬭浇瀵煎叆妯℃澘</el-button>
<el-upload
class="link-left"
style="display: inline;"
@@ -74,7 +74,7 @@
data () {
return {
queryParam: {
- userName: '',
+ realName: '',
role: 1,
pageIndex: 1,
pageSize: 10
diff --git a/src/views/user/teacher/edit.vue b/src/views/user/teacher/edit.vue
index e9c9774..2c35d4b 100644
--- a/src/views/user/teacher/edit.vue
+++ b/src/views/user/teacher/edit.vue
@@ -11,7 +11,7 @@
<el-form-item label="鐧诲綍璐﹀彿锛�" prop="userName" required>
<el-input v-model="form.userName"></el-input>
</el-form-item>
- <el-form-item label="鐧诲綍瀵嗙爜锛�" prop="password" required>
+ <el-form-item v-if="!form.id" label="鐧诲綍瀵嗙爜锛�" prop="password" required>
<el-input v-model="form.password" show-password></el-input>
</el-form-item>
<el-form-item label="骞撮緞锛�">
@@ -46,7 +46,7 @@
data () {
var validatePassword = (rule, value, callback) => {
if (value === '') {
- callback(new Error('璇疯緭鍏ュ瘑鐮�'))
+ callback(new Error('璇疯緭鍏ョ櫥褰曞瘑鐮�'))
} else if (!/[A-Z]/.test(value)) {
callback(new Error('瀵嗙爜蹇呴』鍖呭惈鑷冲皯涓�涓ぇ鍐欏瓧姣�'))
} else if (!/[a-z]/.test(value)) {
diff --git a/src/views/user/teacher/list.vue b/src/views/user/teacher/list.vue
index b858e87..71a5c15 100644
--- a/src/views/user/teacher/list.vue
+++ b/src/views/user/teacher/list.vue
@@ -1,8 +1,8 @@
<template>
<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-form-item label="鐪熷疄濮撳悕锛�">
+ <el-input v-model="queryParam.realName"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
@@ -13,7 +13,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" />
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" />
<el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
@@ -53,7 +52,7 @@
data () {
return {
queryParam: {
- userName: '',
+ realName: '',
role: 2,
pageIndex: 1,
pageSize: 10
--
Gitblit v1.8.0