zhyq/bigScreen.git

Merge remote-tracking branch 'origin/main'

linwe

2024-11-09 49709d96d28bca549194604430508ddf4255dacf

refs
author	linwe <872216996@qq.com>
	Saturday, November 9, 2024 15:59 +0800
committer	linwe <872216996@qq.com>
	Saturday, November 9, 2024 15:59 +0800
commit	49709d96d28bca549194604430508ddf4255dacf
tree	d4cc312e7023449ef8b799b0b86a302fe642482e tree \| zip \| gz
parent	d41be60d948d1928b3e3c76cae2a089e1c8bdc48 view \| diff 1ec885b56f4da29a7f4577326a55c39d699bc316 view \| diff

Merge remote-tracking branch 'origin/main'

13 files modified

22 files added

	package.json	3 ●●●●● diff \| view \| raw \| blame \| history
	pnpm-lock.yaml	1471 ●●●●● diff \| view \| raw \| blame \| history
	public/al/GIS-TL_泵站.png	diff \| view \| raw \| blame \| history
	public/al/GIS-TL_泵站1.png	diff \| view \| raw \| blame \| history
	public/al/btn-排水管网.png	diff \| view \| raw \| blame \| history
	public/al/企业公司.png	diff \| view \| raw \| blame \| history
	public/al/原液阀门运行.png	diff \| view \| raw \| blame \| history
	public/al/急.png	diff \| view \| raw \| blame \| history
	public/al/水库icon.png	diff \| view \| raw \| blame \| history
	public/al/水库水情.png	diff \| view \| raw \| blame \| history
	public/al/消防_1.png	diff \| view \| raw \| blame \| history
	public/img/mapicon/fxy.png	diff \| view \| raw \| blame \| history
	public/img/mapicon/qy.png	diff \| view \| raw \| blame \| history
	src/hooks/initMap.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/router/index.js	9 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/base/dc-base.scss	51 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/base/index.scss	1 ●●●●● diff \| view \| raw \| blame \| history
	src/utils/turfPolygon.js	194 ●●●●● diff \| view \| raw \| blame \| history
	src/views/companyInfo/index.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/layout/components/mainMenu.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/layout/components/scomponents/layersControl.vue	52 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/box/dataContent.vue	158 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/box/fireContent.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/box/fireSource.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/box/fireTrend.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/box/occurStatistics.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/box/publicContent.vue	26 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/box/unitContent.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/leftContainer.vue	47 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/components/rightContainer.vue	86 ●●●●● diff \| view \| raw \| blame \| history
	src/views/pd/index.vue	30 ●●●●● diff \| view \| raw \| blame \| history
	src/views/space/components/leftContainer.vue	21 ●●●●● diff \| view \| raw \| blame \| history
	src/views/space/components/rightContainer.vue	72 ●●●●● diff \| view \| raw \| blame \| history
	src/views/space/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/survey/components/box/fireSource.vue	1 ●●●●● diff \| view \| raw \| blame \| history