Commit Graph

7 Commits

Author SHA1 Message Date
gongjiale dbdb6d7cea Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/assertReport/components/ReservoirBottom.vue
#	front/src/views/assertReport/components/ReservoirRight.vue
#	front/src/views/assertReport/components/ReservoirThumbnail.vue
#	front/src/views/assertReport/index.vue
2022-11-29 13:56:18 +08:00
gongjiale 9acaa0e8d3 修改大屏 2022-11-29 13:14:43 +08:00
wuhongjian 953fe9e18f bug修复 2022-11-29 11:57:33 +08:00
gongjiale c7487a2442 大屏调整 2022-11-28 17:28:05 +08:00
gongjiale b8695f4fc5 大屏修改 2022-11-28 15:32:45 +08:00
gongjiale 427f478eb9 提交代码 2022-11-26 22:19:22 +08:00
gongjiale 84abb2fde3 新增 2022-11-26 18:17:55 +08:00