jfpt-Vue.git - Gitblit

南昌市物联网技防平台-前端

tangzy

2021-03-09 92005c9d1c4e6cb475c09639afc3c3c7c6cf968a

refs
author	tangzy <tangzy123456>
	Tuesday, March 9, 2021 10:17 +0800
committer	tangzy <tangzy123456>
	Tuesday, March 9, 2021 10:17 +0800
commit	92005c9d1c4e6cb475c09639afc3c3c7c6cf968a
tree	83f527274053089f6d20dc6fd71640d6d50c8a48 tree \| zip \| gz
parent	a41db40ca4b9c535c02a8ab5f16ded8bc8501bed view \| diff d38074494d9e14229dbed437e396013bd1862c10 view \| diff

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 Conflicts:
	src/router/views/index.js

10 files modified

1 files added

	public/cdn/element-ui/2.13.2/theme-chalk/index.css	2 ●●●●● diff \| view \| raw \| blame \| history
	src/api/policeInformation/index.js	35 ●●●●● diff \| view \| raw \| blame \| history
	src/router/views/index.js	315 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Video/video.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/clientManagement/clientManagement.vue	77 ●●●●● diff \| view \| raw \| blame \| history
	src/views/policeInformationDistribution/index.vue	68 ●●●●● diff \| view \| raw \| blame \| history
	src/views/policeTracking/policeTracking.vue	194 ●●●●● diff \| view \| raw \| blame \| history
	src/views/realTimePolice/real.vue	78 ●●●●● diff \| view \| raw \| blame \| history
	src/views/realTimePolice/realHistory.vue	19 ●●●●● diff \| view \| raw \| blame \| history
	src/views/security/security.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	vue.config.js	4 ●●●●● diff \| view \| raw \| blame \| history