zhyq/bigScreen.git

智慧园区前端大屏

Merge remote-tracking branch 'origin/main'

linwe

2024-11-19 2676f45f33b9dedb80d0417e5af603df41216f0b

refs
author	linwe <872216996@qq.com>
	Tuesday, November 19, 2024 18:31 +0800
committer	linwe <872216996@qq.com>
	Tuesday, November 19, 2024 18:31 +0800
commit	2676f45f33b9dedb80d0417e5af603df41216f0b
tree	3e7f6274ddb086fe91f2f672717c5b5708b83cde tree \| zip \| gz
parent	940222bec16446d4b933fb7682ca4933fb520b4a view \| diff 4719f81e1d4b73285109d86510ef5a0d9d3ebc97 view \| diff

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/views/space/components/box/dataContent.vue

12 files modified

6 files deleted

	src/components/global/GlobalSearch.vue	16 ●●●●● diff \| view \| raw \| blame \| history
	src/pages/layout/components/scomponents/layersControl.vue	47 ●●●●● diff \| view \| raw \| blame \| history
	src/store/map.js	13 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/base/dc-base.scss	17 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/box/dataContent.vue	364 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/box/fireContent.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/box/fireSource.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/box/fireTrend.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/box/occurStatistics.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/box/publicContent.vue	26 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/box/unitContent.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/leftContainer.vue	121 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/components/rightContainer.vue	76 ●●●●● diff \| view \| raw \| blame \| history
	src/views/rs/index.vue	14 ●●●●● diff \| view \| raw \| blame \| history
	src/views/space/components/box/dataContent.vue	39 ●●●●● diff \| view \| raw \| blame \| history
	src/views/survey/components/box/dataContent.vue	46 ●●●●● diff \| view \| raw \| blame \| history
	src/views/survey/components/box/fireContent.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/survey/components/box/unitContent.vue	44 ●●●●● diff \| view \| raw \| blame \| history