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;
 }

src/permission.js

@@ -47,10 +47,14 @@ router.beforeEach((to, from, next) => {
           next({ ...to, replace: true });
         });
       }).catch((err) => {
-        store.dispatch("LogOut").then(() => {
+        const errorText = (err && err.message) || String(err || "GetInfo failed");
-          Message.error(err);
+        store
-          next({ path: "/" });
+          .dispatch("LogOut")
-        });
+          .catch(() => {})
+          .finally(() => {
+            Message.error(errorText);
+            next({ path: "/login", replace: true });
+          });
       });
       return;
     }