~admin/zhba_enterprises.git

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

liuyg

2021-12-25 ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1

refs
author	liuyg <376836862@qq.com>
	Saturday, December 25, 2021 15:08 +0800
committer	liuyg <376836862@qq.com>
	Saturday, December 25, 2021 15:08 +0800
commit	ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1
tree	3a3580ab02b3684f60df0b38d5f395f14716400c tree \| zip \| gz
parent	23450449213a356ab836749a969f1b6426c2b15e view \| diff da9e4db4b9d0243fb6cb974fd030ad0535b372aa view \| diff

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

40 files modified

17 files added

	package.json	3 ●●●●● diff \| view \| raw \| blame \| history
	public/img/securityInfo/security.png	diff \| view \| raw \| blame \| history
	public/img/top/driver.png	diff \| view \| raw \| blame \| history
	public/img/top/heard.png	diff \| view \| raw \| blame \| history
	public/img/top/heard1.png	diff \| view \| raw \| blame \| history
	public/securityInfo.html	324 ●●●●● diff \| view \| raw \| blame \| history
	public/securityInfos1.html	218 ●●●●● diff \| view \| raw \| blame \| history
	src/api/accreditationRecords/accreditationRecords.js	10 ●●●●● diff \| view \| raw \| blame \| history
	src/api/examapi/examination.js	8 ●●●●● diff \| view \| raw \| blame \| history
	src/api/examapi/modifiedGrades.js	8 ●●●●● diff \| view \| raw \| blame \| history
	src/api/securityUnit/securityUnit.js	276 ●●●●● diff \| view \| raw \| blame \| history
	src/api/statisticalQueryManagement/statisticalQueryManagement.js	88 ●●●●● diff \| view \| raw \| blame \| history
	src/components/liu-legend/Legend.vue	54 ●●●●● diff \| view \| raw \| blame \| history
	src/lang/zh.js	218 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/top/index.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/top/top-drive.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/top/top-userSManual.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/router/views/index.js	2048 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/element-ui.scss	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/accreditationRecords/accreditationRecordsPaper.vue	112 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dispatch/dispatch.vue	133 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dispatch/dispatchChildoperable.vue	149 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/car.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/equipments.vue	36 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/gun.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityEquipment/gun.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/data.js	1261 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/securityGuard.vue	142 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuard/sfzJS.js	86 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnit/armedEscort.vue	521 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnit/data.js	221 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnit/localCompany.vue	531 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnit/securityTraining.vue	534 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnit/selfRecruitedSecurityGuard.vue	514 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnit/transRegionalcompany.vue	512 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/data.js	418 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/index copy.vue	1182 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/index.vue	1425 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/manager.vue	337 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/shareholder.vue	383 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityUnitChild/social.vue	33 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/businessStatistics.vue	423 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/businessStatisticsDetail.vue	241 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/businessStatisticsFwdq.vue	221 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/businessStatisticsPq.vue	219 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/companyDetails.vue	396 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/securityGuardDetail.vue	265 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/securityGuardStatistics.vue	351 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainApply/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/index.vue	268 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/modifiedGrades.vue	320 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/performance.vue	111 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainExam/singleperformance.vue	39 ●●●●● diff \| view \| raw \| blame \| history
	src/views/traincompany/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainingRegistration/data.js	418 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainingRegistration/index.vue	52 ●●●●● diff \| view \| raw \| blame \| history
	src/views/workreport/workreport.vue	5 ●●●●● diff \| view \| raw \| blame \| history