Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-05-24 f15b467c2233ba069459c809fffbe994692e3315

 src/views/login/index.vue

@@ -94,7 +94,12 @@
                    .then((response) => {
                        const res = response.data
                        if (res.code == 200) {
                            sessionStorage.setItem('isdepartment',res.result.isdepartment)
                            sessionStorage.setItem('company',res.result.company)
                            sessionStorage.setItem('department',res.result.department)
                            sessionStorage.setItem('realname',res.result.realname)
                            localStorage.setItem('loginForm',JSON.stringify(loginForm))
                            // this.$store.dispatch('user/getClassifyOne',1)
                            _this.loading = false
                            const data = res.result
                            if (data.type != 1 && data.type != 2) {
@@ -109,14 +114,16 @@
                                    // return
                                }
                            }

                            Cookies.set('token',data.token)
                            _this.$store.commit('SET_ROLES', data.roles)
                            Cookies.set('roles', JSON.stringify(data.roles))
                            setToken(data.token)
                            Cookies.set('loginForm',data)
                            Cookies.set('userName', data.username)
                            Cookies.set('name', data.username)
                            Cookies.set('userId', data.id)
                            Cookies.set('company', data.company)
                            Cookies.set('companyid', data.companyid)
                            let address = '';
                            if (data.city != null && data.city != 'null'){
                                address = data.city
@@ -167,7 +174,7 @@
    .login-container {
        min-height: 100%;
        width: 100%;
        background: url("../../assets/bg_login.png") center no-repeat;
        background: url("../../assets/bg.jpg") center no-repeat;
        //background-size: auto 100%;
        // background-color: #2d3a4b;
        overflow: hidden;