BIM应用大屏开发

2025-06-15 15:27:59 +08:00 · 2025-06-15 15:27:59 +08:00 · 9c20611949
parent 511dbe9288
commit 9c20611949
1 changed files with 0 additions and 10 deletions
--- 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() {