Merge remote-tracking branch 'origin/dev_xd' into dev_xd

2025-06-15 15:26:12 +08:00 · 2025-06-15 15:26:12 +08:00 · 511dbe9288
parent 074ae5ba38 1dfcd547e8
commit 511dbe9288
1 changed files with 10 additions and 0 deletions
--- 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() {