From ed2823ccf96675ab29414a588bba85bb8852ef9d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 28 四月 2024 11:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/northglass-erp/src/layout/MainErpView.vue |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
index e094acc..650259f 100644
--- a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
+++ b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
@@ -17,29 +17,57 @@
 const router = useRouter()
 const userStore = useUserInfoStore()
 const user = userStore.user.userName
+watch(()=>userStore.responseCode,(newVal) => {
+    switch (newVal){
+      case 401:{
+        if(userStore.msg.split('.')[1] === 'search'){
+          router.push({path:'/main/order/notPermission'});
+        }else{
+          ElMessage.warning(t('error.Code_401'))
+        }
+        userStore.responseCode=null
+        break
+      }
+      case 402:{
+        ElMessage.warning(t('error.Code_402'))
+        router.push("/login")
+        break
+      }
+      default:{
+        break
+      }
+    }
+  }
+)
+
 store.createWebSocket();
 function quit(){
   userStore.$patch({
     user:null
   })
-  router.push("/login")
+  request.post('/userInfo/logout').finally(()=>{
+    router.push("/login")
+  })
+
+  //
 }
+
+
 
 
 //鎻愬彇妯″潡鍒楄〃
 let menuList=$ref([])
-request.get(`/menu/getMenu/${lang}`).then((res) => {
-  if(res.code==200){
-    menuList= deepClone(res.data)
-  }else{
-    ElMessage.warning(res.msg)
-    router.push("/login")
-  }
-}).catch((e)=>{
-  ElMessage.warning(t('main.connectErr'))
-  router.push("/login")
+onMounted(()=>{
+  request.get(`/menu/getMenu/${lang}`).then((res) => {
+
+    if(res.code==200){
+      menuList= deepClone(res.data)
+    }
+  })
+
 })
 
+
 //鑾峰彇鑿滃崟鍒楄〃
 let menuItemList=$ref([])
 request.get(`/menuItem/getMenuItem/${lang}`).then((res) => {

--
Gitblit v1.8.0