jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

dev_xd
lj7788@126.com 2025-06-15 15:26:12 +08:00
parent 074ae5ba38 1dfcd547e8
commit 511dbe9288
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yanzhu-bigscreen/src/views/bimManage.vue
View File

@ -383,6 +383,7 @@ export default {
planFinishRate: 0, planFinishRate: 0,
finishRate: 0, finishRate: 0,
photographyList: [], photographyList: [],
<<<<<<< HEAD
safetyListCount: [], safetyListCount: [],
safetyInfo: { safetyInfo: {
safetyRectifyCount: 0, safetyRectifyCount: 0,
@ -390,6 +391,15 @@ export default {
safetyTimeoutCount: 0, safetyTimeoutCount: 0,
safetyTimeoutRate: 0, safetyTimeoutRate: 0,
}, },
=======
safetyListCount:[],
safetyInfo:{
safetyRectifyCount:0,
safetyRectifyRate:0,
safetyTimeoutCount:0,
safetyTimeoutRate:0
}
>>>>>>> origin/dev_xd
}; };
}, },
beforeDestroy() { beforeDestroy() {