代码改造完成,加入多字典查询方式

This commit is contained in:
zhengjie
2019-06-29 12:32:52 +08:00
parent 1b757d6972
commit 9ca7d4b05f
56 changed files with 771 additions and 1467 deletions

View File

@@ -1,55 +0,0 @@
<template>
<div>
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="description" label="行为"/>
<el-table-column prop="requestIp" label="IP"/>
<el-table-column prop="time" label="请求耗时" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
<el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
<el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建日期" width="180px">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<el-pagination
:total="total"
:current-page="page + 1"
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
</div>
</template>
<script>
import initData from '@/mixins/initData'
import { parseTime } from '@/utils/index'
export default {
mixins: [initData],
created() {
this.$nextTick(() => {
this.init()
})
},
methods: {
parseTime,
beforeInit() {
this.url = 'api/logs/user'
const sort = 'id,desc'
this.params = { page: this.page, size: this.size, sort: sort }
return true
}
}
}
</script>
<style scoped>
</style>

View File

@@ -1,6 +1,6 @@
<template>
<div style="display: inline-block;">
<el-dialog :visible.sync="dialog" :title="title" append-to-body width="475px" @close="cancel">
<el-dialog :visible.sync="dialog" :close-on-click-modal="false" :title="title" append-to-body width="475px" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
<el-form-item label="新邮箱" prop="email">
<el-input v-model="form.email" auto-complete="on" style="width: 200px;"/>
@@ -24,7 +24,7 @@
<script>
import store from '@/store'
import { validatEmail } from '@/utils/validate'
import { validPass, updateEmail } from '@/api/user'
import { updateEmail } from '@/api/user'
import { resetEmail } from '@/api/code'
export default {
props: {
@@ -34,19 +34,6 @@ export default {
}
},
data() {
const validatePass = (rule, value, callback) => {
if (value === '' || value === null) {
callback(new Error('密码不能为空'))
} else {
validPass(value).then(res => {
if (res.status === 200) {
callback()
} else {
callback(new Error('密码错误,请重新输入'))
}
})
}
}
const validMail = (rule, value, callback) => {
if (value === '' || value === null) {
callback(new Error('新邮箱不能为空'))
@@ -65,7 +52,7 @@ export default {
buttonName: '获取验证码', isDisabled: false, time: 60,
rules: {
pass: [
{ required: true, validator: validatePass, trigger: 'blur' }
{ required: true, message: '当前密码不能为空', trigger: 'blur' }
],
email: [
{ required: true, validator: validMail, trigger: 'blur' }

View File

@@ -1,6 +1,6 @@
<template>
<div style="display: inline-block">
<el-dialog :visible.sync="dialog" :title="title" append-to-body width="500px" @close="cancel">
<el-dialog :visible.sync="dialog" :close-on-click-modal="false" :title="title" append-to-body width="500px" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
<el-form-item label="旧密码" prop="oldPass">
<el-input v-model="form.oldPass" type="password" auto-complete="on" style="width: 370px;"/>
@@ -22,34 +22,25 @@
<script>
import store from '@/store'
import { validPass, updatePass } from '@/api/user'
import { updatePass } from '@/api/user'
export default {
data() {
const validatePass = (rule, value, callback) => {
if (value) {
validPass(value).then(res => {
if (res.status === 200) {
callback()
} else {
callback(new Error('旧密码错误,请检查'))
}
})
} else {
callback(new Error('请输入旧密码'))
}
}
const confirmPass = (rule, value, callback) => {
if (this.form.newPass !== value) {
callback(new Error('两次输入的密码不一致'))
if (value) {
if (this.form.newPass !== value) {
callback(new Error('两次输入的密码不一致'))
} else {
callback()
}
} else {
callback()
callback(new Error('请再次输入密码'))
}
}
return {
loading: false, dialog: false, title: '修改密码', form: { oldPass: '', newPass: '', confirmPass: '' },
rules: {
oldPass: [
{ required: true, validator: validatePass, trigger: 'blur' }
{ required: true, message: '请输入旧密码', trigger: 'blur' }
],
newPass: [
{ required: true, message: '请输入新密码', trigger: 'blur' },