zhba/zhba_regulatory.git

保安监管系统

liuyg

2021-08-13 754b3824cdbb3c530ca6858db3fcce113b0e66c3

refs
author	liuyg <376836862@qq.com>
	Friday, August 13, 2021 21:03 +0800
committer	liuyg <376836862@qq.com>
	Friday, August 13, 2021 21:03 +0800
commit	754b3824cdbb3c530ca6858db3fcce113b0e66c3
tree	6c0ab304c2cc483bc1dc48a431f3c07239eae970 tree \| zip \| gz
parent	dc5516d68526bbcb9c45190984c3425f0268b7f3 view \| diff 9a4b8c7ad8d51c5b588d5679b72045efd93a79a7 view \| diff

冲突

13 files modified

14 files added

	public/carVideo/children.html	503 ●●●●● diff \| view \| raw \| blame \| history
	public/carVideo/demo_window_integration.html	1120 ●●●●● diff \| view \| raw \| blame \| history
	public/carVideo/demo_window_simple_playback.html	320 ●●●●● diff \| view \| raw \| blame \| history
	public/carVideo/demo_window_simple_preview.html	299 ●●●●● diff \| view \| raw \| blame \| history
	public/carVideo/jquery-1.12.4.min.js	74 ●●●●● diff \| view \| raw \| blame \| history
	public/carVideo/jsWebControl-1.0.0.min.js	36 ●●●●● diff \| view \| raw \| blame \| history
	public/carVideo/jsencrypt.min.js	1 ●●●●● diff \| view \| raw \| blame \| history
	public/carVideo/parent.html	184 ●●●●● diff \| view \| raw \| blame \| history
	public/carVideo/webs.exe	diff \| view \| raw \| blame \| history
	public/carVideo/使用前必读.txt	4 ●●●●● diff \| view \| raw \| blame \| history
	public/index.html	9 ●●●●● diff \| view \| raw \| blame \| history
	public/libs/jquery-1.12.4.min.js	74 ●●●●● diff \| view \| raw \| blame \| history
	public/libs/jsWebControl-1.0.0.min.js	36 ●●●●● diff \| view \| raw \| blame \| history
	public/libs/jsencrypt.min.js	1 ●●●●● diff \| view \| raw \| blame \| history
	public/libs/webs.exe	diff \| view \| raw \| blame \| history
	src/api/qualificationExamination/scoreInquiry.js	11 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/main.vue	140 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/common.scss	28 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/map.scss	62 ●●●●● diff \| view \| raw \| blame \| history
	src/views/commandQuery/taskDistribution.vue	724 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/index.scss	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/map/carGps.vue	684 ●●●●● diff \| view \| raw \| blame \| history
	src/views/qualificationExamination/paymentInquiry.vue	777 ●●●●● diff \| view \| raw \| blame \| history
	src/views/record/record.vue	142 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/attach.vue	745 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/uploadNotice.vue	689 ●●●●● diff \| view \| raw \| blame \| history
	vue.config.js	4 ●●●●● diff \| view \| raw \| blame \| history