ry-vue-map 0.4.2 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ry-vue-map",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "private": false,
   "main": "lib/ryui.umd.min.js",
   "description": "ry公共组件库",

package/src/components/maps/ryMap/src/index.vue

@@ -169,7 +169,7 @@
 
 					callback: (map, layers) => {
 						this.map = map;
-
+                      
 						if (this.bbox.length > 0) {
 							this.setFit(this.bbox);
 						}

package/src/components/maps/ryOfflineMap/src/index.vue

@@ -139,8 +139,8 @@
 							color,
 							lineDash
 						});
-								this._bingMapEvent();
-
+						this._bingMapEvent();
+	                    this._bingMapMoveend();
 						this.$emit('load', {
 							map,
 							mapServices: this.lMap,

package/src/components/maps/ryStaticLayer/index.js

@@ -1,7 +1,7 @@
-import RyKMLs from './src/index';
+import RyStaticLayer from './src/index';
 
-RyKMLs.install = (Vue) => {
-  Vue.install(RyKMLs.name, RyKMLs);
+RyStaticLayer.install = (Vue) => {
+  Vue.install(RyStaticLayer.name, RyStaticLayer);
 };
 
-export default RyKMLs;
+export default RyStaticLayer;

package/src/components/maps/ryStaticLayer/src/index.vue

@@ -9,7 +9,7 @@
 	} from 'ry-map';
 	import Dto from './../../models/ryStaticLayer/index.js';
 	export default {
-		name: 'RyStaticLayers',
+		name: 'RyStaticLayer',
 		props: {
 			...new Dto(),
 		},

package/src/components/maps/ryStaticLayers/index.js

@@ -1,7 +1,7 @@
-import RyKMLs from './src/index';
+import RyStaticLayers from './src/index';
 
-RyKMLs.install = (Vue) => {
-  Vue.install(RyKMLs.name, RyKMLs);
+RyStaticLayers.install = (Vue) => {
+  Vue.install(RyStaticLayers.name, RyStaticLayers);
 };
 
-export default RyKMLs;
+export default RyStaticLayers;

package/src/views/map/index.vue

@@ -1,24 +1,31 @@
 <template>
 	<div class="map-style">
 
-		<RyOfflineMap projection="EPSG:4326" :zoom="10" :minZoom="1" :maxZoom="21" :center="center" @load="load($event)"
-			:isCrossHair="isRyMapTool" :isRight="true" :isRyMapTool="true" @drawSuccess="drawSuccess"
-			@drawError="drawError" :isShowRangingTool="true" :isShowDrawTool="isRyMapTool" :bindMapClick="true"
-			@mapClick="mapClick($event)" @crossHairClick="crossHairClick($event)" :bindMapMoveend="true"
-			@mapMoveend="mapMoveend($event)" v-if="dto" :boundaryModel="dto" :urls="urls" :bbox="bbox"
-			:slicingZoom="13">
-			<template #marker="{mapDto}">
-				<ry-lines :map="mapDto.map" :startMarkerDto="startMarkerDto" :endMarkerDto="endMarkerDto"
-					:moveMarkerDto="endMarkerDto" :isShowPlayback="isShowPaly" :linenIsert="lineData"
-					@trackPlayEvent="trackPlayEvent($event)">
-				</ry-lines>
-			</template>
-		</RyOfflineMap>
+		  <ry-map :maxZoom="18" @load="loadMap($event)" :isShowSwitchMap="false" :layerType="2" :mapType="0">
+			     <template #polygon="{ mapDto }">
+					 <RyStaticLayer :map="mapDto.map" :model="model2">
+					 	
+					 </RyStaticLayer>
+					<RyStaticLayer :map="mapDto.map" :model="model">
+						
+					</RyStaticLayer>
+			      </template>
+		  </ry-map>
+
+<!--     <RyOfflineMap
+        class="ry-offline-map"
+        :urls="urls"
+        :center="[118.84146054770122, 29.935677496166022]"
+        :minZoom="1"
+        :maxZoom="18"
+        @load="load"
+      >
+      </RyOfflineMap> -->
 
 		<button @click="onClick()">测试</button>
 		<button @click="onClick2()">测试2</button>
 		<button @click="onClick3()">测试3</button>
-
+           
 		<!-- 		<aside class="aside-style">
 			<el-button class="ele-text-primary" v-show="isShowPaly" style="padding:10px;"
 				@click.stop="onShowPaly(false)">
@@ -33,7 +40,9 @@
 
 <script>
 	import dayjs from 'dayjs'
-	import RyOfflineMap from '@/components/maps/ryOfflineMap/src/index.vue';
+	import RyMap from '@/components/maps/ryMap/src/index.vue';
+   import RyOfflineMap from '@/components/maps/ryOfflineMap/src/index.vue';
+	
 	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';
@@ -42,19 +51,25 @@
 	import geoJson from "./330112";
 	import LineObj from './obj'
 	import RyLines from '@/components/maps/ryLines/src/index.vue';
-
+    import RyKML from '@/components/maps/ryKML/src/index.vue';
+	import RyStaticLayer from '@/components/maps/ryStaticLayer/src/index.vue'; 
 	export default {
 		components: {
-			RyOfflineMap,
+			RyMap,
 			RyMapTool,
 			RyPolygon,
 			RyPolygons,
 			RyClustersMarker,
 			RyPolygonGeo,
-			RyLines
+			RyLines,
+			RyKML,
+			RyStaticLayer,
+			RyOfflineMap
 		},
 		data() {
 			return {
+				// bbox:[119.5172307870407,30.20294858200727,119.4830523878688,30.17494943404726],
+				kmlDto:null,
 				map: null,
 				lMap: null,
 				polygonColorObj: null,
@@ -63,7 +78,7 @@
 				// const bbox = [ 118.84072600000002, 29.937127000000032, 119.86315600000012, 30.445895000000064 ];
 				// const center = [119.34667114000006, 30.198078622500038];
 
-				bbox: [118.84146054770122, 29.935677496166022, 119.86391954737257, 30.44823698639243],
+				// bbox: [118.84146054770122, 29.935677496166022, 119.86391954737257, 30.44823698639243],
 				isClear: false,
 				colors: [],
 				modelArr2: [{
@@ -106,7 +121,7 @@
 				polygonModel: null,
 				mapTool: null,
 				isCheckPoint: null,
-				gpsType: 0,
+				gpsType: 1,
 				isRyMapTool: true,
 				maxZoom: 18,
 				lineData1: null,
@@ -129,11 +144,32 @@
 				lineAppend: [],
 				isShowPaly: true,
 				layerArr: [2, 2],
-				urls: [
-					`https://zjhzla.ryaims.com/overlay/330112/satellite/{z}/{x}/{y}.jpg`,
-					// `https://zjhzla.ryaims.com/overlay/330112/roadmap/{z}/{x}/{y}.png`,
-					// `http://127.0.0.1:10006/${330112}/overlay/{z}/{x}/{y}.png`
+				// urls: [
+				// 	`https://zjhzla.ryaims.com/overlay/330112/satellite/{z}/{x}/{y}.jpg`,
+				// 	// `https://zjhzla.ryaims.com/overlay/330112/roadmap/{z}/{x}/{y}.png`,
+				// 	// `http://127.0.0.1:10006/${330112}/overlay/{z}/{x}/{y}.png`
+				// ],
+				urls:[
+					`http://127.0.0.1:10003/{z}/{x}/{y}.png`
 				],
+				model:{
+					id:1,
+					url:require('@/assets/layer.png'),
+						// bbox:[119.5172307870407,30.20294858200727,119.4830523878688,30.17494943404726],
+						// bbox:[119.4830523878688,30.17494943404726,119.5172307870407,30.20294858200727],
+						// bbox:[119.4830523878688,30.20294858200727,119.5172307870407,30.17494943404726],
+					 bbox:[119.4830523878688,30.17494943404726,119.5172307870407,30.20294858200727],
+					zIndex:10,
+				},
+				model2:{
+					id:2,
+					url:require('@/assets/linan.png'),
+						// bbox:[119.5172307870407,30.20294858200727,119.4830523878688,30.17494943404726],
+						// bbox:[119.4830523878688,30.17494943404726,119.5172307870407,30.20294858200727],
+						// bbox:[119.4830523878688,30.20294858200727,119.5172307870407,30.17494943404726],
+					  bbox:[119.485901,30.177281,119.514383,30.200616],
+					zIndex:9,
+				},
 				dto: null,
 			};
 		},
@@ -152,6 +188,14 @@
 			trackPlayEvent(e) {
 				console.log(e);
 			},
+			loadMap(e){
+				// this.kmlDto={
+				// 	bbox:[119.4830523878688,30.17494943404726,119.5172307870407,30.20294858200727],
+				// 	id: 'workId',
+				// 	url:'http://localhost:7601/1.kml',
+				// 	gcj02Url:'http://localhost:7601/1.kml'
+				// };
+			},
 			load(obj) {
 				console.log(obj);
 				this.lMap = obj.mapServices;
@@ -182,7 +226,7 @@
 			},
 			mapMoveend(e) {
 				// alert(1);
-				// console.log(e);
+				 console.log(e);
 			},
 			loadDrawPolygonEvent(e) {
 				this.mapTool = e;