~admin/srs-police-affairs.git

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

guanqb

2023-04-07 fba0b4cdc5d070394fc64b34d9e50ca65c23e0a6

refs
author	guanqb <18720758508@163.com>
	Friday, April 7, 2023 17:55 +0800
committer	guanqb <18720758508@163.com>
	Friday, April 7, 2023 17:55 +0800
commit	fba0b4cdc5d070394fc64b34d9e50ca65c23e0a6
tree	00a789ddcf5e7456a4206b5c114b93e76d95fbb5 tree \| zip \| gz
parent	8062c7cd30703803b07806739dfbb26c923a74e9 view \| diff e2f341b73943753e6ea96cf6d85a09ce070e2ee1 view \| diff

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

24 files modified

	src/components/assemble/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/index.vue	14 ●●●●● diff \| view \| raw \| blame \| history
	src/components/playVideo/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/base/index.scss	85 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/media/index.scss	34 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/customImageBox.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/policeCarChange.vue	28 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/policePersonChange.vue	34 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/polygonPlot.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/polylinePlot copy.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/polylinePlot.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/publicIndex.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/twoDrawBtnBox.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/index.vue	48 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/components/bottomContainer.vue	106 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/components/dialog/areaDetailsBox.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/components/dialog/keyPersonBox.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/components/dialog/landDetailsBox.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/components/schedulingList.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/index.vue	15 ●●●●● diff \| view \| raw \| blame \| history
	src/views/house/index.vue	15 ●●●●● diff \| view \| raw \| blame \| history
	src/views/police/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/video/list.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/video/region.vue	4 ●●●●● diff \| view \| raw \| blame \| history