~mayuhao/HazardInvestigationSystem.git

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

lyfO_o

2022-03-30 fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32

refs
author	lyfO_o <764716047@qq.com>
	Wednesday, March 30, 2022 16:21 +0800
committer	lyfO_o <764716047@qq.com>
	Wednesday, March 30, 2022 16:21 +0800
commit	fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32
tree	3f01d4e4431f5d68d0732bf846273f75a6bcda7c tree \| zip \| gz
parent	6fbb19ced2d11588c0e067653222efa7ed5d99d9 view \| diff 2ed19368a132a53ee9381e726dadeb732457e49b view \| diff

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

# Conflicts:
#	index.html

10 files modified

1 files added

	index.html	1 ●●●●● diff \| view \| raw \| blame \| history
	src/api/safetySelfInspection.js	109 ●●●●● diff \| view \| raw \| blame \| history
	src/router/index.js	7 ●●●●● diff \| view \| raw \| blame \| history
	src/views/contingencyplan/index.vue	46 ●●●●● diff \| view \| raw \| blame \| history
	src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue	68 ●●●●● diff \| view \| raw \| blame \| history
	src/views/majorHazardSourceMonitoring/instrumentData/index.vue	89 ●●●●● diff \| view \| raw \| blame \| history
	src/views/majorHazardSourceMonitoring/productionEquipment/index.vue	99 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/checklist.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/checklistself.vue	174 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/new.vue	409 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/reviewXG.vue	3 ●●●●● diff \| view \| raw \| blame \| history