From a2aa94ae99095ec3fb5c463eefca33f89fd25bca Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 05 Mar 2024 08:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/utils/request.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 8797e3f..54e71e4 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -50,7 +50,7 @@
const s_data = sessionObj.data; // 请求数据
const s_time = sessionObj.time; // 请求时间
const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
- if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+ if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url && s_url!=='/attachment/upload/detail') {
const message = '数据正在处理，请勿重复提交';
console.warn(`[${s_url}]: ` + message)
return Promise.reject(new Error(message))
@@ -81,7 +81,9 @@
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false;
store.dispatch('LogOut').then(() => {
- location.href = '/index';
+ // location.href = '/index';
+ let indexUrl = this.$store.state.permission.indexPage
+ location.href = indexUrl;
})
}).catch(() => {
isRelogin.show = false;
--
Gitblit v1.9.2