Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web

guanqb

2022-08-31 b8ef6f8946de7dc00d9711eb6ba9d1aefe24cde1

 src/page/login/userlogin.vue

@@ -72,8 +72,9 @@
<script>
  import {mapGetters} from "vuex";
  import {info} from "@/api/system/tenant";
  import {getCaptcha} from "@/api/user";
  import {getCaptcha, loginInfoByToken} from "@/api/user";
  import {getTopUrl} from "@/util/util";
  import {Message} from "element-ui";

  export default {
    name: "userlogin",
@@ -170,6 +171,11 @@
      this.refreshCode();
    },
    mounted() {
      //统一登录有没有登录
      const token = window.sessionStorage.getItem('token')
      if (token) {
        this.loginInfoByToken();
      }
    },
    watch: {
      'loginForm.deptId'() {
@@ -263,6 +269,21 @@
            this.$parent.$refs.login.style.backgroundImage = `url(${data.data.backgroundUrl})`;
          }
        })
      },
      // 统一登陆获取用户
      loginInfoByToken() {
        const loading = this.$loading({
          lock: true,
          text: '登录中,请稍后。。。',
          spinner: "el-icon-loading"
        });
        this.$store.dispatch("loginInfoByToken").then(() => {
          this.$router.push({path: this.tagWel.value});
          loading.close();
        }).catch(() => {
          loading.close();
          this.refreshCode();
        });
      }
    }
  };