~admin/srs-police-affairs.git

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

guanqb

2023-03-31 ac19ae903dd740bdaf1499ae40ef4039fdb4e6ad

refs
author	guanqb <18720758508@163.com>
	Friday, March 31, 2023 22:00 +0800
committer	guanqb <18720758508@163.com>
	Friday, March 31, 2023 22:00 +0800
commit	ac19ae903dd740bdaf1499ae40ef4039fdb4e6ad
tree	3052a76abb1899ee5bd2d04545068c7a0439920f tree \| zip \| gz
parent	9c6dc1b100a7a878e4fc2543f5c2d12e5d004566 view \| diff 03ab12b4ff251e4f7facd0e441fd56b04bab8862 view \| diff

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

19 files modified

5 files added

	public/img/draw/line.png	diff \| view \| raw \| blame \| history
	public/img/draw/qycx.png	diff \| view \| raw \| blame \| history
	public/img/icon/video-off.png	diff \| view \| raw \| blame \| history
	public/img/icon/video.png	diff \| view \| raw \| blame \| history
	src/components/map/components/mapSearchPopup.vue	87 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/index.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mapSearchBox/index.vue	34 ●●●●● diff \| view \| raw \| blame \| history
	src/store/getters.js	13 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/popupParams.js	15 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/base/index.scss	37 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/dc/index.scss	2 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/icon/index.scss	22 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/media/index.scss	9 ●●●●● diff \| view \| raw \| blame \| history
	src/utils/tools/DrawTool.js	3 ●●●●● diff \| view \| raw \| blame \| history
	src/utils/turfPolygon.js	39 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/activityDetail.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/drawBtnBox.vue	28 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/policeCarChange.vue	11 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/policePersonChange.vue	11 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/polygonPlot.vue	21 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/polylinePlot.vue	27 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/publicIndex.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/twoDrawBtnBox.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/video/list.vue	208 ●●●●● diff \| view \| raw \| blame \| history