~admin/zhba_enterprises.git

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-08-12 195c2e87ab1d456b1cbfd28057836c42152ce7de

refs
author	shuishen <1109946754@qq.com>
	Thursday, August 12, 2021 11:08 +0800
committer	shuishen <1109946754@qq.com>
	Thursday, August 12, 2021 11:08 +0800
commit	195c2e87ab1d456b1cbfd28057836c42152ce7de
tree	a4dd4b1665cf3092e62c548f63c7d819b9493810 tree \| zip \| gz
parent	9be738825ba05835edc2c5387185a06ed76a61ac view \| diff 85e31ab46cfa76de986e6084e7e4dfda35ac98e6 view \| diff

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

31 files modified

10 files added

	public/img/bazbj.png	diff \| view \| raw \| blame \| history
	public/img/security.png	diff \| view \| raw \| blame \| history
	public/papersApply.html	156 ●●●●● diff \| view \| raw \| blame \| history
	public/securityPrint.html	271 ●●●●● diff \| view \| raw \| blame \| history
	src/api/examapi/applyexam.js	35 ●●●●● diff \| view \| raw \| blame \| history
	src/api/performance/performance.js	27 ●●●●● diff \| view \| raw \| blame \| history
	src/api/securityGuard/securityGuard.js	21 ●●●●● diff \| view \| raw \| blame \| history
	src/api/system/user.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/api/talk/talk.js	50 ●●●●● diff \| view \| raw \| blame \| history
	src/api/trainingRegistration/trainingRegistration.js	11 ●●●●● diff \| view \| raw \| blame \| history
	src/router/views/index.js	1686 ●●●●● diff \| view \| raw \| blame \| history
	src/views/applydetailed/index.vue	1263 ●●●●● diff \| view \| raw \| blame \| history
	src/views/applydetailed/papers.vue	40 ●●●●● diff \| view \| raw \| blame \| history
	src/views/applyexam/index.vue	305 ●●●●● diff \| view \| raw \| blame \| history
	src/views/applyexam/papers.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/companyApply/index.vue	634 ●●●●● diff \| view \| raw \| blame \| history
	src/views/desk/notice.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dispatch/dispatchChildoperable.vue	28 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dispatch/dispatchChildoperableSee.vue	31 ●●●●● diff \| view \| raw \| blame \| history
	src/views/exam/papers.vue	39 ●●●●● diff \| view \| raw \| blame \| history
	src/views/exam/performance.vue	48 ●●●●● diff \| view \| raw \| blame \| history
	src/views/exam/singleperformance.vue	81 ●●●●● diff \| view \| raw \| blame \| history
	src/views/people/expression.vue	39 ●●●●● diff \| view \| raw \| blame \| history
	src/views/people/job.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/uploadNotice.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityApply/index.vue	144 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/car.js	18 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/car.vue	77 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/equipments.js	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/equipments.vue	77 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/gun.js	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/gun.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityGuard.vue	81 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityGuardDetail.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnit/data.js	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnit/index.vue	71 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/data.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/index.vue	246 ●●●●● diff \| view \| raw \| blame \| history
	src/views/talk/talk.vue	266 ●●●●● diff \| view \| raw \| blame \| history
	src/views/traincompany/index.vue	63 ●●●●● diff \| view \| raw \| blame \| history
	vue.config.js	8 ●●●●● diff \| view \| raw \| blame \| history