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

Kxc0822a

2022-03-22 c13724cfd477e6bc55bbf6142e23b0fd574bda1e

 src/views/login/index.vue

@@ -1,7 +1,7 @@
<template>
    <div class="login-container">
        <div class="title-one">
            <span>拜城县众泰煤焦化有限公司</span>
            <span>拜城县众泰煤焦化有限公司1</span>
        </div>
        <div class="title-two">
            <span>智能化安全管理技术平台</span>
@@ -95,6 +95,7 @@
                        const res = response.data
                        if (res.code == 200) {
                            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) {