zhba/zhba_regulatory.git

refs
author	liuyg <liuyg@qq.com>
	Wednesday, February 16, 2022 17:22 +0800
committer	liuyg <liuyg@qq.com>
	Wednesday, February 16, 2022 17:22 +0800
commit	af0aaf0fe19dc69369ee2f7e5ca001c24353a22e
tree	280a88a9702a6ed9f02d98a93a16fae7751c2e51 tree \| zip \| gz
parent	dc252ad2bd275f697c266e3c8b10cb7d540fdcaa view \| diff 07f3df4bdaea6c4e90439a60362e3f99da073413 view \| diff

冲突

	public/geo.js	153 ●●●●● diff \| view \| raw \| blame \| history
	public/index.html	3 ●●●●● diff \| view \| raw \| blame \| history
	public/scoket.html	60 ●●●●● diff \| view \| raw \| blame \| history
	src/api/index/index.js	34 ●●●●● diff \| view \| raw \| blame \| history
	src/api/loginRecord/loginRecord.js	25 ●●●●● diff \| view \| raw \| blame \| history
	src/api/map/car.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/api/map/gun.js	10 ●●●●● diff \| view \| raw \| blame \| history
	src/api/map/people.js	12 ●●●●● diff \| view \| raw \| blame \| history
	src/api/qualificationExamination/signQualificationExamination.js	12 ●●●●● diff \| view \| raw \| blame \| history
	src/api/securityCompany/companyDetails.js	146 ●●●●● diff \| view \| raw \| blame \| history
	src/api/securityCompany/security.js	144 ●●●●● diff \| view \| raw \| blame \| history
	src/api/system/user.js	8 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/main.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/logo.vue	64 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/top/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/map.scss	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/index.scss	11 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/index.vue	373 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/indexEchart.js	52 ●●●●● diff \| view \| raw \| blame \| history
	src/views/loginRecord/loginRecord.vue	192 ●●●●● diff \| view \| raw \| blame \| history
	src/views/map/carGps.vue	234 ●●●●● diff \| view \| raw \| blame \| history
	src/views/map/carGps1.vue	227 ●●●●● diff \| view \| raw \| blame \| history
	src/views/map/gunGps.vue	689 ●●●●● diff \| view \| raw \| blame \| history
	src/views/map/peopleGps.vue	100 ●●●●● diff \| view \| raw \| blame \| history
	src/views/onSiteInspection/company.vue	27 ●●●●● diff \| view \| raw \| blame \| history
	src/views/onSiteInspection/data.js	45 ●●●●● diff \| view \| raw \| blame \| history
	src/views/onSiteInspection/securityStaff.vue	26 ●●●●● diff \| view \| raw \| blame \| history
	src/views/qualificationExamination/data.js	45 ●●●●● diff \| view \| raw \| blame \| history
	src/views/qualificationExamination/registrationTrainingQuery.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/qualificationExamination/scoreInquiry.vue	178 ●●●●● diff \| view \| raw \| blame \| history
	src/views/regulatoryInformation/data.js	45 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityCompany/armed.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityCompany/companyDetails copy.vue	752 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityCompany/companyDetails.vue	1797 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityCompany/computents/equipment.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityCompany/computents/service.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityCompany/data.js	45 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityCompany/security.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityCompany/train.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuardManagement/dispatchChildoperable copy.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuardManagement/register.vue	43 ●●●●● diff \| view \| raw \| blame \| history
	src/views/securityGuardManagement/registerOnce.vue	15 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/businessStatisticsDetail.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/businessStatisticsFwdq.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/companyDetails.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/informationLoginStatistics.vue	275 ●●●●● diff \| view \| raw \| blame \| history
	src/views/statisticalQueryManagement/securityGuardDetail.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/talk/talk.vue	1 ●●●●● diff \| view \| raw \| blame \| history