用户密码修改

@@ -27,7 +27,7 @@
                         <span>{{sysUserName}}</span>
                         <span>{{sysUserName}}</span>
                     </el-form-item>
                     </el-form-item>
                     <el-form-item label="新密码" prop="newpwd">
                     <el-form-item label="新密码" prop="newpwd">
-                        <el-input type="password" v-model="resetForm.newpwd" auto-complete="off"></el-input>
+                        <el-input type="password" v-model="resetForm.newpwd" autocomplete="off" placeholder="8-20位字符在数字、小写、大写字母以及特殊字符中四选三"></el-input>
                     </el-form-item>
                     </el-form-item>
                     <el-form-item label="确认密码" prop="renewpwd">
                     <el-form-item label="确认密码" prop="renewpwd">
                         <el-input type="password" v-model="resetForm.renewpwd" auto-complete="off"></el-input>
                         <el-input type="password" v-model="resetForm.renewpwd" auto-complete="off"></el-input>
@@ -105,12 +105,36 @@
             var validatePass = (rule, value, callback) => {
             var validatePass = (rule, value, callback) => {
                 if (!value) {
                 if (!value) {
                     callback(new Error('请输入新密码'));
                     callback(new Error('请输入新密码'));
-                } else if (value.toString().length < 6 || value.toString().length > 18) {
-                    callback(new Error('密码长度为6 - 18个字符'))
-                } else {
+                }else {
+                    var ls=0;
+                 if(value.match(/([a-z])+/)){
+                        ls++;
+                    } if(value.match(/([0-9])+/)){
+                        ls++;
+                    } if(value.match(/([A-Z])+/)){
+                        ls++;
+                    } if((/([\W])+/) && !value.match(/(![\u4E00-\u9FA5])+/)){
+                        ls++;
+                    }  if (value.toString().length < 8 || value.toString().length > 20) {
+                        callback(new Error('密码长度为8 - 20个字符'));
+                        ls=0;
+                    } if(value.match(/([\u4E00-\u9FA5])+/)){
+                        callback(new Error('不能包含中文字符'));
+                        ls=0;
+                    }
+                    switch (ls) {
+                        case 0: this.passwordPercent = 0;callback(new Error('数字、小写字母、大写字母以及特殊字符中四选三'));break;
+                        case 1: this.passwordPercent = 33;callback(new Error('数字、小写字母、大写字母以及特殊字符中四选三'));break;
+                        case 2: this.passwordPercent = 66;callback(new Error('数字、小写字母 、大写字母以及特殊字符中四选三'));break;
+                        case 3:
+                        case 4: this.passwordPercent = 100;break;
+                        default: this.passwordPercent = 0;break;
+                    }
                     callback();
                     callback();
                 }
                 }
+
             };
             };
+
             var validatePass2 = (rule, value, callback) => {
             var validatePass2 = (rule, value, callback) => {
                 if (value === '') {
                 if (value === '') {
                     callback(new Error('请再次输入密码'));
                     callback(new Error('请再次输入密码'));
@@ -243,6 +267,7 @@
             if (user) {
             if (user) {
                 user = JSON.parse(user);
                 user = JSON.parse(user);
                 this.sysUserName = user.username || '';
                 this.sysUserName = user.username || '';
+                this.sysUserId=user.userId||'';
                 this.sysUserAvatar = user.userface || '/static/images/faceDefault.jpg';
                 this.sysUserAvatar = user.userface || '/static/images/faceDefault.jpg';
             }
             }
             //操作路由,判断本地存储的用户栏目列表是否存在，如果存在则加载路由
             //操作路由,判断本地存储的用户栏目列表是否存在，如果存在则加载路由