~admin/zhba_enterprises.git

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

shuishen

2021-09-13 b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1

refs
author	shuishen <1109946754@qq.com>
	Monday, September 13, 2021 17:14 +0800
committer	shuishen <1109946754@qq.com>
	Monday, September 13, 2021 17:14 +0800
commit	b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1
tree	ad24f12ab957528068e533eafa313cf489df4ba5 tree \| zip \| gz
parent	4da370f500cbabfbeb75f8006b8a3403656c4c5f view \| diff 62f9cc4db899154e9e4043a7f1ea6eece8d4632c view \| diff

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

43 files modified

10 files added

	public/img/securityCertificate/123.png	diff \| view \| raw \| blame \| history
	public/img/securityCertificate/QQ截图.png	diff \| view \| raw \| blame \| history
	public/img/securityCertificate/bj.jpeg	diff \| view \| raw \| blame \| history
	public/img/securityCertificate/bj2.jpeg	diff \| view \| raw \| blame \| history
	public/papersTrain.html	222 ●●●●● diff \| view \| raw \| blame \| history
	src/api/exam/examPayment.js	52 ●●●●● diff \| view \| raw \| blame \| history
	src/api/examapi/applyexam.js	9 ●●●●● diff \| view \| raw \| blame \| history
	src/api/examapi/performance.js	37 ●●●●● diff \| view \| raw \| blame \| history
	src/api/system/dept.js	16 ●●●●● diff \| view \| raw \| blame \| history
	src/api/system/user.js	3 ●●●●● diff \| view \| raw \| blame \| history
	src/api/trainingRegistration/trainingRegistration.js	26 ●●●●● diff \| view \| raw \| blame \| history
	src/api/zc/zc.js	57 ●●●●● diff \| view \| raw \| blame \| history
	src/config/website.js	76 ●●●●● diff \| view \| raw \| blame \| history
	src/lang/zh.js	209 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/tags.vue	357 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/top/top-menu.vue	108 ●●●●● diff \| view \| raw \| blame \| history
	src/page/login/codelogin.vue	331 ●●●●● diff \| view \| raw \| blame \| history
	src/page/login/index.vue	47 ●●●●● diff \| view \| raw \| blame \| history
	src/router/views/index.js	29 ●●●●● diff \| view \| raw \| blame \| history
	src/store/getters.js	1 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/user.js	60 ●●●●● diff \| view \| raw \| blame \| history
	src/views/applydetailed/index.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/applyexam/index.vue	200 ●●●●● diff \| view \| raw \| blame \| history
	src/views/applyexam/papers.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/views/companyApply/index.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dispatch/dispatchChildoperable.vue	21 ●●●●● diff \| view \| raw \| blame \| history
	src/views/exam/examPayment.vue	394 ●●●●● diff \| view \| raw \| blame \| history
	src/views/licenseApproval/branchOffice.vue	23 ●●●●● diff \| view \| raw \| blame \| history
	src/views/licenseApproval/crossRegion.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/views/licenseApproval/securityGuard.vue	23 ●●●●● diff \| view \| raw \| blame \| history
	src/views/licenseApproval/securityTraining.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/uploadNotice.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/uploadNotification.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/uploadPolicyRelease.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityAnalysis/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/equipments.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityCertificate.vue	161 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityGuard.vue	54 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityGuardDetail.vue	21 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/businessLicense.vue	27 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/data.js	678 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/index.vue	81 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/licence.vue	27 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/social.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/user.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainApply/index.vue	136 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/index.vue	30 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/performance.vue	51 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/singleperformance.vue	23 ●●●●● diff \| view \| raw \| blame \| history
	src/views/traincompany/index.vue	112 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainingRegistration/data.js	84 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainingRegistration/index.vue	228 ●●●●● diff \| view \| raw \| blame \| history
	src/views/zc/zc.vue	295 ●●●●● diff \| view \| raw \| blame \| history