From 148fc335a09a4c17dbb5b2ea3b8dd8da6101e484 Mon Sep 17 00:00:00 2001
From: hx <190679152@qq.com>
Date: Wed, 25 Mar 2026 17:27:30 +0800
Subject: [PATCH] =?UTF-8?q?b=E7=AB=AF=E5=9B=BD=E9=99=85=E5=8C=96=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/device/TrajectoryDialog.vue | 16 ++++++++--------
 src/permission.js                          | 12 ++++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/device/TrajectoryDialog.vue b/src/components/device/TrajectoryDialog.vue
index 84ae9f9..b92d32b 100644
--- a/src/components/device/TrajectoryDialog.vue
+++ b/src/components/device/TrajectoryDialog.vue
@@ -65,8 +65,8 @@
             <el-radio-button label="maptiler" :disabled="!hasMaptilerKey">
               {{ $t("device.trajectory.provider.maptiler") }}
             </el-radio-button>
-         
-        
+
+
           </el-radio-group>
         </div>
 
@@ -292,12 +292,12 @@ export default {
        if (this.hasAmapKey) {
         return "amap";
       }
-     
+
       if (this.hasMaptilerKey) {
         return "maptiler";
       }
-     
-      
+
+
       return "amap";
     },
     initDefaultLocationTimeRange() {
@@ -1189,20 +1189,20 @@ if (path.length > 1) {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
 }
 
-/deep/ .trajectory-dialog {
+ .trajectory-dialog {
   margin-top: 4vh !important;
   margin-bottom: 4vh;
   max-height: 90vh;
 }
 
-/deep/ .trajectory-dialog .el-dialog__body {
+ .trajectory-dialog .el-dialog__body {
   max-height: calc(90vh - 120px);
   overflow: hidden;
   padding-top: 10px;
   padding-bottom: 10px;
 }
 
-/deep/ .trajectory-dialog .el-dialog__footer {
+ .trajectory-dialog .el-dialog__footer {
   padding-top: 10px;
   padding-bottom: 14px;
 }
diff --git a/src/permission.js b/src/permission.js
index 38ec31b..0f9daf3 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -47,10 +47,14 @@ router.beforeEach((to, from, next) => {
           next({ ...to, replace: true });
         });
       }).catch((err) => {
-        store.dispatch("LogOut").then(() => {
-          Message.error(err);
-          next({ path: "/" });
-        });
+        const errorText = (err && err.message) || String(err || "GetInfo failed");
+        store
+          .dispatch("LogOut")
+          .catch(() => {})
+          .finally(() => {
+            Message.error(errorText);
+            next({ path: "/login", replace: true });
+          });
       });
       return;
     }