moral_fronted.git

quanyawei

2023-10-08 889cddc1cf0cbd5518c8b03d58f473db74e771a0

refs
author	quanyawei <401863037@qq.com>
	Sunday, October 8, 2023 15:16 +0800
committer	quanyawei <401863037@qq.com>
	Sunday, October 8, 2023 15:16 +0800
commit	889cddc1cf0cbd5518c8b03d58f473db74e771a0
tree	8240fe2fa8cfad681abbb32ccce9aa6a63fa9f6e tree \| zip \| gz
parent	88cc6e9805c5300d918c0363585c133bcee0cfe1 view \| diff d1b793c51a67e7aebf04d35c0200b21681337024 view \| diff

Merge branch 'feature_1.0'

# Conflicts:
#	src/views/deviceDetail/index.vue

6 files modified

	src/components/Echarts/BarChart.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/components/Echarts/PieChartNew.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/components/Wind/Map.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/views/UVA/index1.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/views/UVA/index1Copy.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/deviceDetail/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history