From 002c00837a000bd05b24c8b6487f403d9e7cbc69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 8 Sep 2023 14:32:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E3=80=91=20=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E8=B7=AF=E7=94=B1=E5=AE=88=E6=8A=A4=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/InterFace.Dash/src/permission.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/PC/InterFace.Dash/src/permission.js b/PC/InterFace.Dash/src/permission.js
index 6b26604..cd0d850 100644
--- a/PC/InterFace.Dash/src/permission.js
+++ b/PC/InterFace.Dash/src/permission.js
@@ -60,6 +60,16 @@ const toPageInit = async (to, from, next) => {
 
 }
 
+// 获取数据失败处理
+const getErrHandle = (to, from, next) => {
+  let isAutoLogin = JSON.parse(localStorage.getItem('isConfigLogin')) || to.query.loginName
+  Message.error(getErrMsg)
+  if(!isAutoLogin){
+    store.dispatch("user/logout")
+  }
+  NProgress.done()
+}
+
 // 跳转处理
 const toNextHandle = async (to, from, next) => {
   let isFresh = false
@@ -67,8 +77,7 @@ const toNextHandle = async (to, from, next) => {
   // 获取表头转义
   if(!store.getters.columZHList){
     await store.dispatch('definition/getColumZHList').catch(()=>{
-      Message.error(getErrMsg)
-      NProgress.done()
+      getErrHandle(to, from, next)
     })
   }
 
@@ -84,16 +93,14 @@ const toNextHandle = async (to, from, next) => {
         }
       })
       .catch(()=>{
-        Message.error(getErrMsg)
-        NProgress.done()
+        getErrHandle(to, from, next)
       })
   }
 
   // 获取枚举数据
   if(!store.getters.enumList || store.getters.enumList.length <= 0){
     await store.dispatch('definition/getDefinitionConfig').catch(()=>{
-      Message.error(getErrMsg)
-      NProgress.done()
+      getErrHandle(to, from, next)
     })
   }