ztqt.git - Gitblit

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

lyfO_o

2022-03-29 6fbb19ced2d11588c0e067653222efa7ed5d99d9

refs
author	lyfO_o <764716047@qq.com>
	Tuesday, March 29, 2022 17:38 +0800
committer	lyfO_o <764716047@qq.com>
	Tuesday, March 29, 2022 17:38 +0800
commit	6fbb19ced2d11588c0e067653222efa7ed5d99d9
tree	f799edd0a28d9c8b5708dfef32413a2a5054ff76 tree \| zip \| gz
parent	f2a9d202775438089ef6a11e3934a86a2301aa5a view \| diff 9bd50781e2c06505591500afb99f54ce37fdbe34 view \| diff

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

5 files modified

20 files added

	config/dev.env.js	6 ●●●●● diff \| view \| raw \| blame \| history
	package-lock.json	22542 ●●●●● diff \| view \| raw \| blame \| history
	src/api/elementManagement.js	57 ●●●●● diff \| view \| raw \| blame \| history
	src/api/emergencyplan.js	57 ●●●●● diff \| view \| raw \| blame \| history
	src/api/majorEquipment.js	65 ●●●●● diff \| view \| raw \| blame \| history
	src/api/majorEquipmentAlarm.js	46 ●●●●● diff \| view \| raw \| blame \| history
	src/api/majorEquipmentData.js	58 ●●●●● diff \| view \| raw \| blame \| history
	src/api/safetyInspectionItem.js	57 ●●●●● diff \| view \| raw \| blame \| history
	src/components/Titlename/index.vue	47 ●●●●● diff \| view \| raw \| blame \| history
	src/permission.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/router/index.js	121 ●●●●● diff \| view \| raw \| blame \| history
	src/views/contingencyplan/index.vue	268 ●●●●● diff \| view \| raw \| blame \| history
	src/views/contingencyplan/uploadFile.vue	131 ●●●●● diff \| view \| raw \| blame \| history
	src/views/contingencyplan/uploadImg.vue	123 ●●●●● diff \| view \| raw \| blame \| history
	src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue	308 ●●●●● diff \| view \| raw \| blame \| history
	src/views/majorHazardSourceMonitoring/instrumentData/index.vue	502 ●●●●● diff \| view \| raw \| blame \| history
	src/views/majorHazardSourceMonitoring/productionEquipment/index.vue	284 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/checklist.vue	561 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/checklistself.vue	130 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/feature.vue	337 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/gojudging.vue	185 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/new.vue	254 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/review.vue	329 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyproduction/reviewXG.vue	262 ●●●●● diff \| view \| raw \| blame \| history
	yarn.lock	17698 ●●●●● diff \| view \| raw \| blame \| history