24

src/views/monitor/components/box-1.vue

@@ -82,7 +82,6 @@
       </div>
       <div class="flex pt-20">
         <div class="box">
-<<<<<<< HEAD
           <Title3 title="拥堵告警" />
           <!-- <Line :width="760" :height="180" :data="jamlData" :xAxisData="jamXAxisData" /> -->
 		  
@@ -90,10 +89,8 @@
 		  :series="jamlData[0].data" 
 		  :data="jamXAxisData" :height="180" />
 		  
-=======
           <Title3 title="平均车速(KM/H)" />
           <Line :width="760" :height="180" :data="jamlData" :xAxisData="jamXAxisData" />
->>>>>>> 7c696b91971ef42b6e755b7bd49f244dd77c25b4
         </div>
       </div>
     </template>
@@ -406,6 +403,9 @@
       }
       &:nth-child(4) {
         .monitor-statistics-item__error {
+			margin-top: vh(10);
+			font-weight: bold;
+			font-size: vw(24);
           color: #e21b1b;
         }
         .monitor-statistics-item__value {