~mayuhao/HazardInvestigationSystem.git

隐患排查体系综合管控系统

lyfO_o

2022-03-24 d13348b06ba9be4dd4f396ad578cd68feb8e0ad1

refs
author	lyfO_o <764716047@qq.com>
	Thursday, March 24, 2022 16:24 +0800
committer	lyfO_o <764716047@qq.com>
	Thursday, March 24, 2022 16:24 +0800
commit	d13348b06ba9be4dd4f396ad578cd68feb8e0ad1
tree	c414ac6c48aea7c4308971c7c650c3b81131ce74 tree \| zip \| gz
parent	1a2cc996d29c0cdffb2cf2eae2f034146e0e4613 view \| diff c251626c67a55dfa8305fd49a47a0a2aa00fc32f view \| diff

Merge remote-tracking branch 'remotes/origin/lyf' into master

# Conflicts:
#	src/views/systemManage/userManage/index.vue

1 files deleted

5 files modified

6 files added

	src/api/departmentManage.js	13 ●●●●● diff \| view \| raw \| blame \| history
	src/api/hiddenDanger.js	50 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/accept.vue	215 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/acceptDialog/acceptDialog.vue	227 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/confirm.vue	411 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/personSelect/personSelect.vue	166 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/rectify.vue	212 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/rectifyDialog/rectifyDialog.vue	261 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/report.vue	374 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/reportDialog/reportDialog.vue	221 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/reportView/reportView.vue	52 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDanger/statistics.vue	145 ●●●●● diff \| view \| raw \| blame \| history