~admin/zhba_enterprises.git

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-08-28 c8e279927a36c755fd78769cfa8e489568192aa4

refs
author	liuyg <376836862@qq.com>
	Saturday, August 28, 2021 16:31 +0800
committer	liuyg <376836862@qq.com>
	Saturday, August 28, 2021 16:31 +0800
commit	c8e279927a36c755fd78769cfa8e489568192aa4
tree	c7e686666e17e50cadc3b7f2fa7c1ac11f047d78 tree \| zip \| gz
parent	d09564dfe3b1a86f8059e13a26ba6ca0798c4101 view \| diff 2ae96849b1f50301ca3a388534f0072887308ae0 view \| diff

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

28 files modified

	src/views/applydetailed/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/applyexam/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/desk/notice.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dispatch/dispatch.vue	158 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dispatch/dispatchChildoperable.vue	87 ●●●●● diff \| view \| raw \| blame \| history
	src/views/exam/performance.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/exam/singleperformance.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/exam/startexam.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/views/people/data.js	868 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/car.js	60 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/car.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/equipments.js	71 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/equipments.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/gun.js	37 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/gun.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/data.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityGuard.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityGuardOnce.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityGuardRegistration.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityMan/data.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/data.js	45 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainApply/index.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/index.vue	14 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/performance.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/singleperformance.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainingRegistration/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/workreport/workreport.vue	21 ●●●●● diff \| view \| raw \| blame \| history
	vue.config.js	80 ●●●●● diff \| view \| raw \| blame \| history