src/views/layout/components/Header/updatePassword/index.vue
@@ -2,16 +2,16 @@ <div class="createUser"> <main> <div class="mainContent"> <el-form ref="password" label-width="140px" :rules="passwordRules" autoComplete="on" :model="password" <el-form ref="password" label-width="120px" :rules="passwordRules" autoComplete="on" :model="password" label-position="right"> <el-form-item class="optionItem" label="当前密码:" prop="oldPassword"> <el-input type="password" v-model="password.oldPassword" placeholder="请填写当前密码"></el-input> <el-form-item class="optionItem" label="当前密码:" prop="oldPassword" show-password> <el-input type="password" v-model="password.oldPassword" placeholder="请填写当前密码" show-password> </el-input> </el-form-item> <el-form-item class="optionItems" label="新密码:" prop="newPassword"> <el-input type="password" v-model="password.newPassword" placeholder="请填写新密码"></el-input> <el-form-item class="optionItems" label="新密码:" prop="newPassword" show-password> <el-input type="password" v-model="password.newPassword" placeholder="请填写新密码" show-password></el-input> </el-form-item> <el-form-item class="optionItems" label="确定新密码:" prop="confirmPassword"> <el-input type="password" v-model="password.confirmPassword" placeholder="请再次填写新密码"></el-input> <el-input type="password" v-model="password.confirmPassword" placeholder="请再次填写新密码" show-password></el-input> </el-form-item> <el-form-item class="optionItems"> <el-button type="primary" @click="onSubmit">提交</el-button> @@ -27,19 +27,11 @@ export default { data() { const validatePass = (rule, value, callback) => { if (!value) { callback(new Error("用户密码不能为空")); } else { if (value.length < 6 || value.length > 16) { callback(new Error("用户密码长度不合法")); } else { const rep = /^\w+$/; var rep =/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$/; if (!rep.test(value)) { callback(new Error("密码只能是以数字、26个英文字母或者下划线组成的字符串")); callback(new Error("密码长度8到16位且密码中的字符必须包含字母大写和字母小写和必须包含数字，不能包含空格")); } else { callback(); } } } }; return { @@ -55,12 +47,12 @@ }, passwordRules: { newPassword: [ {required: true, trigger: 'blur', message: '密码不能为空'}, { required: true, trigger: 'blur', message: '新密码不能为空' }, {validator: validatePass, trigger: 'blur'} ], oldPassword: [ {required: true, trigger: 'blur', message: '新密码不能为空'}, {validator: validatePass, trigger: 'blur'} { required: true, trigger: 'blur', message: '当前密码不能为空' }, // { validator: validatePass, trigger: 'blur' } ], confirmPassword: [ {required: true, trigger: 'blur', message: '新密码不能为空'}, @@ -161,5 +153,10 @@ background-color: #09152f; border: 1px solid #17324c; } ::v-deep .el-form-item__error { position:unset; } } </style> src/views/systemSetting/baseSetting/user/components/createUser/index.vue
@@ -189,13 +189,9 @@ }; const validatePass = (rule, value, callback) => { //必须包含字母、数字、长度再6-16位之间 var regex = new RegExp("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$"); if (value === "") { callback(new Error("用户密码不能为空")); } else if (value.length < 6 || value.length > 16) { callback(new Error("请输⼊6~16位密码")); } else if (!regex.test(value)) { callback(new Error("密码只能是以数字、26个英文字母组成的字符串")); var rep =/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$/; if (!rep.test(value) ) { callback(new Error("密码长度8到16位且密码中的字符必须包含字母大写和字母小写和必须包含数字，不能包含空格")); } else { callback(); } src/views/systemSetting/baseSetting/user/components/password/index.vue
@@ -3,15 +3,15 @@ <el-form ref="pwd" label-width="140px" autoComplete="on" :model="user" :rules="passrules"> <!-- 初始密码 --> <el-form-item class="optionItem" label="初始密码:" prop="password"> <el-input v-model="user.password" type="password" placeholder="请填写初始密码"></el-input> <el-input v-model="user.password" type="password" placeholder="请填写初始密码" show-password></el-input> </el-form-item> <!-- 新密码 --> <el-form-item class="optionItem" label="新密码:" prop="newPwd"> <el-input v-model="user.newPwd" type="password" placeholder="请填写新密码"></el-input> <el-input v-model="user.newPwd" type="password" placeholder="请填写新密码" show-password></el-input> </el-form-item> <!-- 新密码 --> <el-form-item class="optionItem" label="确认新密码:" prop="secondPwd"> <el-input v-model="user.secondPwd" type="password" placeholder="确认您的新密码"></el-input> <el-input v-model="user.secondPwd" type="password" placeholder="确认您的新密码" show-password></el-input> </el-form-item> </el-form> @@ -32,22 +32,19 @@ } } const checkNewPwd = (rule, value, callback) => { if (!value) { callback(new Error('新密码不能为空')) } else if (value === this.user.password) { callback(new Error('新密码不能和旧密码一样')) var rep =/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$/; if (!rep.test(value) ) { callback(new Error("密码长度8到16位且密码中的字符必须包含字母大写和字母小写和必须包含数字，不能包含空格")); } else { callback(); } } const checkSame = (rule, value, callback) => { if (!value) { callback(new Error('确认密码不能为空')) } else if (value !== this.user.newPwd) { console.log(111); callback(new Error('您输入的两次密码结果不同')); } else { }; const checkSame = (rule, value, callback) => { var rep =/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$/; if (!rep.test(value) ) { callback(new Error("密码长度8到16位且密码中的字符必须包含字母大写和字母小写和必须包含数字，不能包含空格")); } else { callback(); } } src/views/systemSetting/platform/cockpitManage/index.vue
@@ -110,7 +110,7 @@ </el-dialog> <div class="tools"> <div class="funs"> <!-- <div class="funs"> <div class="funsItem funs-sp"> <el-checkbox v-model="all" @change="selectAll()">全选</el-checkbox> </div> @@ -124,7 +124,7 @@ </el-option> </el-select> </div> </div> </div> --> <div class="pagination"> <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
