协调处置开始

src/views/components/supervision.vue

@@ -113,19 +113,6 @@ export default {
         margin-right 0.5rem
       >div
         width 100%
-<<<<<<< HEAD
-        display flex
-        align-items center
-        flex-wrap wrap
-        >p
-          width 50%
-        >span
-          font-size 1.2rem
-          text-align right
-          width 50%
-        .progress
-          flex 1
-=======
         >div
           display flex
           justify-content space-between
@@ -138,5 +125,4 @@ export default {
               span
                 color $edgeColor
 
->>>>>>> bf76de72248ac5f47f897ddd3fc6651b7320c65c
 </style>