|
@@ -49,14 +49,14 @@ table{
|
|
<label>年级:</label>
|
|
<label>年级:</label>
|
|
<el-select v-model="search.grade" placeholder="请选择" @change="searchUser">
|
|
<el-select v-model="search.grade" placeholder="请选择" @change="searchUser">
|
|
<el-option
|
|
<el-option
|
|
- v-for="item in options"
|
|
|
|
|
|
+ v-for="item in gradeOptions"
|
|
:key="item.value"
|
|
:key="item.value"
|
|
:label="item.label"
|
|
:label="item.label"
|
|
:value="item.value">
|
|
:value="item.value">
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
<el-button icon="el-icon-search" circle @click="searchUser"></el-button>
|
|
<el-button icon="el-icon-search" circle @click="searchUser"></el-button>
|
|
- <el-button type="primary" class="add-user" @click="dialogVisible = true">新增</el-button>
|
|
|
|
|
|
+ <el-button type="primary" class="add-user" @click="visibleAdd = true">新增</el-button>
|
|
</div>
|
|
</div>
|
|
<table>
|
|
<table>
|
|
<thead>
|
|
<thead>
|
|
@@ -79,7 +79,7 @@ table{
|
|
<td>{{item.region}}</td>
|
|
<td>{{item.region}}</td>
|
|
<td>{{gradeMap[item.grade]}}</td>
|
|
<td>{{gradeMap[item.grade]}}</td>
|
|
<td>
|
|
<td>
|
|
- <a @click="passChange = true;changeUser.id = item.id">修改密码</a>
|
|
|
|
|
|
+ <a @click="visibleChange = true;changeUser.id = item.id">修改密码</a>
|
|
|
|
|
|
<a @click="visibleDelete = true;deleteId = item.id">删除</a>
|
|
<a @click="visibleDelete = true;deleteId = item.id">删除</a>
|
|
</td>
|
|
</td>
|
|
@@ -89,7 +89,7 @@ table{
|
|
<el-dialog
|
|
<el-dialog
|
|
class="dialog-style"
|
|
class="dialog-style"
|
|
title="编辑"
|
|
title="编辑"
|
|
- :visible.sync="dialogVisible"
|
|
|
|
|
|
+ :visible.sync="visibleAdd"
|
|
width="500px">
|
|
width="500px">
|
|
<div>
|
|
<div>
|
|
<label>姓名:</label>
|
|
<label>姓名:</label>
|
|
@@ -99,7 +99,7 @@ table{
|
|
<label>年级:</label>
|
|
<label>年级:</label>
|
|
<el-select v-model="user.grade" placeholder="请选择">
|
|
<el-select v-model="user.grade" placeholder="请选择">
|
|
<el-option
|
|
<el-option
|
|
- v-for="item in options"
|
|
|
|
|
|
+ v-for="item in gradeOptions"
|
|
:key="item.value"
|
|
:key="item.value"
|
|
:label="item.label"
|
|
:label="item.label"
|
|
:value="item.value">
|
|
:value="item.value">
|
|
@@ -116,7 +116,7 @@ table{
|
|
</div>
|
|
</div>
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
<el-button type="primary" @click="addUser">确 定</el-button>
|
|
<el-button type="primary" @click="addUser">确 定</el-button>
|
|
- <el-button type="primary" @click="dialogVisible = false">取消</el-button>
|
|
|
|
|
|
+ <el-button type="primary" @click="visibleAdd = false">取消</el-button>
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
<el-dialog
|
|
<el-dialog
|
|
@@ -132,7 +132,7 @@ table{
|
|
<el-dialog
|
|
<el-dialog
|
|
class="dialog-style"
|
|
class="dialog-style"
|
|
title="修改密码"
|
|
title="修改密码"
|
|
- :visible.sync="passChange"
|
|
|
|
|
|
+ :visible.sync="visibleChange"
|
|
width="500px">
|
|
width="500px">
|
|
<div>
|
|
<div>
|
|
<label>旧密码:</label>
|
|
<label>旧密码:</label>
|
|
@@ -143,7 +143,7 @@ table{
|
|
<el-input placeholder="请输入新密码" v-model="changeUser.newPass" show-password required="required"></el-input>
|
|
<el-input placeholder="请输入新密码" v-model="changeUser.newPass" show-password required="required"></el-input>
|
|
</div>
|
|
</div>
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
- <el-button @click="passChange = false">取 消</el-button>
|
|
|
|
|
|
+ <el-button @click="visibleChange = false">取 消</el-button>
|
|
<el-button type="primary" @click="updateUser">确 定</el-button>
|
|
<el-button type="primary" @click="updateUser">确 定</el-button>
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
@@ -152,6 +152,7 @@ table{
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { getUserList,addUser,updateUser,deleteUser } from '@/api/user';
|
|
import { getUserList,addUser,updateUser,deleteUser } from '@/api/user';
|
|
|
|
+import { GRADE_OPTION, GRADE_MAP } from '@/services/constant';
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: 'UserList',
|
|
name: 'UserList',
|
|
@@ -159,52 +160,20 @@ export default {
|
|
},
|
|
},
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
|
|
+ userList:[],
|
|
user:{},
|
|
user:{},
|
|
changeUser:{},
|
|
changeUser:{},
|
|
- userList:[],
|
|
|
|
search:{
|
|
search:{
|
|
name:'',
|
|
name:'',
|
|
grade:'',
|
|
grade:'',
|
|
},
|
|
},
|
|
deleteId: -1,
|
|
deleteId: -1,
|
|
- options: [{
|
|
|
|
- value: '6X',
|
|
|
|
- label: '六年级上'
|
|
|
|
- }, {
|
|
|
|
- value: '6Y',
|
|
|
|
- label: '六年级下'
|
|
|
|
- }, {
|
|
|
|
- value: '7X',
|
|
|
|
- label: '初一上'
|
|
|
|
- }, {
|
|
|
|
- value: '7Y',
|
|
|
|
- label: '初一下'
|
|
|
|
- }, {
|
|
|
|
- value: '8X',
|
|
|
|
- label: '初二上'
|
|
|
|
- }, {
|
|
|
|
- value: '8Y',
|
|
|
|
- label: '初二下'
|
|
|
|
- }, {
|
|
|
|
- value: '9X',
|
|
|
|
- label: '初三上'
|
|
|
|
- }, {
|
|
|
|
- value: '9Y',
|
|
|
|
- label: '初三下'
|
|
|
|
- }],
|
|
|
|
- gradeMap:{
|
|
|
|
- '6X':'六年级上',
|
|
|
|
- '6Y':'六年级下',
|
|
|
|
- '7X':'初一上',
|
|
|
|
- '7Y':'初一下',
|
|
|
|
- '8X':'初二上',
|
|
|
|
- '8Y':'初二下',
|
|
|
|
- '9X':'初三上',
|
|
|
|
- '9Y':'初三下',
|
|
|
|
- },
|
|
|
|
- dialogVisible:false,
|
|
|
|
|
|
+ gradeOptions: GRADE_OPTION,
|
|
|
|
+ gradeMap: GRADE_MAP,
|
|
|
|
+
|
|
|
|
+ visibleAdd:false,
|
|
visibleDelete:false,
|
|
visibleDelete:false,
|
|
- passChange:false,
|
|
|
|
|
|
+ visibleChange:false,
|
|
}
|
|
}
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
@@ -219,14 +188,14 @@ export default {
|
|
addUser(){
|
|
addUser(){
|
|
addUser(this.user).then((result) => {
|
|
addUser(this.user).then((result) => {
|
|
alert(result.message);
|
|
alert(result.message);
|
|
- this.dialogVisible = false
|
|
|
|
|
|
+ this.visibleAdd = false
|
|
this.searchUser();
|
|
this.searchUser();
|
|
})
|
|
})
|
|
},
|
|
},
|
|
updateUser(){
|
|
updateUser(){
|
|
updateUser(this.changeUser).then((result) => {
|
|
updateUser(this.changeUser).then((result) => {
|
|
alert(result.message);
|
|
alert(result.message);
|
|
- this.passChange = false
|
|
|
|
|
|
+ this.visibleChange = false
|
|
this.searchUser();
|
|
this.searchUser();
|
|
})
|
|
})
|
|
},
|
|
},
|