Merge branch 'master' into public-dashboard

# Conflicts: # server/database.js
2025-08-22 14:42:51 +08:00 · 2021-09-16 16:53:54 +08:00
parent 611d214a32 72783fd94c
commit 392f8275b3
24 changed files with 172 additions and 69 deletions
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -305,8 +305,8 @@ export default {
            this.importantHeartbeatList = {}
        },

-        uploadBackup(uploadedJSON, callback) {
-            socket.emit("uploadBackup", uploadedJSON, callback)
+        uploadBackup(uploadedJSON, importHandle, callback) {
+            socket.emit("uploadBackup", uploadedJSON, importHandle, callback)
        },

        clearEvents(monitorID, callback) {