From 9c20611949321fa024d4848ae2ac78da6e1c6c36 Mon Sep 17 00:00:00 2001
From: "lj7788@126.com" <lj7788@126.com>
Date: Sun, 15 Jun 2025 15:27:59 +0800
Subject: [PATCH] =?UTF-8?q?BIM=E5=BA=94=E7=94=A8=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-bigscreen/src/views/bimManage.vue | 10 ----------
 1 file changed, 10 deletions(-)

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