修改登录

src/layout/index.vue

@@ -94,36 +94,25 @@ export default {
     const PwdArrs = `${PwdStruc}`.split('')
     this.PwdLengthBegin = PwdLengthBegin
     this.PwdLengthEnd = PwdLengthEnd
-    let [a1, a2, a3, a4] = [...PwdArrs]
-    a1 = Number(a1)
-    a2 = Number(a2)
-    a3 = Number(a3)
-    a4 = Number(a4)
-    if (a1 && a2) {
-      this.PwdMessage = '大写字母、小写字母'
-    } else if (a1 && a2 && a3) {
-      this.PwdMessage = '大写字母、小写字母、特殊字符'
-    } else if (a1 && a2 && a3 && a4) {
-      this.PwdMessage = '大写字母、小写字母、特殊字符、数字'
-    } else if (a1 && a3) {
-      this.PwdMessage = '大写字母、特殊字符'
-    } else if (a1 && a3 && a4) {
-      this.PwdMessage = '大写字母、特殊字符、数字'
-    } else if (a1 && a4) {
-      this.PwdMessage = '大写字母、数字'
-    } else if (a2 && a3) {
-      this.PwdMessage = '小写字母、特殊字符'
-    } else if (a2 && a3 && a4) {
-      this.PwdMessage = '小写字母、特殊字符、数字'
-    } else if (a2 && a4) {
-      this.PwdMessage = '小写字母、数字'
-    } else if (a3 && a4) {
-      this.PwdMessage = '特殊字符、数字'
-    } else {
-      this.PwdMessage = '暂无密码规则'
-    }
+    this.PwdMessage = this.getMessage(PwdArrs)
   },
   methods: {
+    getMessage (datas) {
+      let str = ''
+      if (datas[0] == 1) {
+        str += '大写字母、'
+      }
+      if (datas[1] == 1) {
+        str += '小写字母、'
+      }
+      if (datas[2] == 1) {
+        str += '特殊字符、'
+      }
+      if (datas[3] == 1) {
+        str += '数字'
+      }
+      return str
+    },
     //存储数据项-提交
     addSubmit (formName) {
       this.$refs[formName].validate((valid) => {
@@ -154,9 +143,7 @@ export default {
       sessionStorage.removeItem("tabViews")
       await this.$store.dispatch('app/toggleOutcheck', true)
       this.$store.dispatch('app/toggleOutflag', false)
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        this.$router.push('/login')
-      })
+      this.$store.dispatch('tagsView/delAllViews')
     },
     //修改密码
     async editPwd () {

src/permission.js

@@ -33,12 +33,6 @@ router.beforeEach(async (to, from, next) => {
         try {
           const { roles } = await store.dispatch('user/getInfo')
           const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
-          // if (roles && roles.length) {
-          //   router.addRoutes(accessRoutes)
-          // } else {
-          //   const noRoutes = [accessRoutes[0]]
-          //   router.addRoutes(noRoutes)
-          // }
           router.addRoutes(accessRoutes)
           next({ ...to, replace: true })
         } catch (error) {

src/views/login/index.vue

@@ -159,11 +159,12 @@ export default {
                       arrs.push('dashboard'); //进入首页手动添加权限
                       setToken('userAuthList', arrs);
                       this.$store.dispatch('user/setPowerList', arrs);
+                      this.$router.push({ path: this.redirect || "/" });
                     } else {
                       setToken('userAuthList', []);
                       this.$store.dispatch('user/setPowerList', []);
+                      this.$router.push('/');
                     }
-                    this.$router.push({ path: this.redirect || "/" });
                   } else {
                     this.loading = false;
                     this.$store.dispatch("user/logout");

src/views/noPower/index.vue

@@ -91,36 +91,25 @@ export default {
     const PwdArrs = `${PwdStruc}`.split('')
     this.PwdLengthBegin = PwdLengthBegin
     this.PwdLengthEnd = PwdLengthEnd
-    let [a1, a2, a3, a4] = [...PwdArrs]
-    a1 = Number(a1)
-    a2 = Number(a2)
-    a3 = Number(a3)
-    a4 = Number(a4)
-    if (a1 && a2) {
-      this.PwdMessage = '大写字母、小写字母'
-    } else if (a1 && a2 && a3) {
-      this.PwdMessage = '大写字母、小写字母、特殊字符'
-    } else if (a1 && a2 && a3 && a4) {
-      this.PwdMessage = '大写字母、小写字母、特殊字符、数字'
-    } else if (a1 && a3) {
-      this.PwdMessage = '大写字母、特殊字符'
-    } else if (a1 && a3 && a4) {
-      this.PwdMessage = '大写字母、特殊字符、数字'
-    } else if (a1 && a4) {
-      this.PwdMessage = '大写字母、数字'
-    } else if (a2 && a3) {
-      this.PwdMessage = '小写字母、特殊字符'
-    } else if (a2 && a3 && a4) {
-      this.PwdMessage = '小写字母、特殊字符、数字'
-    } else if (a2 && a4) {
-      this.PwdMessage = '小写字母、数字'
-    } else if (a3 && a4) {
-      this.PwdMessage = '特殊字符、数字'
-    } else {
-      this.PwdMessage = '暂无密码规则'
-    }
+    this.PwdMessage = this.getMessage(PwdArrs)
   },
   methods: {
+    getMessage (datas) {
+      let str = ''
+      if (datas[0] == 1) {
+        str += '大写字母、'
+      }
+      if (datas[1] == 1) {
+        str += '小写字母、'
+      }
+      if (datas[2] == 1) {
+        str += '特殊字符、'
+      }
+      if (datas[3] == 1) {
+        str += '数字'
+      }
+      return str
+    },
     //存储数据项-提交
     addSubmit (formName) {
       this.$refs[formName].validate((valid) => {
@@ -148,9 +137,10 @@ export default {
     //退出系统-确定
     async outQd () {
       sessionStorage.removeItem("userName")
+      sessionStorage.removeItem("tabViews")
+      await this.$store.dispatch('app/toggleOutcheck', true)
       this.$store.dispatch('app/toggleOutflag', false)
-      await this.$store.dispatch("user/logout");
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`);
+      this.$store.dispatch('tagsView/delAllViews')
     },
     //修改密码
     async editPwd () {
@@ -190,6 +180,25 @@ export default {
     position: fixed;
     top: 0;
   }
+  ::v-deep .dialog {
+    .dataStoreInfoDialog {
+      .el-form-item__label {
+        font-size: 16px;
+        font-weight: bold;
+        &::before {
+          display: none;
+        }
+      }
+      .message {
+        position: absolute;
+        top: 85px;
+        .mg {
+          margin-right: 8px;
+          color: #e6a23c;
+        }
+      }
+    }
+  }
 }
 .drawer-bg {
   background: #000;