school-web.git - Gitblit

Merge branch 'master' of http://192.168.0.105:10010/r/school-web

liuyg

2021-12-21 e98c241635131220b9374596facd9bba36e57f17

refs
author	liuyg <376836862@qq.com>
	Tuesday, December 21, 2021 17:19 +0800
committer	liuyg <376836862@qq.com>
	Tuesday, December 21, 2021 17:19 +0800
commit	e98c241635131220b9374596facd9bba36e57f17
tree	c4f8c1dc7ff313dee079e6e7e1be58d75eaa29e7 tree \| zip \| gz
parent	81773ab04fd259e893c2d7f08dbdc9be772d01c4 view \| diff 0e461a232cce6e52fbfd071788bdd7294d51e397 view \| diff

Merge branch 'master' of http://192.168.0.105:10010/r/school-web

21 files modified

30 files added

	public/examples/images/icon/elec.png	diff \| view \| raw \| blame \| history
	public/examples/images/icon/img.png	diff \| view \| raw \| blame \| history
	public/examples/images/icon/ter.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-aed.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-cr.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-cs.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-fy.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-kd.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-st.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-tc.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-tx.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-yh.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-yl.png	diff \| view \| raw \| blame \| history
	public/img/icon/service-ys.png	diff \| view \| raw \| blame \| history
	public/img/navicon/audio.png	diff \| view \| raw \| blame \| history
	src/api/pc/public/arc.js	10 ●●●●● diff \| view \| raw \| blame \| history
	src/api/pc/service/index.js	96 ●●●●● diff \| view \| raw \| blame \| history
	src/components/arcNavBar/index.vue	71 ●●●●● diff \| view \| raw \| blame \| history
	src/components/campusNav/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/components/leftNav/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/component/mapPopup.vue	179 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/index.vue	129 ●●●●● diff \| view \| raw \| blame \| history
	src/components/orgNavBar/index.vue	68 ●●●●● diff \| view \| raw \| blame \| history
	src/components/serviceNavBar/index.vue	443 ●●●●● diff \| view \| raw \| blame \| history
	src/pcLayout/index.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/directly.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/masses.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/ofc.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/rest.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/teaching.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/aed.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/alleyway.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/bank.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/canteen.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/copy.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/express.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/medical.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/park.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/service.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/showers.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/supermarket.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/transfer.vue	35 ●●●●● diff \| view \| raw \| blame \| history
	src/router/page/index.js	367 ●●●●● diff \| view \| raw \| blame \| history
	src/store/getters.js	6 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/popupParams.js	25 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/divforms/panoramaBox.scss	12 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/divforms/popup.scss	37 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/layout/pc.scss	12 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/pcpage/dc-ui.scss	13 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/pcpage/index.scss	1 ●●●●● diff \| view \| raw \| blame \| history