diff --git a/src/views/monitor/components/box-1.vue b/src/views/monitor/components/box-1.vue
index 73c0924..816bbbc 100644
--- a/src/views/monitor/components/box-1.vue
+++ b/src/views/monitor/components/box-1.vue
@@ -76,12 +76,13 @@
           <countup class="scenic-item__value" :end-val="trafficAiAnalyzeData.abnormalWarnings" />
         </div>
         <div class="scenic-item">
-          <span class="scenic-item__label">已处理</span>
+          <span class="scenic-item__label">已解除</span>
           <countup class="scenic-item__value" :end-val="trafficAiAnalyzeData.handled" />
         </div>
       </div>
       <div class="flex pt-20">
         <div class="box">
+<<<<<<< HEAD
           <Title3 title="拥堵告警" />
           <!-- <Line :width="760" :height="180" :data="jamlData" :xAxisData="jamXAxisData" /> -->
 		  
@@ -89,6 +90,10 @@
 		  :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>
diff --git a/src/views/scenic/components/box-1.vue b/src/views/scenic/components/box-1.vue
index df6fd2c..6347820 100644
--- a/src/views/scenic/components/box-1.vue
+++ b/src/views/scenic/components/box-1.vue
@@ -131,7 +131,7 @@
   import { useRouter } from 'vue-router'
 
   import { useScenicStore } from '@/stores/scenic'
-  
+
   import { useMap } from '@/hooks/map'
   import {getPreviewUrlApi,getSpotTicketDate} from "@/api/home.js";
 import pubSub from 'pubsub-js'
@@ -139,7 +139,7 @@ import pubSub from 'pubsub-js'
   const scenicStore = useScenicStore()
   const { initMap, addMarker, map, marker } = useMap()
  import { useHomeStore } from '@/stores/home'
- 
+
  const homeStore = useHomeStore()
   let props = defineProps({
     scenicSpotId: {
@@ -210,7 +210,7 @@ import pubSub from 'pubsub-js'
 	PubSub.subscribe('changeAmplify', (msg, data) => {
 	   if(data&&myElement.value){
 		    myElement.value.classList.add('coll-box');
-			
+
 	   }
 	})
   })
@@ -255,7 +255,7 @@ import pubSub from 'pubsub-js'
       }
       &__left-item {
         position: relative;
-        width: vw(120);
+        width: vw(115);
         height: vh(58);
         padding-left: vw(10);
         display: flex;
@@ -364,7 +364,7 @@ import pubSub from 'pubsub-js'
         }
         .bg {
           padding-left: vw(20);
-          width: vw(243);
+          //width: vw(243);
           height: vh(40);
           display: flex;
           align-items: center;