map3d.git - Gitblit

Merge remote-tracking branch 'origin/master'

nnnjjj123

2020-11-17 e7bc0b68e57e1f2824a71873bc4ef22eb1e65084

refs
author	nnnjjj123 <494715143@qq.com>
	Tuesday, November 17, 2020 09:52 +0800
committer	nnnjjj123 <494715143@qq.com>
	Tuesday, November 17, 2020 09:52 +0800
commit	e7bc0b68e57e1f2824a71873bc4ef22eb1e65084
tree	a44e4cca0c920f13a21b1abe120b62b0985cc4d1 tree \| zip \| gz
parent	2802da3920634cc9c02ee3ceb993f5bfa5d49e8b view \| diff 5e5f9801348e283fe293cf040c748ec1c0c8a9e8 view \| diff

Merge remote-tracking branch 'origin/master'

6 files modified

28 files added

	config.json	75 ●●●●● diff \| view \| raw \| blame \| history
	images/circle_bg.png	diff \| view \| raw \| blame \| history
	images/zhui.glb	diff \| view \| raw \| blame \| history
	jimu.js/MapManager.js	18 ●●●●● diff \| view \| raw \| blame \| history
	themes/FoldableTheme/widgets/HeaderController/Widget.js	2 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Basemap/Widget.js	189 ●●●●● diff \| view \| raw \| blame \| history
	widgets/HawkEyeMap/Widget.html	2 ●●●●● diff \| view \| raw \| blame \| history
	widgets/HawkEyeMap/Widget.js	56 ●●●●● diff \| view \| raw \| blame \| history
	widgets/HawkEyeMap/css/style.css	diff \| view \| raw \| blame \| history
	widgets/HawkEyeMap/images/icon.png	diff \| view \| raw \| blame \| history
	widgets/HawkEyeMap/manifest.json	18 ●●●●● diff \| view \| raw \| blame \| history
	widgets/HawkEyeMap/nls/es/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/HawkEyeMap/nls/strings.js	7 ●●●●● diff \| view \| raw \| blame \| history
	widgets/HawkEyeMap/nls/zh-cn/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/SectionChart.js	236 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/Widget.html	6 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/Widget.js	56 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/Widget1.js	276 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/css/style.css	70 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/images/icon.png	diff \| view \| raw \| blame \| history
	widgets/MapSection/manifest.json	18 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/nls/es/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/nls/strings.js	7 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapSection/nls/zh-cn/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/PathShow/Widget.js	37 ●●●●● diff \| view \| raw \| blame \| history
	widgets/PathShow/nls/zh-cn/strings.js	2 ●●●●● diff \| view \| raw \| blame \| history
	widgets/PictureAnimation/Widget.html	2 ●●●●● diff \| view \| raw \| blame \| history
	widgets/PictureAnimation/Widget.js	64 ●●●●● diff \| view \| raw \| blame \| history
	widgets/PictureAnimation/css/style.css	diff \| view \| raw \| blame \| history
	widgets/PictureAnimation/images/icon.png	diff \| view \| raw \| blame \| history
	widgets/PictureAnimation/manifest.json	18 ●●●●● diff \| view \| raw \| blame \| history
	widgets/PictureAnimation/nls/es/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/PictureAnimation/nls/strings.js	7 ●●●●● diff \| view \| raw \| blame \| history
	widgets/PictureAnimation/nls/zh-cn/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history