school-web.git - Gitblit

智慧校园项目

liuyg

2021-12-31 5c7c3cc18ce38ec6897808d63359cf774b958a30

refs
author	liuyg <376836862@qq.com>
	Friday, December 31, 2021 09:05 +0800
committer	liuyg <376836862@qq.com>
	Friday, December 31, 2021 09:05 +0800
commit	5c7c3cc18ce38ec6897808d63359cf774b958a30
tree	5c9e68b654f7f5a4a972c2bc3b7f3999cc5c454f tree \| zip \| gz
parent	85eda2500783417482c1baa708291c9eff8405b9 view \| diff 19621635052322005f31579f7f3d481750898d7c view \| diff

冲突

41 files modified

9 files added

	public/img/icon/monitor.png	diff \| view \| raw \| blame \| history
	public/img/search/dorm.png	diff \| view \| raw \| blame \| history
	public/img/search/ofc.png	diff \| view \| raw \| blame \| history
	public/img/search/org.png	diff \| view \| raw \| blame \| history
	public/img/search/scenery.png	diff \| view \| raw \| blame \| history
	public/img/search/teach.png	diff \| view \| raw \| blame \| history
	public/img/search/venue.png	diff \| view \| raw \| blame \| history
	src/api/pc/public/search.js	16 ●●●●● diff \| view \| raw \| blame \| history
	src/components/arcNavBar/index.vue	66 ●●●●● diff \| view \| raw \| blame \| history
	src/components/leftNav/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/components/campusBuildingSearch.vue	371 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/components/dimension.vue	309 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/components/mapPopup.vue	106 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/index.vue	184 ●●●●● diff \| view \| raw \| blame \| history
	src/components/orgNavBar/index.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/components/serviceNavBar/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/pcLayout/index.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/arc/culture.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/arc/dorm.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/arc/edifact.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/arc/family.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/arc/rest.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/arc/teaching.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/arc/venue.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/campusnavi/index.vue	32 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/directly.vue	43 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/masses.vue	43 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/ofc.vue	43 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/rest.vue	43 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/orgnav/teaching.vue	43 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/aed.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/alleyway.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/bank.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/canteen.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/copy.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/express.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/medical.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/park.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/service.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/showers.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/supermarket.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/pcviews/service/transfer.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/store/getters.js	9 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/mobile.js	224 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/popupParams.js	17 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/search.js	15 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/viewer.js	30 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/divforms/panoramaBox.scss	56 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/divforms/popup.scss	9 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/pcpage/dc-ui.scss	18 ●●●●● diff \| view \| raw \| blame \| history