From 0e26813bc527cf35f5144373308c8a938aa8cd80 Mon Sep 17 00:00:00 2001 From: tgd Date: Mon, 16 Dec 2019 18:17:00 +0800 Subject: [PATCH] marker --- README.md | 4 +- src/assets/gis/monitor-active.png | Bin 0 -> 1729 bytes src/assets/gis/monitor.png | Bin 0 -> 1275 bytes src/router/routes.js | 56 ++++++------ src/views/home/index.vue | 6 +- src/views/{test => marker}/index.vue | 2 +- src/views/marker/markers/index.vue | 81 ++++++++++++++++++ src/views/marker/one/index.vue | 77 +++++++++++++++++ src/views/{test/hh => marker/popup}/index.vue | 2 +- src/views/test/test1/index.vue | 5 -- src/views/test/test2/index.vue | 5 -- 11 files changed, 193 insertions(+), 45 deletions(-) create mode 100644 src/assets/gis/monitor-active.png create mode 100644 src/assets/gis/monitor.png rename src/views/{test => marker}/index.vue (59%) create mode 100644 src/views/marker/markers/index.vue create mode 100644 src/views/marker/one/index.vue rename src/views/{test/hh => marker/popup}/index.vue (72%) delete mode 100644 src/views/test/test1/index.vue delete mode 100644 src/views/test/test2/index.vue diff --git a/README.md b/README.md index 7305684..d7d444d 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ 本项目实现demo内容有： -> - [ ] 使用起步 -> - [ ] 打点(一个点、多个点、带popup的点) +> - [x] 使用起步 +> - [x] 打点(一个点、多个点、带popup的点) > - [x] 使用 ## 使用起步 diff --git a/src/assets/gis/monitor-active.png b/src/assets/gis/monitor-active.png new file mode 100644 index 0000000000000000000000000000000000000000..4cccb7acde361c5c051b7dd31a2bf669679fab98 GIT binary patch literal 1729 zcmV;y20rX=70wKxmydX%Hm%M22zvP~C?z!Ln?svaO@M5HH zPvslh2P(j0C=m?+&>KK|FbV)z9e{EWu7KeTadeR9s`lr_=hb?#1V{>4dE}E0u$ZO; zRuw>DQaCmYp%M(+WgIQbOHf~w!gFgVNuTZ?!gI43u{mG}kRm98u@W&&Eu*=65;c$9 z>4+K{XHZ3Pz^?%Mzkm^YD&YagFjPoa$r>Vb%W&ItAiLXG(e?$td+sqqrb%MgFT~ivKCQ7NW**x6hj=v81Ta||u;AQMT&=$8j`OE3Q8UcWP>Mdi8}W1rfR7k+ zLH}8JrA=QK)66O0!Y&ya|1Ybrz>JewsI%0In&OB{)+#pb5&*UcDGM`JgR!Y%jM$K9 zWcHgTIWmsG-)`ZreYd@C?lB>+bM?TiH9bB6?{0E6XZedBW$^@#f|FQXy+e_ce^H| zPjIA5skx`V!i}0c;!z@6n6FT0ld@2i1BU5h$WXr!tRDDHb51njDojRXo?L8qwF!g; z(X-GexTl?*@c)X^bvW_(jChm?hjj{#f|Lf;K>%-vA-e>0!qV6*CqrAVY4Q8r15UJ; zgL@$>dS;8GY&_KU7dON3@Gp0Us&ooXYr)W60G-5;!gXI0x1=fmZ7?Bsa!NP2+;Ka< zP^=ob*eA=bJMi^i|A= znqqH=0aK67g|VU1ePT0nln|i?0L~fPf|}OjZH(-k^fWe&mg+4gEIhLex1apejFig) zksUJ|FSTlKcf?mJuVc~K<({u2QH)@y0uaCQf=UPfc32WS&*`R_EGF!|tH+J%JGKfw zCVUv$__lUhIHzO-PL&mTG{ksoq+qB7K$Iu+*zgf}r~6w^VNx2+#z>xcbOx(0s6ELG z5oJEIwt+$pX~8hwBLhHs@+72{G>5YVnPuRLcp_xb%^yz)AJe`-ag(gfJ-(bAi zWdw$HN^qi`D=S6b^3-7)N7i=?FvfDA=P{$ zI3@-HWdT?*$k~waii>qbE&HULq767-AvC1+gNStb3bkFyv9EC1*_?9dtpb3JbtETt zj6;_eNA_&qv4yq&Z8RCN=k@_unAO1zE}Bq3Xt!c(dCLi>lABtb>T4+r+Qz_AJf6|> z1Bxsreni3WpB^|x&6Q@7K1tSA)_pw~GM;};5hkHf#&aoo@tewAA>2Mn;}2#i8OPQF z==kEsSS=Bk6`c^VGMlm;&hMGJ$5&GM$D~mB@mXMO3P7!%!orL+#OBLw@;JstLEZ%o`D9;m5tf%x3{KmTQha&?Tt1c%vcdmU$znJf!*x zgn1x3pi`)ad&BkmmPrv$)u+nMe9(FDG)DOHl)`a`d9ECC6ihiXx#y0-KVN-OGXnoV X_=qn?dI5=>00000NkvXXu0mjf&8IF! literal 0 HcmV?d00001 diff --git a/src/assets/gis/monitor.png b/src/assets/gis/monitor.png new file mode 100644 index 0000000000000000000000000000000000000000..9ee5199469c252eef767ebf9b6eafe37b3b6b6b0 GIT binary patch literal 1275 zcmVIp00^+;i^{ ze2#%@G(Fm#LKP+fBNgr!=ws*#R|S3pj*7B7c!R35rEWrbBD$GkYM0x~|)v|eefh(W19(5GV?Od%S8HP;(hSpTv#IN5L%5c)y~5@kEe zh|W0fz!7Q)GR1mc&L*#Q5D<#!Bfxgxp8v&pyOB!-nQRrw&xv+z0y00>!2w|p!rgAp zhor-d!SHB*=-)ez`n>^uya-!s;gnbEDSyY52^Z!_ZJYhu0z#kaU8M0V%1|fgT?4Q< z4~m9Dz$J5H3L8(tl4@v)ti z4RmlC^zLe3eg6=AcHBNUZy3Bb+CF!!8OBt)yBB4Pi9ii7+zobkI`l{?#N)q&t2gb8 zKHXs7v-Y{BDCBPS*uPL?1ep8S*9}%x2!mSQy!MgrB4BTlfHPO1aEIp+T$Zc~ZFWmQ zLtQ);W)86%`QQ+&J7J%jI}BdUwa;xj1xpUN3owajB5)1pMtSY8cVTPveaJIAbI8QvmbKvS^|wwntGs z{sV@Q=ll-bKzZ0Ik(PJT_JD>Wx&ZhvS-`pi7M)+|}ow$kxe zT%pTQ7TuXUpJ-vZHCx_FL_7Bd6}kvzsoNLLr@KU$Dl9%V|^!-Z+mm@0a{1lWwM(XIn}@=#Q%5=d)V6B;$fl=C;(MX5BW za+)#;{TK*EbUyG=>s@~1T(PY5!}FblDUDTXFuRe1s&uik8O39AD<#JPaOX#mU?gj! lJ{eR3b+hEV&Nw%m{{Y|2dW`8L?;!vH002ovPDHLkV1fdTN4o$3 literal 0 HcmV?d00001 diff --git a/src/router/routes.js b/src/router/routes.js index 64087e9..ab146e7 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -6,6 +6,34 @@ const routes = [ icon: 'el-icon-s-home', component: () => import('@/views/home') }, + { + path: '/marker', + redirect: '/marker/one', + name: 'marker', + text: '打点', + icon: 'el-icon-s-help', + component: () => import('@/views/marker'), + children: [ + { + path: '/marker/one', + name: 'oneMarker', + text: '打一个点', + component: () => import('@/views/marker/one') + }, + { + path: '/marker/markers', + name: 'markers', + text: '打多个点', + component: () => import('@/views/marker/markers') + }, + { + path: '/marker/popup', + name: 'popup', + text: '打点带popup', + component: () => import('@/views/marker/popup') + } + ] + }, { path: '/base', redirect: '/base/start', @@ -21,34 +49,6 @@ const routes = [ component: () => import('@/views/base/start') } ] - }, - { - path: '/test', - redirect: '/test/test1', - name: 'test', - text: '测试', - icon: 'el-icon-s-help', - component: () => import('@/views/test'), - children: [ - { - path: '/test/test1', - name: 'test1', - text: '测试1', - component: () => import('@/views/test/test1') - }, - { - path: '/test/test2', - name: 'test2', - text: '测试2', - component: () => import('@/views/test/test2') - }, - { - path: '/test/hh', - name: 'hh', - text: 'hh', - component: () => import('@/views/test/hh') - } - ] } ] diff --git a/src/views/home/index.vue b/src/views/home/index.vue index d0df479..b9634a5 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -53,9 +53,9 @@ export default { maxZoom: 18, // 最大缩放 minZoom: 1, // 最小缩放 layers: [normal], // 地图图层 - zoomControl: false, // 是否显示放大缩小按钮 - attributionControl: false, // 是否关闭leaflet广告链接（在地图的右下角） - closePopupOnClick: true, // 点击地图是否关闭popup + zoomControl: false, // 是否显示放大缩小按钮 + attributionControl: false, // 是否关闭leaflet广告链接（在地图的右下角） + closePopupOnClick: true // 点击地图是否关闭popup }) // 地图模式切换 L.control.layers(baseLayers, null).addTo(map) diff --git a/src/views/test/index.vue b/src/views/marker/index.vue similarity index 59% rename from src/views/test/index.vue rename to src/views/marker/index.vue index bfb4615..2df5a89 100644 --- a/src/views/test/index.vue +++ b/src/views/marker/index.vue @@ -1,5 +1,5 @@ diff --git a/src/views/marker/markers/index.vue b/src/views/marker/markers/index.vue new file mode 100644 index 0000000..852d533 --- /dev/null +++ b/src/views/marker/markers/index.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/marker/one/index.vue b/src/views/marker/one/index.vue new file mode 100644 index 0000000..556d39b --- /dev/null +++ b/src/views/marker/one/index.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/views/test/hh/index.vue b/src/views/marker/popup/index.vue similarity index 72% rename from src/views/test/hh/index.vue rename to src/views/marker/popup/index.vue index df45597..a179b94 100644 --- a/src/views/test/hh/index.vue +++ b/src/views/marker/popup/index.vue @@ -1,5 +1,5 @@ diff --git a/src/views/test/test1/index.vue b/src/views/test/test1/index.vue deleted file mode 100644 index 1820ebc..0000000 --- a/src/views/test/test1/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/test/test2/index.vue b/src/views/test/test2/index.vue deleted file mode 100644 index 9b7c9e4..0000000 --- a/src/views/test/test2/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - -- GitLab