Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web

# Conflicts:
#	src/views/Login/components/LoginForm.vue

src/permission.ts

@@ -59,6 +59,7 @@ const whiteList = [
 
 // 路由加载前
 router.beforeEach(async (to, from, next) => {
+  debugger
   start()
   loadStart()
   if (getAccessToken()) {

src/views/Login/components/LoginForm.vue

@@ -82,7 +82,6 @@
         mode="pop"
         @success="handleLogin"
       />
-  
     </el-row>
   </el-form>
 </template>
@@ -173,7 +172,6 @@ const getCookie = () => {
   }
 }
 
-
 // 根据域名，获得租户信息
 const getTenantByWebsite = async () => {
   const website = location.host
@@ -188,7 +186,6 @@ const loading = ref() // ElLoading.service 返回的实例
 const handleLogin = async (params) => {
   loginLoading.value = true
   try {
-    
     const data = await validForm()
     if (!data) return
 
@@ -211,7 +208,6 @@ const handleLogin = async (params) => {
     authUtil.setToken(res)
     debugger
     if (!redirect.value) {
-       
       redirect.value = '/'
     }
     // 判断是否为SSO登录
@@ -234,6 +230,7 @@ const handleLogin = async (params) => {
          
 
       
+
     }
   } finally {
     loginLoading.value = false