diff --git a/src/components/mainHeader/index.vue b/src/components/mainHeader/index.vue
index 6027e6a..68cd9ab 100644
--- a/src/components/mainHeader/index.vue
+++ b/src/components/mainHeader/index.vue
@@ -9,11 +9,7 @@ import lighting from '@/views/lighting/index.vue' //照明
 import carbonEmission from '@/views/carbonEmission/index.vue' //碳排放
 
 import screen from '@/views/screen/index.vue' //显示屏
-<<<<<<< HEAD
-
-=======
 import energyMonitoring from '@/views/energyMonitoring/index.vue'
->>>>>>> af48436e2178f27ff7772684e807f1fea9516ede
 const nowDate = ref('')
 const nowWeek = ref('')
 const nowMin = ref('')
@@ -30,11 +26,7 @@ timer.value = setInterval(()=>{
 },1000)
 const menuList = ref([
   {name:shallowRef(overview),default:'../../assets/images/menu/overview.png',select:'../../assets/images/menu/overview-select.png'},
-<<<<<<< HEAD
-  { //name:shallowRef(energyMonitoring),
-=======
   {name:shallowRef(energyMonitoring),
->>>>>>> af48436e2178f27ff7772684e807f1fea9516ede
     default:'../../assets/images/menu/energy.png',select:'../../assets/images/menu/energy-select.png'},
   {name:shallowRef(energyEfficiency),default:'../../assets/images/menu/energy-efficiency.png',select:'../../assets/images/menu/energy-efficiency-select.png'},
   {name:shallowRef(drainage),default:'../../assets/images/menu/drainage.png',select:'../../assets/images/menu/drainage-select.png'},