ry-vue-map 0.2.2 → 0.2.3

package/src/views/map/index.vue

@@ -2,11 +2,11 @@
 	<div class="map-style">
 
 		<ry-map projection="EPSG:4326" :zoom="15" :minZoom="1" :maxZoom="maxZoom" :center="center" @load="load($event)"
-			:isCrossHair="isRyMapTool" :isRight="true" :isRyMapTool="false" @drawSuccess="drawSuccess"
-			@drawError="drawError" :isShowRangingTool="true" :isShowDrawTool="isRyMapTool" :bindMapClick="true"
+			
+			:bindMapClick="true"
 			@mapClick="mapClick($event)" @crossHairClick="crossHairClick($event)" :bindMapMoveend="true"
 			:isSwitchMapRight='true' :switchMapPosTop='60' :switchMapPosLeftOrRight="20" :switchMapHeight="40" 　
-			:switchMapDefaultTypeOrLayer="[2,2]" @mapMoveend="mapMoveend($event)"
+			:switchMapDefaultTypeOrLayer="[1,2]" @mapMoveend="mapMoveend($event)"
 			@loadDrawPolygonEvent="loadDrawPolygonEvent($event)" :initModifyPolygon="geoJson"
 			@changeSwitchMap="changeSwitchMap($event)"  :isShowSwitchMap="true"
 			>
@@ -24,15 +24,7 @@
 	  :mapType="1" -->
 			<template #marker="{mapDto}">
 				
-				<ry-lines  
-				:map="mapDto.map" 
-				:model="lineData1"  
-				:linenIsert="lineData2"  
-				:clearLiens="clearLiens" 
-				:startMarkerDto ="startMarkerDto" 
-				:endMarkerDto="endMarkerDto" 
-				:lineAppend="lineAppend"
-				></ry-lines>
+			
 				<!-- <ry-polygon  :map="mapDto.map" :isShow="true" :polygonColor="colors" :model="polygonModel" :clear="isClear"  @onLoad="onLoad($event)"></ry-polygon> -->
 			<!-- 	<ry-polygon :isFit="false" :gpsType="gpsType" :map="mapDto.map" :model="polygonModel"></ry-polygon> -->
 			<!-- 	<ry-polygon-geo :isFit="true" :gpsType="gpsType"  :map="mapDto.map" :model="polygonModel6" > </ry-polygon-geo> -->
@@ -45,60 +37,29 @@
 
 	<!-- <ry-polygons
       :map="mapDto.map"
+	  v-if="modelArr.length"
       :modelArr="modelArr"
       @onLoad="onLoad($event)"
       :isShowPolygon="showPolygon" 
-	  :isCheckPointHide="isCheckPoint" 
+	
 	  :inserts="inserts" 
-	  :gpsType="gpsType"></ry-polygons>
-       <ry-clusters-marker
-	   :src="src" text="个" 
+	  :gpsType="gpsType"></ry-polygons> -->
+      <ry-clusters
+	   :src="src" 
 	   fontColor="red" 
 	   :fontSize="23" 
 	   :distance="200"
 	   :gpsType="gpsType" 
 	   @callback="clusterCallback($event)"  
 	   :map="mapDto.map" 
-	   :modelArr="modelArr2" 
-	   :offsetY="0"></ry-clusters-marker> -->
+	   :modelArr="modelArr" 
+	   :offsetY="0"></ry-clusters>
 
 			</template>
 
 		</ry-map>
-
-		<!-- <ry-map
-     projection="EPSG:4326"
-    :mapType="1"
-    :zoom="15"
-    :minZoom="1"
-    :maxZoom="28"
-    :bbox="bbox"
-    :center="center"
-    @load="load($event)"
-
-    >
-      <template slot="maptool">
-        <button>ry</button>
-      </template>
-    </ry-map> -->
-
-		<!-- <RyMapTool v-if="lMap" :lMap="lMap"
-
-      :isCrossHair="true"
-      :isRight="true"
-      :isRyMapTool="true"
-      @success="drawSuccess"
-      @error="drawError"
-      :isShowRangingTool="true"
-      :isShowDrawTool="true"
-      >
-      <template >
-            <button>ry</button>
-          </template>
-     </RyMapTool> -->
-		<button @click="onClick()">测试</button>
-		<button @click="onClick2()">测试2</button>
-		<button @click="onClick3()">测试3</button>
+		
+		
 	</div>
 </template>
 
@@ -108,7 +69,7 @@
 	import RyMapTool from '@/components/maps/ryMapTool/src/index.vue';
 	import RyPolygon from '@/components/maps/ryPolygon/src/index.vue';
 	import RyPolygons from '@/components/maps/ryPolygons/src/index.vue';
-	import  RyClustersMarker from '@/components/maps/ryClustersMarker/src/index.vue';
+	import  RyClusters from '@/components/maps/ryClusters/src/index.vue';
 	import RyPolygonGeo from '@/components/maps/ryPolygonGeo/src/index.vue';
 	import RyLines from '@/components/maps/ryLines/src/index.vue';
 	import gJson from './3301';
@@ -118,7 +79,8 @@
 		createPolygonBoundary,
 		GPS
 	} from "ry-map";
-	import lineDataArr from './lineData.js';
+	import dksj from './dksj.js';
+	// import lineData2 from './lineData2.js';
 	// import lineData2 from './lineData2.js';
 
 	// import {  convertWGS84,convertGCJ02 } from "ry-map/src/lzh";
@@ -127,79 +89,13 @@
 //   toDateString
 // } from 'ele-admin/packages/util';
 
-	const g1 =
-		"{\"type\":\"Feature\",\"bbox\":[120.15521468766134,30.17913,120.15548537675164,30.179627590685214],\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[120.15521468766134,30.17961706012091],[120.155403,30.17913],[120.15548537675164,30.179627590685214],[120.15521468766134,30.17961706012091]]]},\"properties\":{\"perimeter\":139.0,\"squaremeter\":715.18,\"mu\":1.07,\"center\":[120.15535003220648,30.179378795342608],\"areacode\":\"3301\",\"geohash\":\"wtm7wj\",\"extend\":null}}";
-	const g2 =
-		"{\"type\":\"Feature\",\"bbox\":[120.16310703603898,30.19646189535682,120.16429249947886,30.19696148364998],\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[120.16310703603898,30.196910677880176],[120.16325945237935,30.19646189535682],[120.16429249947886,30.196648182533405],[120.16339493378612,30.19696148364998],[120.16310703603898,30.196910677880176]]]},\"properties\":{\"perimeter\":275.0,\"squaremeter\":3354.54,\"mu\":5.03,\"center\":[120.16369976775891,30.1967116895034],\"areacode\":\"3301\",\"geohash\":\"wtm7y3\",\"extend\":null}}"
-	const g3 =
-		"{\"type\":\"Feature\",\"bbox\":[120.156523,30.175227,120.157111,30.17557],\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[120.156523,30.175545],[120.156875,30.175227],[120.157111,30.17557],[120.156523,30.175545]]]},\"properties\":{\"perimeter\":150.0,\"squaremeter\":1046.35,\"mu\":1.56,\"center\":[120.156817,30.1753985],\"areacode\":\"330102001051\",\"geohash\":\"wtm7wj\",\"extend\":null}}";
-	const g4 =
-		"{\"type\":\"Feature\",\"bbox\":[120.153496,30.182888,120.154153,30.183264],\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[120.153496,30.183246],[120.15385760556681,30.183180460251048],[120.154152,30.183264],[120.15400261288897,30.183120670502092],[120.154153,30.182913],[120.15385966728229,30.182965354602516],[120.153513,30.182888],[120.15357927397686,30.18307737447699],[120.153496,30.183246]]]},\"properties\":{\"perimeter\":219.0,\"squaremeter\":1549.5,\"mu\":2.32,\"center\":[120.1538245,30.183076],\"areacode\":\"330102001051\",\"geohash\":\"wtm7wn\",\"extend\":null}}";
-
-   const g5 = { "type" : "Feature", "geometry" : { "type" : "Polygon", "coordinates" : [[[117.38359500000934, 40.225653000185844], [117.37169399977836, 40.216044000430315], [117.37727099975689, 40.187872999939032], [117.38841300005993, 40.178132000391543], [117.35885300026587, 40.176848000534847], [117.3465460001978, 40.167488999717591], [117.35175400024696, 40.158968999819535], [117.33876800034295, 40.140978000234554], [117.31954199956374, 40.140466000005972], [117.30150999988666, 40.135934000553732], [117.29579599988551, 40.124050000207376], [117.28326899956471, 40.121698000562333], [117.26951999954838, 40.112200999676475], [117.25914100025705, 40.110096999776772], [117.24314500004175, 40.116232000306638], [117.21793400025399, 40.097286999895175], [117.20652400018253, 40.095440000155918], [117.17854350038226, 40.084184500014715], [117.17017799951509, 40.07141100001769], [117.15488100005814, 40.074779999797215], [117.14925799975697, 40.067775000515894], [117.12959300031673, 40.062676000097383], [117.10681600035821, 40.070857999696955], [117.08291199968914, 40.068799000073852], [117.07542499976398, 40.063565999771129], [117.05686199988145, 40.060890000473194], [117.03285199972004, 40.0486830005201], [117.01883800007374, 40.031328999733603], [116.99994350019244, 40.031310499779806], [116.96707899999592, 40.040374000459792], [116.9563190002217, 40.05054400000563], [116.94103300037273, 40.040717000089558], [116.92462199990541, 40.05361200029364], [116.9136429999246, 40.045573000093952], [116.90863500010528, 40.051607000462752], [116.8682639999837, 40.039351000048669], [116.84995300003095, 40.052677000343351], [116.81742500006374, 40.046288999837543], [116.81718899997247, 40.027314999887381], [116.80350200011731, 40.031191999711098], [116.79546099982531, 40.028307999814388], [116.77913000034926, 40.033316000533034], [116.76727300034872, 40.014228999868521], [116.76831499983746, 39.989588000286062], [116.75061900036667, 39.960205999707171], [116.76256299988256, 39.954793000096913], [116.77301399979626, 39.954939999681301], [116.77785500000834, 39.936608000558806], [116.77534600031777, 39.929674000055115], [116.77895799961209, 39.894963000142411], [116.7855879995866, 39.883861999931412], [116.79823700013753, 39.887990000538139], [116.81390799975441, 39.888886000488583], [116.84628399990675, 39.869122000080267], [116.85340500004077, 39.857644000470316], [116.88151200027869, 39.843089000157306], [116.88978599962422, 39.832491999805995], [116.90073800015864, 39.829137999818897], [116.89669399982824, 39.847934000553721], [116.91015299996104, 39.846897000396325], [116.92233299956831, 39.829271999703053], [116.92358799988631, 39.810968000073217], [116.94523699998763, 39.786588999982428], [116.94237999953737, 39.780578999821046], [116.91634100023703, 39.779840999962232], [116.904621000259, 39.762353000190842], [116.89356699951747, 39.757995999815591], [116.90319700024145, 39.74887400003513], [116.90591100039239, 39.730673999805276], [116.88389599960078, 39.724514999967312], [116.87705299969628, 39.715385999864054], [116.8830680000882, 39.702412000513448], [116.89976899953979, 39.685790000208385], [116.9007040003894, 39.675565999970956], [116.88672699975132, 39.671842000008326], [116.87775799983194, 39.674465000459463], [116.85809000025336, 39.669399499787119], [116.84589800009269, 39.663244000110581], [116.84515800014162, 39.654012999800159], [116.82664099968247, 39.643225999680169], [116.82472999968979, 39.635278000079666], [116.83523600034118, 39.623008999965407], [116.82952899976362, 39.618317000329341], [116.8064999998752, 39.614707000227952], [116.78623199960714, 39.609629999924607], [116.77425400032189, 39.592807000242942], [116.76915399985728, 39.603968000522855], [116.75795799976197, 39.61358899993246], [116.71974200009333, 39.615578999970921], [116.70013799986884, 39.613477000163471], [116.70023799998376, 39.608843000504123], [116.72273299952838, 39.592419000336633], [116.69779999997013, 39.587856000354179], [116.68887700037328, 39.595725999954993], [116.6412169995649, 39.605572999894093], [116.63739799971802, 39.594882999750666], [116.62399000013841, 39.592719999828205], [116.60610850020714, 39.607249499864565], [116.59725200007983, 39.610777999804895], [116.59655100012867, 39.621031000480343], [116.5852129997802, 39.623208000149134], [116.56590699980825, 39.619136000326193], [116.56298099977334, 39.603153999857284], [116.5487059997821, 39.59745599969466], [116.51852900031315, 39.595600000439731], [116.52125199997988, 39.571947999700456], [116.49995800006172, 39.554078000299512], [116.4716379998938, 39.548292999722207], [116.47092100010411, 39.538417000244408], [116.43628400000671, 39.527893999708397], [116.43356399957895, 39.517308999910483], [116.41959400016299, 39.514917000219441], [116.4126320001667, 39.521354000286919], [116.40081900039661, 39.521937000192452], [116.41466899967463, 39.495365999741125], [116.43472299996654, 39.485021000219035], [116.44212000023788, 39.475140000510692], [116.44378000034681, 39.461323000056439], [116.44957399954046, 39.456140000260859], [116.44490500006577, 39.445557000555198], [116.43592899982355, 39.440266000275756], [116.42162300020141, 39.439301999887448], [116.41238899975258, 39.447252000479466], [116.38696700012702, 39.451314999887416], [116.37071199965908, 39.451700999701416], [116.33808999985365, 39.447437000017601], [116.31963799969401, 39.461522000240166], [116.31396199964661, 39.471844000500255], [116.29802400030746, 39.485875000031285], [116.27318699978025, 39.490329000383099], [116.24862000001303, 39.50164499971703], [116.23962499979393, 39.514977000288411], [116.24070800027403, 39.538164000268466], [116.21527234624182, 39.577570626783029], [116.19470300024329, 39.576789999958578], [116.18768000013199, 39.581046000172819], [116.14843099959103, 39.578754999743524], [116.1411520002647, 39.567832999693223], [116.09910300010347, 39.569775000216111], [116.09747799980994, 39.573769000039363], [116.06061999981318, 39.570354999983294], [116.03052999985971, 39.571214000026146], [116.00959400026295, 39.586577999874862], [116.00207599980763, 39.576821000488849], [115.98735499993336, 39.582319000421592], [115.98558500014769, 39.592623999897739], [115.97089800004278, 39.593344999871874], [115.97060099983628, 39.569428000401956], [115.95747799990988, 39.564518999752067], [115.94432100021402, 39.565253000325754], [115.93841999968333, 39.57503199982699], [115.92425899955322, 39.583667000531705], [115.92285499955869, 39.592481000497855], [115.90746400026342, 39.598467000451762], [115.90136399954895, 39.595334999910392], [115.90239699952201, 39.568145999738135], [115.88789799999279, 39.565727999747423], [115.88140500004079, 39.54987699992364], [115.85963499975549, 39.546750000512191], [115.84699699971179, 39.551744999732023], [115.84011899999189, 39.542259000252727], [115.82233099987582, 39.540334000513781], [115.82105699958095, 39.511497999932828], [115.80450799994435, 39.508401000106119], [115.76231400029098, 39.511631999816984], [115.74532800028703, 39.51181400011609], [115.73764400027051, 39.523362000256157], [115.73206400015351, 39.542379000390611], [115.72117599987257, 39.547166999957142], [115.71161999986316, 39.560213999976156], [115.68609600003049, 39.564934000004143], [115.68810700013796, 39.577119999888112], [115.68516600031069, 39.589663000047494], [115.67496500023458, 39.595443000394198], [115.66456299988261, 39.607235000095216], [115.65168000023186, 39.600248999891505], [115.63778799991633, 39.598150000222404], [115.62750299956383, 39.603056999880664], [115.62077399952057, 39.59841900003687], [115.61224850026815, 39.603204500387449], [115.59348300004046, 39.598621000358946], [115.58014299999957, 39.588672000212682], [115.56553700003258, 39.590947999950288], [115.5543260001449, 39.606983000165371], [115.53944800022509, 39.617797999777906], [115.52660799985938, 39.610432000036838], [115.51315399995724, 39.611965999731183], [115.51603000038426, 39.638930000319306], [115.50055399986729, 39.650881000158108], [115.47220300006848, 39.649176999818735], [115.47229799995284, 39.65450500000577], [115.48521800041044, 39.66768199972455], [115.48248300019031, 39.680143999745837], [115.49337399971034, 39.690272000052801], [115.48593900038463, 39.700375000106249], [115.48183099980088, 39.730974000150013], [115.4761769998687, 39.74110899988051], [115.46252099964443, 39.739534000094068], [115.44074600002796, 39.747894999854395], [115.43006200016123, 39.77468799975145], [115.43823200010684, 39.783634000408824], [115.45363600000144, 39.782014000345896], [115.47713600002646, 39.797385000517409], [115.48585099992374, 39.795188999972424], [115.50040100000626, 39.782090000253334], [115.50663399965947, 39.787228999818524], [115.53813199979197, 39.795076000157337], [115.54606449957703, 39.793915499700631], [115.56059699975185, 39.803830000054518], [115.56314100015709, 39.812388999952418], [115.538555000413, 39.825470999786887], [115.51977899970109, 39.829847000139011], [115.50445199976002, 39.843575000086219], [115.51512199988042, 39.856709000520027], [115.51894800005027, 39.875119999688309], [115.50277799990488, 39.882983999911744], [115.51487099999667, 39.900337999798921], [115.50054600039766, 39.912326000444637], [115.48341399995616, 39.920616000528071], [115.46966599998598, 39.935820000192905], [115.43545899993296, 39.950857000250437], [115.41969299953234, 39.949691000439373], [115.41728199986449, 39.954013000099906], [115.41956800006324, 39.977795999685668], [115.42788799973141, 39.987816000408145], [115.4415559996097, 39.991892000415532], [115.44240600013688, 40.010442999744669], [115.44968100017809, 40.026112000168723], [115.46652199979053, 40.032624000097599], [115.48430699976825, 40.049386000563516], [115.5023390003447, 40.057898000092678], [115.50317100004168, 40.064193999953204], [115.52180899978555, 40.075222000395058], [115.53635899986796, 40.074669000074323], [115.54652800026702, 40.080222999891589], [115.56993899978511, 40.101490000363299], [115.57482200013521, 40.094633999859241], [115.59740500014072, 40.092562000535963], [115.60055199957515, 40.113817000454276], [115.60583899967014, 40.116042999684737], [115.64478299963582, 40.116310000306328], [115.64889599955075, 40.126421999875447], [115.68135099974893, 40.137474000524776], [115.70290800010423, 40.133390000148438], [115.71879599983561, 40.127681000377891], [115.74165399993217, 40.133507000147972], [115.74892499978898, 40.14365100029346], [115.74408699971536, 40.15244200009829], [115.75058800003626, 40.162643000174398], [115.761971999808, 40.165109999726781], [115.76666699958241, 40.174928000127181], [115.78351599956375, 40.177248000095176], [115.78771299975517, 40.1670199996733], [115.80069400032789, 40.151754999893399], [115.81998100032297, 40.148840000365794], [115.84761899961723, 40.1481200004377], [115.83827300029884, 40.167001999742524], [115.85476800014317, 40.183581999909393], [115.86610899973061, 40.186261000244997], [115.88199600031521, 40.208041000092123], [115.87818199979949, 40.213047999865353], [115.89276499960511, 40.234459999829198], [115.90547600031721, 40.234100000314811], [115.91325400017206, 40.24713699987268], [115.92720100032602, 40.254417000144485], [115.95693199991194, 40.256683000320265], [115.96038099978341, 40.264490999759857], [115.94052200039005, 40.287843000154396], [115.9342659996762, 40.302820000142958], [115.93675700033532, 40.312978000034718], [115.92696500023465, 40.317553999717347], [115.91662299995153, 40.33552099999423], [115.91029799965304, 40.365737000362344], [115.89768299977072, 40.358995999765625], [115.88288099975841, 40.360191000014709], [115.87019400015299, 40.357177000418289], [115.85862800008215, 40.361665999686181], [115.84283500023514, 40.375762000416046], [115.82649999967532, 40.377622999901575], [115.81205399989221, 40.385200000379768], [115.80894599955832, 40.398353999937171], [115.79888999987361, 40.418767999743466], [115.79091399988124, 40.429341999933399], [115.77545600019437, 40.437318999971922], [115.76590400036935, 40.448360000113951], [115.76289400005817, 40.461238000433411], [115.77105300039568, 40.484930000319309], [115.73935800017159, 40.49103200022671], [115.7297139997014, 40.503442000547921], [115.73427300039873, 40.511702000147238], [115.74825300027578, 40.538638000343497], [115.75488699953542, 40.537898000392431], [115.78519899983405, 40.56002500005377], [115.80741500000227, 40.555698000162636], [115.81534199953376, 40.56211900039159], [115.82140000010997, 40.586302000437001], [115.88216099983038, 40.595322000010356], [115.90368699965541, 40.617244000110588], [115.92184099956251, 40.611557000455264], [115.9378369997778, 40.610160999930258], [115.9476859998091, 40.600224000337391], [115.96639300003699, 40.600272999899062], [115.97623899992993, 40.577855000308091], [115.9966850003126, 40.574458000136644], [115.99992400039241, 40.586976000042398], [116.01369999985513, 40.597148999726585], [116.02460900020526, 40.595849000031365], [116.05522199999541, 40.607584999847916], [116.08804400003066, 40.611162000226159], [116.10474400033536, 40.614640000535644], [116.11397999997712, 40.623776000062378], [116.10515200026464, 40.642482000244172], [116.10744199974852, 40.647407999879363], [116.12581699995462, 40.65417000054515], [116.13611199986894, 40.665669000224227], [116.15187500013121, 40.66204700046876], [116.15908900005741, 40.66622599983009], [116.17456100038987, 40.711034000418863], [116.1802449999069, 40.717150000072479], [116.19712100023401, 40.714190000268331], [116.21329899984903, 40.731943999715838], [116.20827200005283, 40.743361000110099], [116.2187850001277, 40.753307000118014], [116.2296949996246, 40.774113000015006], [116.22893499965062, 40.781808999685666], [116.24174599957826, 40.790348000459915], [116.26323400034892, 40.773507999994251], [116.26807100037638, 40.76192099985434], [116.28162100020904, 40.762283000360242], [116.30144599983305, 40.750930000219398], [116.30147999960241, 40.762019999923098], [116.3078049999009, 40.769457000240436], [116.33143299953338, 40.771467000301868], [116.34530299973369, 40.768607999759411], [116.37592700003108, 40.771737000162489], [116.38894299951983, 40.776857999796903], [116.40408399987678, 40.777764000208492], [116.40960399992468, 40.760440999952266], [116.43251899995198, 40.765394999979321], [116.44761700012452, 40.764485000282605], [116.45927099975688, 40.770968999819559], [116.45250399975987, 40.795263000487125], [116.43621100023756, 40.805341000287001], [116.4318469995394, 40.816610000151456], [116.4000955003072, 40.831625500116786], [116.39901800008067, 40.839060000318796], [116.38331299979518, 40.860380999683457], [116.3705330003977, 40.867256000164332], [116.32813699952294, 40.904180000506699], [116.32816399986871, 40.918047999715441], [116.33475499984343, 40.929256000364205], [116.35962400004757, 40.941212000433552], [116.37209399953849, 40.934479000205727], [116.38561599987861, 40.912452999806135], [116.3956840001166, 40.903712000508449], [116.40905799992686, 40.898799999720268], [116.42416499961507, 40.901439000009873], [116.43076399995869, 40.897314000440815], [116.47054299975969, 40.898018999677163], [116.46905599953482, 40.910427999952276], [116.46127799967996, 40.929627000385835], [116.44153600028619, 40.952657000320357], [116.44961599967871, 40.976687000504739], [116.45755799990184, 40.98276700029686], [116.46803700020746, 40.976384000021653], [116.47932199991044, 40.980642000328089], [116.48700399983477, 40.976654999928371], [116.51061699967488, 40.973735000170166], [116.51340899982551, 40.979774999916344], [116.53528999983371, 40.988904000019659], [116.56804300028432, 40.986561999936384], [116.57986899975458, 40.977936999692815], [116.59386899965466, 40.973917000469271], [116.60774600017783, 40.982122000230163], [116.60967300000902, 41.002887000035059], [116.61595199998487, 41.014323000406193], [116.61602499975402, 41.025954999923385], [116.60801399994625, 41.035367000486758], [116.6123209998143, 41.047186999680321], [116.62508800041098, 41.058909499773677], [116.64297100041142, 41.056012000153714], [116.65287100009664, 41.049075000410994], [116.67762899967863, 41.03978099989331], [116.68335000000252, 41.042909000250233], [116.69102200036514, 41.019785000477441], [116.67684999972778, 40.993460999725414], [116.6785590002977, 40.980895000304088], [116.67156599977113, 40.970236999837709], [116.68114499994181, 40.960232999853133], [116.68509000020345, 40.948755000243125], [116.70006600014585, 40.932677999889847], [116.71170499998584, 40.93438900055196], [116.71835700007557, 40.927808000139123], [116.70746699970232, 40.908468000397932], [116.74565599992457, 40.889625000193632], [116.75230399982979, 40.882044000430312], [116.76474799992036, 40.879257000510222], [116.7867320001817, 40.862703999789801], [116.79592200040008, 40.849587000139991], [116.81714699983422, 40.841258000056712], [116.83130299973368, 40.839947999900346], [116.8499150000772, 40.833687999901315], [116.85493200031158, 40.824013999846272], [116.86924800039492, 40.820008000369], [116.8803529998911, 40.799658999962958], [116.89012199983051, 40.792468000198085], [116.89212000023792, 40.7756109998478], [116.91757599963273, 40.772347000413788], [116.92217300028381, 40.755182000249192], [116.92045999952938, 40.743404000294447], [116.93492500018863, 40.738389000152267], [116.93889299971227, 40.726748000220084], [116.95002799969245, 40.721448000424914], [116.95872199952078, 40.708084000176541], [116.99815799969201, 40.695221999695605], [117.0244289997986, 40.690629000128297], [117.04317500002628, 40.698750000512177], [117.07748799957153, 40.700459000182775], [117.10545799978695, 40.705345999818064], [117.11025299967628, 40.698221000398917], [117.14603499951568, 40.695505000155663], [117.16028300006042, 40.697547999940298], [117.17229099982978, 40.691999000353633], [117.17661000025134, 40.696039000499525], [117.19972299951689, 40.693174999726523], [117.22505200024966, 40.683227999672511], [117.23570699967831, 40.675075000510901], [117.25506600029576, 40.679694000377879], [117.27194299976964, 40.664929000273219], [117.2854929996023, 40.658511000182557], [117.30436000001407, 40.657672000162734], [117.33012099998427, 40.661833000492607], [117.33962300020141, 40.672229999714773], [117.35536599954128, 40.673091999895917], [117.384078999846, 40.681982999815659], [117.4140479996156, 40.684604000174545], [117.44372300021632, 40.677689999693769], [117.45812699986118, 40.671983000015473], [117.47341899998696, 40.675956999815753], [117.48856399962892, 40.673140000310809], [117.49923699988767, 40.665892999762207], [117.49647900040566, 40.644103000353255], [117.49460600036673, 40.634837000227435], [117.47236599999098, 40.633964000438311], [117.46527100015658, 40.645482000094262], [117.41572999983964, 40.636108000383956], [117.4069179999658, 40.604817999950797], [117.41653099990583, 40.580576999928667], [117.41317399978038, 40.567267000371828], [117.39722800007223, 40.572430000144436], [117.38268700040476, 40.559806999893169], [117.36949600004039, 40.565092999942067], [117.35951300012493, 40.574158999838005], [117.34363600000142, 40.578349999752731], [117.32782800036193, 40.574859999789226], [117.30399000003854, 40.575075999857575], [117.28958500034753, 40.565652000539444], [117.25965199954021, 40.556624999743974], [117.24328700029491, 40.546958000011728], [117.24401499969258, 40.536001000146086], [117.25383100000067, 40.517962000146269], [117.24098300016544, 40.510761999966405], [117.20726800031798, 40.511192000010851], [117.20282799971244, 40.495328000486893], [117.21062899972867, 40.493697999962762], [117.2294129999101, 40.467607000063083], [117.2283359997067, 40.456603999874744], [117.25700799991932, 40.439871999892944], [117.25051099978282, 40.428532000351595], [117.24355400001718, 40.427793000446684], [117.22776600040061, 40.415363500125466], [117.22602500015364, 40.402562999782674], [117.23323099971094, 40.397383000125387], [117.22219499979951, 40.384657999667013], [117.21720199977256, 40.374115000007293], [117.22023400019896, 40.367758000031756], [117.23537799979488, 40.369135999726666], [117.24795999995411, 40.352986000503563], [117.25587199969311, 40.336402000152248], [117.26859700015154, 40.331047000518709], [117.26492699998107, 40.324208999945427], [117.26795999955436, 40.307628999778558], [117.28191800021557, 40.300241999968364], [117.28785799984689, 40.291870999746891], [117.28936400004864, 40.277067999688484], [117.33003699970789, 40.276252999876078], [117.33572500030857, 40.242677000143487], [117.34703500026512, 40.234390000198403], [117.36466300019731, 40.231666000485575], [117.38359500000934, 40.225653000185844]]] }, "properties" : { "code" : "11", "name" : "北京市", "parent_code" : "0", "level" : 1, "lon" : 116.43424180474648, "lat" : 40.201253765664767 }, "bbox" : [115.41728199986449, 39.439301999887448, 117.49923699988767, 41.058909499773677] };
-	const polygonModel1 = {
-		fillColor: '#000',
-		stroke: 'red',
-		width: 1,
-		text: '测试1',
-		geo: g1,
-		id: 'ceshi1',
-	};
-
-	const polygonModel2 = {
-		fillColor: '#000',
-		stroke: 'red',
-		width: 1,
-		text: '测试2',
-		geo: g2,
-		id: 'ceshi2',
-		type: 1
-	};
-
-	const polygonModel3 = {
-		fillColor: '#000',
-		stroke: 'red',
-		width: 1,
-		text: '测试3',
-		geo: g3,
-		id: 'ceshi3',
-	};
-
-	const polygonModel4 = {
-		fillColor: '#000',
-		stroke: 'red',
-		width: 1,
-		text: '测试4',
-		geo: g4,
-		id: 'ceshi4',
-	};
-
-	const polygonModel5 = {
-		fillColor: 'transparent',
-		stroke: '#F7B500',
-		strokeWidth: 4,
-		lineDash: [1, 2, 3, 4, 5, 6],
-		geo: g5,
-		id: 'ceshi5',
-	};
-	
-	const polygonModel6 = {
-		fillColor: 'transparent',
-		stroke: '#F7B500',
-		strokeWidth: 4,
-		lineDash: [1, 2, 3, 4, 5, 6],
-		geo: g5,
-		id: 'ceshi6',
-	};
-	
-	
 	export default {
 		components: {
 			RyMap,
 			RyMapTool,
 			RyPolygon,
 			RyPolygons,
-			RyClustersMarker,
+			RyClusters,
 			RyPolygonGeo,
 		},
 		data() {
@@ -211,7 +107,7 @@
 				isClear: false,
 				geoJson: null,
 				colors: [],
-				modelArr: [polygonModel1,polygonModel2, polygonModel3, polygonModel4],
+				modelArr: [],
 				modelArr2: [
 					{id:'ceshi1', x:120.15535003220648,y:30.179378795342608},
 					{id:'ceshi2',x:120.16369976775891,y:30.1967116895034},
@@ -263,273 +159,34 @@
 					width:16
 				}, 
 				lineAppend:[],
+				isShowPaly:true,
+				layerArr:[2,2],
 			};
 		},
-		created() {
-			console.log(this.startMarkerDto);
-			const obj = {
-				  isAppend:false,
-				  color: 'green',
-				  width: 2,
-				  pointArr: [],
-				  creaTime:[],
-				  zIndex: 1,
-				};
-			
-			const obj2 = {
-				  isAppend:false,
-				  color: 'red',
-				  width: 2,
-				  pointArr: [],
-				  creaTime:[],
-				  zIndex: 1,
-				};
-				
-				
-				const obj3 = {
-					  isAppend:false,
-					  color: 'red',
-					  width: 2,
-					  pointArr: [],
-					  creaTime:[],
-					  zIndex: 1,
-					};
-					
-					const obj4 = {
-						  isAppend:false,
-						  color: 'red',
-						  width: 2,
-						  pointArr: [],
-						  creaTime:[],
-						  zIndex: 1,
-						};
-						
-						const obj5 = {
-							  isAppend:false,
-							  color: 'green',
-							  width: 2,
-							  pointArr: [],
-							  creaTime:[],
-							  zIndex: 1,
-							};
-							
-							const obj6 = {
-								  isAppend:false,
-								  color: 'green',
-								  width: 2,
-								  pointArr: [],
-								  creaTime:[],
-								  zIndex: 1,
-								};
-
-            console.log(lineDataArr);
+	    created(){
+			console.log(dksj);
+			const arr =[];
 			
-			lineDataArr[0].forEach(r=> {
-			          obj.pointArr.push([r.lng,r.lat]);
-					  obj.creaTime.push(r.creaTime);
-			});
-            
-			// this.lineData1=obj;
-			const len2=obj.pointArr.length;
-			let i2=0;
-		  let setId =	setInterval(r=> {
-			   this.lineAppend=obj.pointArr[i2];
-				i2+=1;
-				if(i2 >=len2){
-					clearInterval(setId);
-				}
-			},1000);
-
-			
-			lineDataArr[1].forEach(r=> {
-			          obj2.pointArr.push([r.lng,r.lat]);
-					  obj2.creaTime.push(r.creaTime);
-			});
-   //        this.lineData1=obj;
-			// setTimeout(r=> {
-			// 			this.lineData1=obj;
+			dksj.forEach(r=> {
 				
-			// },3000);
-			
-			
-			
-			lineDataArr[2].forEach(r=> {
-			          obj3.pointArr.push([r.lng,r.lat]);
-					  obj3.creaTime.push(r.creaTime);
-			});
-			
-			lineDataArr[3].forEach(r=> {
-			          obj4.pointArr.push([r.lng,r.lat]);
-					  obj4.creaTime.push(r.creaTime);
-			});
-			
-			lineDataArr[4].forEach(r=> {
-			          obj5.pointArr.push([r.lng,r.lat]);
-					  obj5.creaTime.push(r.creaTime);
-			});
-			
-			lineDataArr[5].forEach(r=> {
-			          obj6.pointArr.push([r.lng,r.lat]);
-					  obj6.creaTime.push(r.creaTime);
+			  const _mode =	{
+					fillColor: '#000',
+					stroke: 'red',
+					width: 1,
+					// text: '测试1',
+					geo: r.geoJSON,
+					id: r.id,
+				};
+				arr.push(_mode);
 			});
-			
-			
-			
-			
-			
-			// setTimeout(r=> {
-			// 	this.lineData2=obj2;
-				
-			// },1000);
-			
-			// setTimeout(r=> {
-			// 	this.lineData2=obj3;			
-			// },2000);
-			
-			// setTimeout(r=> {
-			// 	this.lineData2=obj4;			
-			// },3000);
-			
-			// setTimeout(r=> {
-			// 	this.lineData2=obj5;			
-			// },4000);
-			
-			
-			
-			
-			// setTimeout(r=> {
-			// 	this.lineData2=obj6;			
-			// },5000);
-			// obj6.forEach(r=> {
-				
-			// });
-	// let i=0;
-	//  setTimeout(r=> {
- //              let intId =	setInterval(r=> {
- //              		 this.lineAppend= obj3.pointArr[i];
-	// 				 console.log(this.lineAppend);
- //              		 i+=1;
- //              		 if(i==obj3.pointArr.length){
- //              			  clearInterval(intId);
- //              		 }
- //              	},2000);		 
-	//  },3000);
-
-			
-			// setTimeout(r=> {
-			// 	this.lineData1=null;			
-			// },10000);
-			
-			
-			// setTimeout(r=> {
-			// 	// this.lineData1=null;
-			// 	this.clearLiens=true;
-			// },10000);
-	
-			// amworkdatalist.push({
-			//   X,
-			//   Y,
-			//   isNJOpt: isWorking,
-			//   creaTime: toDateString(new Date(item.creaTime))
-			// });
-			
-			// {
-			//   color: 'rgb(0,0,255)',
-			//   width: 2,
-			//   pointArr: [],
-			//   zIndex: 1000,
-			// }
-			
-			// console.log(polygonModel5);
-   //          console.log(lineData1);
-			// console.log(lineData2);
-			
-			this.geoJson = JSON.parse(g1);
-			// setTimeout(r=> {this.colors=['red','#000']},3000);
-			//   setTimeout(r=> {this.isClear=true;}, 5000);
-			setTimeout(r => {
-				// this.modelArr= [polygonModel3,polygonModel4];
-				// this.polygonColorObj={
-				//   id:'ceshi4',
-				//   colorArr:['red','#000']
-				// };
-
-				// this.polygonColors.push({
-				//    id:'ceshi1',
-				//    colorArr:['red','#000']
-				// });
-
-				//  this.polygonColors.push({
-				//     id:'ceshi2',
-				//     colorArr:['red','#000']
-				//  });
-
-				//  this.polygonColors.push({
-				//     id:'ceshi3',
-				//     colorArr:['red','#000']
-				//  });
-				// this.insert=polygonModel1;
-
-				// this.isFit=true;
-
-				// this.range='ceshi3';
-				// this.ranges=['ceshi2','ceshi1'];
-				// :initModifyPolygon="geo"
-				// this.inserts=[polygonModel2, polygonModel3];
-			}, 8000);
-			setTimeout(r => {
-				// this.polygonModel={
-				//   fillColor: '#000',
-				//   stroke: 'red',
-				//   width: 1,
-				//   text: '测试',
-				//   coordinates: geometry.coordinates,
-				//   id: 'ceshi',
-				// };
-				// this.restFit = true;
-				// this.modelArr=[];
-				//  this.isShowAll=false;
-				// this.showPolygons
-
-				// this.showPolygon={
-				//   id:'ceshi2',
-				//   isShow:false
-				// }
-			}, 7000);
-			// setTimeout(r=> {
-			//   this.polygonModel={
-			//     fillColor: '#000',
-			//     stroke: '#fff',
-			//     width: 4,
-			//     text:'测试2',
-			//     coordinates: [
-			//       [
-			//         [121.03623185250073, 29.247091764239528],
-			//         [121.03525048300928, 29.24522364753245],
-			//         [121.03576144393304, 29.244964111834967],
-			//         [121.03598042717134, 29.245156060100488],
-			//         [121.03797020112704, 29.24484786136949],
-			//         [121.03804589913334, 29.244920855919766],
-			//         [121.03816214959882, 29.244964111834967],
-			//         [121.03859908998896, 29.245047209773205],
-			//         [121.03870182296805, 29.245344594473835],
-			//         [121.03883429416969, 29.245955584817516],
-			//         [121.03876670673772, 29.24603128272069],
-			//         [121.0388072591969, 29.246155643657374],
-			//         [121.03868830548166, 29.246174568158953],
-			//         [121.03868830548166, 29.246225934545365],
-			//         [121.03834496140979, 29.24628270805009],
-			//         [121.03827467031554, 29.246350295482053],
-			//         [121.03814760602596, 29.24639895841244],
-			//         [121.03822600728203, 29.246569278720354],
-			//         [121.03623185250073, 29.247091764239528]
-			//       ]
-			//     ],
-			//     id: 'ceshi',
-			//   }
-			// },6000);
+			this.modelArr=arr;
 		},
+	
 		methods: {
+			onShowPaly(b) {
+			  this.isShowPaly = b;
+			
+			},
 			load(obj) {
 				this.lMap = obj.mapServices;
 				this.map = obj.map;
@@ -569,15 +226,16 @@
 				id,
 				isShow
 			}) {
+				console.log(id);
 				setTimeout(r => {
 					this.showPolygon = {
 						id,
 						isShow
 					};
-					this.isCheckPoint = {
-						id,
-						isShow
-					};
+					// this.isCheckPoint = {
+					// 	id,
+					// 	isShow
+					// };
 				}, 50);
 			},
 			changeSwitchMap(obj) {