feat 监控大屏、安全检测

2024-12-18 11:07:30 +08:00
parent dfa6dc31b5
commit 4a12039789
4 changed files with 10 additions and 51 deletions
--- a/src/views/home/components/box-3.vue
+++ b/src/views/home/components/box-3.vue
@@ -287,8 +287,5 @@
      }
    }
  }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> 1108aafed493fffba8fdd2e63eae89a9092ef6e5
+