parent: 1fe764 | patch | commitdiff
quanyawei
2023-10-08 88cc6e9805c5300d918c0363585c133bcee0cfe1
refs
author quanyawei <401863037@qq.com>
Sunday, October 8, 2023 12:01 +0800
committer quanyawei <401863037@qq.com>
Sunday, October 8, 2023 12:01 +0800
commit88cc6e9805c5300d918c0363585c133bcee0cfe1
tree 29ff7f244af73429acb27609f69cb2742bae778e tree | zip | gz
parent 1fe764de50dd85908f581bd0299cfb442dca3c3c view | diff
31636073e0330e0f94adca0c17c6629b2fab45c5 view | diff 
Merge branch 'feature_1.0'

# Conflicts:
#	src/views/deviceDetail/index.vue
4 files modified
412 ■■■■■ changed files
src/components/Wind/Map.vue 397 ●●●●● diff | view | raw | blame | history
src/views/UVA/index1.vue 6 ●●●●● diff | view | raw | blame | history
src/views/UVA/index1Copy.vue 2 ●●●●● diff | view | raw | blame | history
src/views/deviceDetail/index.vue 7 ●●●●● diff | view | raw | blame | history