Resolve conflicts

2025-09-17 08:56:57 +08:00 · 2022-04-30 14:33:54 +02:00
parent ed84e56a85
commit 7532acc95d
10 changed files with 74 additions and 65 deletions
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -494,6 +494,7 @@ export default {
            let result = {
                up: 0,
                down: 0,
+                maintenance: 0,
                unknown: 0,
                pause: 0,
            };
@@ -502,7 +503,10 @@ export default {
                let beat = this.$root.lastHeartbeatList[monitorID];
                let monitor = this.$root.monitorList[monitorID];

-                if (monitor && ! monitor.active) {
+                if (monitor && monitor.maintenance) {
+                    result.maintenance++;
+                }
+                else if (monitor && ! monitor.active) {
                    result.pause++;
                } else if (beat) {
                    if (beat.status === 1) {