admin/gr_report_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

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

Browse Source 
# Conflicts:
#	src/views/Login/components/LoginForm.vue
This commit is contained in:
mll
2026-03-07 00:25:34 +08:00
parent 0caec67d4a 2c848827b3
commit 31df51dcc6
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/permission.ts
View File

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

5
src/views/Login/components/LoginForm.vue
View File

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