From ac03526ea51cb1baae67ab7dd2ee1e085f6a57a4 Mon Sep 17 00:00:00 2001 From: java2sap <39330069+sapuser2017@users.noreply.github.com> Date: 星期五, 31 十二月 2021 13:33:50 +0800 Subject: [PATCH] Update vite.config.js --- src/utils/request.js | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 8e799ad..e6b6f0e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,6 +7,8 @@ import { saveAs } from 'file-saver' let downloadLoadingInstance; +// 鏄惁鏄剧ず閲嶆柊鐧诲綍 +let isReloginShow; axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 鍒涘缓axios瀹炰緥 @@ -48,16 +50,25 @@ return res.data } if (code === 401) { - ElMessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', { + if (!isReloginShow) { + isReloginShow = true; + ElMessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', { confirmButtonText: '閲嶆柊鐧诲綍', cancelButtonText: '鍙栨秷', type: 'warning' } ).then(() => { + isReloginShow = false; store.dispatch('LogOut').then(() => { - location.href = '/index'; + // 濡傛灉鏄櫥褰曢〉闈笉闇�瑕侀噸鏂板姞杞� + if (window.location.hash.indexOf("#/login") != 0) { + location.href = '/index'; + } }) - }).catch(() => {}); + }).catch(() => { + isReloginShow = false; + }); + } return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�') } else if (code === 500) { ElMessage({ @@ -108,12 +119,15 @@ const blob = new Blob([data]) saveAs(blob, filename) } else { - ELMessage.error('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�'); + const resText = await data.text(); + const rspObj = JSON.parse(resText); + const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + ElMessage.error(errMsg); } downloadLoadingInstance.close(); }).catch((r) => { console.error(r) - ELMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒') + ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒') downloadLoadingInstance.close(); }) } -- Gitblit v1.9.3