diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index f2b39a97e..4d453f5cf 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -261,12 +261,16 @@ export default {
                     console.log('ws', this.ws, this.ws ? this.ws.readyState : null);
                 }
                 if (num > 0) {
-                    this.$store.dispatch("call", {
-                        url: 'users/ws/exist',
-                    }).catch(_ => {
-                        this.$store.dispatch("websocketConnection");
-                    });
                     this.$store.dispatch("getBasicData", 1000)
+                    if (this.ws === null) {
+                        this.$store.dispatch("websocketConnection");
+                    } else {
+                        this.$store.dispatch("call", {
+                            url: 'users/ws/exist',
+                        }).catch(_ => {
+                            this.$store.dispatch("websocketConnection");
+                        });
+                    }
                 }
             }
         }
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index ee1ae53cb..3af178397 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -679,7 +679,7 @@ export default {
 
         wsOpenNum(num) {
             if (num <= 1) return
-            this.$store.dispatch("getBasicData", 1000).then(this.getReportUnread)
+            this.$store.dispatch("getBasicData", 600).then(this.getReportUnread)
         },
 
         workReportShow(show) {
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index 7dca78a22..6aec9eb6e 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -660,7 +660,9 @@ export default {
         wsOpenNum(num) {
             if (num <= 1) return
             this.wsOpenTimeout && clearTimeout(this.wsOpenTimeout)
-            this.wsOpenTimeout = setTimeout(this.getFileList, 5000)
+            this.wsOpenTimeout = setTimeout(() => {
+                this.$route.name == 'manage-file' && this.getFileList();
+            }, 5000)
         }
     },
 
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index b7be142b8..ca3c0852c 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -314,7 +314,7 @@ export default {
             state.userToken = userInfo.token;
             state.userIsAdmin = $A.inArray('admin', userInfo.identity);
             $A.setStorage("userInfo", state.userInfo);
-            dispatch("getBasicData");
+            dispatch("getBasicData", null);
             resolve()
         });
     },