修改

pages.json

@@ -163,7 +163,7 @@
 				"enablePullDownRefresh": false
 			}
 		}
-<<<<<<< HEAD
+
         ,
         {
         	"path" : "pages/workOrderManagement/workOrderMap",
@@ -191,10 +191,10 @@
         }
        
     ],
-=======
 
-	],
->>>>>>> fbbf96fad769526c00e0714e649d2d5747c003da
+
+	
+
 
 	"globalStyle": {
 		"navigationStyle": "custom", // 隐藏系统导航栏

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -552,7 +552,7 @@
 	.background {
 		background-color: rgba(22, 119, 255, 1);
 		padding-bottom: 100rpx;
-
+        padding-top: 88rpx;
 
 
 		/deep/.u-border-bottom:after {