diff --git a/yanzhu-bigscreen/src/views/bimManage.vue b/yanzhu-bigscreen/src/views/bimManage.vue
index 8314ac14..556e8a07 100644
--- a/yanzhu-bigscreen/src/views/bimManage.vue
+++ b/yanzhu-bigscreen/src/views/bimManage.vue
@@ -383,6 +383,7 @@ export default {
       planFinishRate: 0,
       finishRate: 0,
       photographyList: [],
+<<<<<<< HEAD
       safetyListCount: [],
       safetyInfo: {
         safetyRectifyCount: 0,
@@ -390,6 +391,15 @@ export default {
         safetyTimeoutCount: 0,
         safetyTimeoutRate: 0,
       },
+=======
+      safetyListCount:[],
+      safetyInfo:{
+        safetyRectifyCount:0,
+        safetyRectifyRate:0,
+        safetyTimeoutCount:0,
+        safetyTimeoutRate:0
+      }
+>>>>>>> origin/dev_xd
     };
   },
   beforeDestroy() {