Commit 3838ac17 authored by 张伯涛's avatar 张伯涛

密码明文传输问题,以及用户页面代码规范

parent b2018c16
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</template> </template>
<script> <script>
import { getCodeImg, captchaImage, getBwCaptcha } from '@/api/login' import { captchaImage } from '@/api/login'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import { passwordEncrypt, passwordDecrypt } from '@/utils/jsencrypt' import { passwordEncrypt, passwordDecrypt } from '@/utils/jsencrypt'
import Verify from '@/components/Verifition/Verify' import Verify from '@/components/Verifition/Verify'
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
{{ scope.row.username || '-' }} {{ scope.row.username || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户姓名" prop="userType" :show-overflow-tooltip="true"> <el-table-column label="用户姓名" prop="name" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.name || '-' }} {{ scope.row.name || '-' }}
</template> </template>
...@@ -270,33 +270,14 @@ ...@@ -270,33 +270,14 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<el-form-item label="昵称:" prop="nickName">
<el-input v-model="form.nickName" maxlength="50" placeholder="请输入用户昵称" />
</el-form-item>
</el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item v-if="form.businessId == undefined" label="密码:" prop="passwordShow"> <el-form-item v-if="form.businessId == undefined" label="密码:" prop="password">
<el-input v-model="form.passwordShow" placeholder="请输入密码" /> <el-input v-model="form.password" placeholder="请输入密码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row v-if="form.identity !== '1'">-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="所属单位:" prop="deptId">-->
<!-- <el-select v-model="form.deptId" filterable placeholder="所属单位" style="width: 100%">-->
<!-- <el-option-->
<!-- v-for="(item,index) in deptList"-->
<!-- :key="index"-->
<!-- :label="item.unitName"-->
<!-- :value="item.businessId"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="系统角色:" prop="roleList"> <el-form-item label="系统角色:" prop="roleList">
...@@ -426,11 +407,10 @@ import { ...@@ -426,11 +407,10 @@ import {
changeUserStatus, changeUserStatus,
importExcel, importExcel,
uploadFalseFile, uploadFalseFile,
importTemplate, listUserWeb importTemplate
// userLoginManage
} from '@/api/system/user' } from '@/api/system/user'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { listAllDept, treeSelect } from '@/api/system/dept' import { treeSelect } from '@/api/system/dept'
import TreeSelect from '@riophae/vue-treeselect' import TreeSelect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { getListRole, getListRoleOld } from '@/api/system/role' import { getListRole, getListRoleOld } from '@/api/system/role'
...@@ -558,15 +538,14 @@ export default { ...@@ -558,15 +538,14 @@ export default {
deptChildren: [], deptChildren: [],
// 表单参数 // 表单参数
form: { form: {
deptId: null, identity: '',
username: '', username: '',
phone: '',
email: '',
idNumber: '',
name: '',
flag: 1, flag: 1,
passwordShow: '', name: '',
phone: '',
password: '', password: '',
roleList: [],
remarks: ''
}, },
defaultProps: { defaultProps: {
children: 'children', children: 'children',
...@@ -602,7 +581,6 @@ export default { ...@@ -602,7 +581,6 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
identity: [{ required: true, message: '请选择用户类型', trigger: 'blur' }], identity: [{ required: true, message: '请选择用户类型', trigger: 'blur' }],
deptId: [{ required: true, message: '请选择所属单位', trigger: 'change' }],
roleList: [{ required: true, message: '请选择角色', trigger: 'change' }], roleList: [{ required: true, message: '请选择角色', trigger: 'change' }],
username: [ username: [
{ required: true, message: '请输入登录名', trigger: 'blur' }, { required: true, message: '请输入登录名', trigger: 'blur' },
...@@ -613,7 +591,7 @@ export default { ...@@ -613,7 +591,7 @@ export default {
{ required: false, message: '请输入用户昵称', trigger: 'blur' }, { required: false, message: '请输入用户昵称', trigger: 'blur' },
{ validator: trueGroupName, message: '请输入正确的用户昵称' } { validator: trueGroupName, message: '请输入正确的用户昵称' }
], ],
passwordShow: [ password: [
{ required: true, message: '请输入用户密码', trigger: 'blur' }, { required: true, message: '请输入用户密码', trigger: 'blur' },
{ min: 8, max: 20, message: '长度在 8 到 20 个字符', trigger: 'blur' }, { min: 8, max: 20, message: '长度在 8 到 20 个字符', trigger: 'blur' },
{ {
...@@ -625,14 +603,6 @@ export default { ...@@ -625,14 +603,6 @@ export default {
// 用户姓名不能为空 // 用户姓名不能为空
{ required: true, message: '请输入用户姓名', trigger: 'blur' } { required: true, message: '请输入用户姓名', trigger: 'blur' }
], ],
email: [
{ required: false, message: '请输入邮箱地址', trigger: 'blur' },
{
type: 'email',
message: '请输入正确的邮箱地址',
trigger: ['blur', 'change']
}
],
newPassword: [ newPassword: [
{ required: true, message: '请输入密码', trigger: 'blur' }, { required: true, message: '请输入密码', trigger: 'blur' },
{ min: 8, max: 20, message: '长度在 8 到 20 个字符', trigger: 'blur' }, { min: 8, max: 20, message: '长度在 8 到 20 个字符', trigger: 'blur' },
...@@ -646,11 +616,6 @@ export default { ...@@ -646,11 +616,6 @@ export default {
trigger: 'blur' trigger: 'blur'
} }
// { validator: phone, trigger: 'blur' } // { validator: phone, trigger: 'blur' }
],
idNumber: [
{ require: false, message: '请输入身份证号', trigger: 'blur' },
{ min: 18, max: 18, message: '长度18字符', trigger: 'blur' }
// { validator: idNumber, trigger: 'blur' }
] ]
}, },
userInfoLoading: false, userInfoLoading: false,
...@@ -680,7 +645,6 @@ export default { ...@@ -680,7 +645,6 @@ export default {
this.queryParams = JSON.parse(getDataCache(this.$route.path)) // 获取存储的筛选项 this.queryParams = JSON.parse(getDataCache(this.$route.path)) // 获取存储的筛选项
this.getList() // 列表查询 this.getList() // 列表查询
this.getDeptList() this.getDeptList()
this.getTreeSelect() // 查询部门下拉树结构
this.getRole() // 查询角色下拉 this.getRole() // 查询角色下拉
this.getRoleNew() // 查询角色下拉 this.getRoleNew() // 查询角色下拉
// this.getConfigKey('sys.user.initPassword').then(response => { // this.getConfigKey('sys.user.initPassword').then(response => {
...@@ -755,26 +719,6 @@ export default { ...@@ -755,26 +719,6 @@ export default {
// TODO: clear this log // TODO: clear this log
this.$forceUpdate() this.$forceUpdate()
}, },
/** 查询部门下拉树结构 */
getTreeSelect() {
treeSelect().then(response => {
this.deptOptionsTree = response.data.concat({
id: -1,
label: '无部门人员',
children: undefined
})
if (response.data && response.data.length > 0) {
this.deptOptions = response.data[0].children
}
})
},
/** 查询子部门 */
getChildrenDept(userId) {
treeSelect().then(response => {
this.deptChildren = response.data
// this.form.postId = response.data.checkedKeys
})
},
/** 查询角色下拉*/ /** 查询角色下拉*/
getRole() { getRole() {
getListRoleOld().then( getListRoleOld().then(
...@@ -796,21 +740,6 @@ export default { ...@@ -796,21 +740,6 @@ export default {
if (!value) return true if (!value) return true
return data.label.indexOf(value) !== -1 return data.label.indexOf(value) !== -1
}, },
// 节点单击事件
handleNodeClick(data) {
// TODO: clear this log
// TODO: clear this log
this.queryParams.deptId = data.id
this.getList()
},
// 点击部门空白处
clickBlank() {
this.queryParams.deptId = undefined
this.getList()
},
handleClick(data) {
// this.form.deptId = data.id
},
// 用户状态修改 // 用户状态修改
handleStatusChange(row) { handleStatusChange(row) {
const text = row.flag === '1' ? '启用' : '停用' const text = row.flag === '1' ? '启用' : '停用'
...@@ -838,20 +767,14 @@ export default { ...@@ -838,20 +767,14 @@ export default {
reset() { reset() {
this.form = { this.form = {
userId: '', userId: '',
deptId: null, identity: '',
phone: '',
username: '', username: '',
userType: '',
nickName: '',
passwordShow: '',
password: '',
idNumber: '',
email: '',
sex: '',
flag: 1, flag: 1,
remark: '', name: '',
postIds: [], phone: '',
roleIds: [] password: '',
roleList: [],
remarks: ''
} }
this.resetForm('form') this.resetForm('form')
}, },
...@@ -888,7 +811,6 @@ export default { ...@@ -888,7 +811,6 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset() this.reset()
this.getChildrenDept(0)
this.form.identity = '2' this.form.identity = '2'
this.options.forEach(item => { this.options.forEach(item => {
if (item.roleName === '单位管理员') { if (item.roleName === '单位管理员') {
...@@ -913,10 +835,8 @@ export default { ...@@ -913,10 +835,8 @@ export default {
const id = Number(item) const id = Number(item)
this.form.roleList.push(id) this.form.roleList.push(id)
}) })
// this.form.postId = response.data.deptId
this.title = '修改用户' this.title = '修改用户'
}) })
this.getChildrenDept(userId)
}, },
/** 重置密码按钮操作 */ /** 重置密码按钮操作 */
handleResetPwd(row) { handleResetPwd(row) {
...@@ -929,7 +849,7 @@ export default { ...@@ -929,7 +849,7 @@ export default {
this.$refs.ruleForm.validate(pass => { this.$refs.ruleForm.validate(pass => {
if (pass) { if (pass) {
this.userRestLoading = true this.userRestLoading = true
resetUserPwd(this.ruleForm.row, encrypt(this.ruleForm.newPassword) ).then(response => { resetUserPwd(this.ruleForm.row, encrypt(this.ruleForm.newPassword)).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.$message({ this.$message({
message: '修改成功', message: '修改成功',
...@@ -949,8 +869,17 @@ export default { ...@@ -949,8 +869,17 @@ export default {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.businessId !== undefined) { if (this.form.businessId !== undefined) {
this.form.password = encrypt(this.form.passwordShow) const params = {
updateUser(this.form).then(response => { businessId: this.form.businessId,
identity: this.form.identity,
username: this.form.username,
flag: 1,
name: this.form.name,
phone: this.form.phone,
roleList: this.form.roleList,
remarks: this.form.remarks
}
updateUser(params).then(response => {
this.$message({ this.$message({
message: '修改成功', message: '修改成功',
type: 'success' type: 'success'
...@@ -958,67 +887,24 @@ export default { ...@@ -958,67 +887,24 @@ export default {
this.open = false this.open = false
this.getList() this.getList()
}) })
// 获取单位信息
getSysUnit(this.form.deptId).then(res => {
var u = res.data
var unit = {
remarks: u.remarks,
createBy: u.createBy,
createDate: u.createDate,
updateBy: u.updateBy,
updateDate: u.updateDate,
delFlag: u.delFlag,
flag: u.flag,
businessId: u.businessId,
unitType: u.unitType,
unitName: u.unitName,
username: this.form.username,
userId: this.form.businessId,
exitId: u.exitId,
creteName: u.creteName,
updateName: u.updateName
}
console.log('unit', unit)
updateSysUnit(unit).then(r => {
if (r.code === 200) {
console.log('chengg')
}
})
})
} else { } else {
this.form.password = encrypt(this.form.passwordShow) const paramsAdd = {
addUser(this.form).then(response => { identity: this.form.identity,
username: this.form.username,
flag: 1,
name: this.form.name,
phone: this.form.phone,
password: encrypt(this.form.password),
roleList: this.form.roleList,
remarks: this.form.remarks
}
addUser(paramsAdd).then(response => {
this.newId = response.data.businessId this.newId = response.data.businessId
this.$message({ this.$message({
message: '新增成功', type: 'success' message: '新增成功', type: 'success'
}) })
this.open = false this.open = false
// 获取单位信息
getSysUnit(this.form.deptId).then(res => {
var u = res.data
var unit = {
remarks: u.remarks,
createBy: u.createBy,
createDate: u.createDate,
updateBy: u.updateBy,
updateDate: u.updateDate,
delFlag: u.delFlag,
flag: u.flag,
businessId: u.businessId,
unitType: u.unitType,
unitName: u.unitName,
unitNumber: this.form.username,
userId: this.newId,
exitId: u.exitId,
creteName: u.creteName,
updateName: u.updateName
}
updateSysUnit(unit).then(r => {
if (r.code === 200) {
console.log('chengg')
}
})
})
this.getList() this.getList()
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment