Merge branch 'feat/layout-style' into 'dev'

feat(*): 权限变更监测去除login监听

See merge request !26

src/main.js

@@ -9,7 +9,7 @@ import "element-plus/dist/index.css";
 import * as ElementPlusIconsVue from "@element-plus/icons-vue";
 import { createPinia } from "pinia";
 import moment from 'moment';
-import { startPermissionCheck } from '@/utils/permissionChecker';
+import { startPermissionCheck, stopPermissionCheck } from '@/utils/permissionChecker';
 
 
 const app = createApp(App);
@@ -23,7 +23,23 @@ app
   .use(createPinia())
   .mount("#app");
 
-// 启动权限轮询检查，每5秒检查一次
+// 监听路由变化，在登录页停止权限轮询，在其他页面启动权限轮询
+router.beforeEach((to, from, next) => {
+  if (to.path === '/login') {
+    stopPermissionCheck();
+  }
+  next();
+});
+
+router.afterEach((to) => {
+  if (to.path !== '/login') {
+    startPermissionCheck(5000);
+  }
+});
+
+// 初始启动权限轮询检查
 router.isReady().then(() => {
-  startPermissionCheck(5000);
+  if (router.currentRoute.value.path !== '/login') {
+    startPermissionCheck(5000);
+  }
 });

src/utils/permissionChecker.js

@@ -7,9 +7,9 @@ let previousPermissionData = null;
 
 /**
  * 开始权限轮询检查
- * @param {Number} interval - 轮询间隔，默认5000ms
+ * @param {Number} interval - 轮询间隔，默认10000ms
  */
-export function startPermissionCheck(interval = 10000) {
+export function startPermissionCheck(interval = 5000) {
   // 如果已经存在轮询，先清除
   if (permissionInterval) {
     clearInterval(permissionInterval);

src/views/login/index.vue

@@ -1086,7 +1086,6 @@ export default {
               path: this.redirect || "/",
               query: this.otherQuery,
             });
-            startPermissionCheck();
         })
         .catch((e) => {
           console.log("error fetch verify code!!" + e);