ry-vue-map 0.4.0 → 0.4.2

package/package.json

@@ -1,78 +1,78 @@
-{
-  "name": "ry-vue-map",
-  "version": "0.4.0",
-  "private": false,
-  "main": "lib/ryui.umd.min.js",
-  "description": "ry公共组件库",
-  "license": "MIT",
-  "author": "lzh",
-  "keywords": [
-    "ry",
-    "vue",
-    "element-ui"
-  ],
-  "files": [
-    "lib/*",
-    "src/*",
-    "*.json",
-    "*.js",
-    "*.md"
-  ],
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "build:report": "vue-cli-service build --report",
-    "lint": "vue-cli-service lint",
-    "lib": "vue-cli-service build --target lib --name ryui --dest lib src/components/index.js",
-    "docs:dev": "vuepress dev docs --temp .temp",
-    "docs:build": "vuepress build docs"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "~1.0.1",
-    "@form-create/element-ui": "^2.5.20",
-    "@turf/helpers": "^6.5.0",
-    "@turf/line-intersect": "^6.5.0",
-    "@vue-office/docx": "^0.2.4",
-    "@vue-office/excel": "^0.2.4",
-    "@vue-office/pdf": "^0.2.4",
-    "@vue/composition-api": "^1.7.1",
-    "axios": "~0.21.1",
-    "core-js": "~3.15.2",
-    "countup.js": "~2.0.7",
-    "dayjs": "^1.11.7",
-    "element-ui": "~2.15.6",
-    "kml-geojson": "^1.2.2",
-    "kml-to-geojson": "^1.0.13",
-    "nprogress": "~0.2.0",
-    "ol": "^6.14.1",
-    "ry-map": "^0.4.6",
-    "vue": "~2.6.14",
-    "vue-demi": "^0.13.11",
-    "vue-router": "~3.5.2",
-    "vue-server-renderer": "^2.6.14",
-    "vuedraggable": "~2.24.3",
-    "vuex": "~3.6.2",
-    "xgplayer-vue": "~1.1.5"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.4.6",
-    "@vue/cli-plugin-eslint": "~4.4.6",
-    "@vue/cli-plugin-router": "~4.4.6",
-    "@vue/cli-plugin-vuex": "~4.4.6",
-    "@vue/cli-service": "~4.4.6",
-    "babel-eslint": "~10.1.0",
-    "compression-webpack-plugin": "~6.1.1",
-    "eslint": "~6.8.0",
-    "eslint-plugin-vue": "~7.13.0",
-    "sass": "~1.32.13",
-    "sass-loader": "~10.2.0",
-    "vue-template-compiler": "~2.6.14",
-    "vuepress": "^1.9.7",
-    "vuepress-plugin-demo-container": "^0.2.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}
+{
+  "name": "ry-vue-map",
+  "version": "0.4.2",
+  "private": false,
+  "main": "lib/ryui.umd.min.js",
+  "description": "ry公共组件库",
+  "license": "MIT",
+  "author": "lzh",
+  "keywords": [
+    "ry",
+    "vue",
+    "element-ui"
+  ],
+  "files": [
+    "lib/*",
+    "src/*",
+    "*.json",
+    "*.js",
+    "*.md"
+  ],
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "build:report": "vue-cli-service build --report",
+    "lint": "vue-cli-service lint",
+    "lib": "vue-cli-service build --target lib --name ryui --dest lib src/components/index.js",
+    "docs:dev": "vuepress dev docs --temp .temp",
+    "docs:build": "vuepress build docs"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "~1.0.1",
+    "@form-create/element-ui": "^2.5.20",
+    "@turf/helpers": "^6.5.0",
+    "@turf/line-intersect": "^6.5.0",
+    "@vue-office/docx": "^0.2.4",
+    "@vue-office/excel": "^0.2.4",
+    "@vue-office/pdf": "^0.2.4",
+    "@vue/composition-api": "^1.7.1",
+    "axios": "~0.21.1",
+    "core-js": "~3.15.2",
+    "countup.js": "~2.0.7",
+    "dayjs": "^1.11.7",
+    "element-ui": "~2.15.6",
+    "kml-geojson": "^1.2.2",
+    "kml-to-geojson": "^1.0.13",
+    "nprogress": "~0.2.0",
+    "ol": "^6.14.1",
+    "ry-map": "^0.4.8",
+    "vue": "~2.6.14",
+    "vue-demi": "^0.13.11",
+    "vue-router": "~3.5.2",
+    "vue-server-renderer": "^2.6.14",
+    "vuedraggable": "~2.24.3",
+    "vuex": "~3.6.2",
+    "xgplayer-vue": "~1.1.5"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~4.4.6",
+    "@vue/cli-plugin-eslint": "~4.4.6",
+    "@vue/cli-plugin-router": "~4.4.6",
+    "@vue/cli-plugin-vuex": "~4.4.6",
+    "@vue/cli-service": "~4.4.6",
+    "babel-eslint": "~10.1.0",
+    "compression-webpack-plugin": "~6.1.1",
+    "eslint": "~6.8.0",
+    "eslint-plugin-vue": "~7.13.0",
+    "sass": "~1.32.13",
+    "sass-loader": "~10.2.0",
+    "vue-template-compiler": "~2.6.14",
+    "vuepress": "^1.9.7",
+    "vuepress-plugin-demo-container": "^0.2.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead"
+  ]
+}

package/src/components/maps/models/ryOfflineMap/map.js

@@ -137,4 +137,9 @@ export default class MapDto {
   	default: ()=> null,
    }
 
+  slicingZoom={
+  	type: Number,
+  	default: 13,
+  }
+   
 }

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

@@ -6,7 +6,7 @@
 					<button class="button-paly" @click.stop="onPlayTrajectory()" v-if="!index || !isStop"></button>
 					<button class="button-stop" @click.stop="onStopTrajectory()" v-else></button>
 				</el-col>
-				<el-col :xs="13" :sm="19" :md="19" :lg="19" :xl="23">
+				<el-col style="margin-left: 30px;" :xs="13" :sm="19" :md="19" :lg="19" :xl="23">
 					<el-slider v-model="index" :marks="marks" show-tooltip :step="1" :min="0" :max="cacheArr.length"
 						@change="sliderChange" :format-tooltip="formatTooltip"></el-slider>
 				</el-col>
@@ -161,6 +161,7 @@
 						playbackColor,
 						pointArr
 					} = model;
+					if(!pointArr) return;
 					const len = pointArr.length;
 					if (!pointArr.length) return;
 					this.len += len;
@@ -397,7 +398,6 @@
 			},
 			trackPlayback() {
 				if (!this.cacheLines.length) {
-	
 					this.createTrackLineAndMarker(this.cacheScales[0],0);
 				}
 				this.intervalId = setInterval(r => {

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

@@ -126,27 +126,27 @@
 						]);
 						_view.setMaxZoom(this.minZoom);
 						_view.setMaxZoom(this.maxZoom);
-					    this.map=map;
-						// _view.seZoom(this.zoom);
+						this.map = map;
 						const {
 							geo,
 							width,
 							color,
 							lineDash
 						} = this.boundaryModel;
+						lMap.SlicingZoom=this.slicingZoom;
 						lMap.initMapMaskEvent(map.getLayers(), geo, {
 							width,
 							color,
 							lineDash
 						});
-					
-						
+								this._bingMapEvent();
+
 						this.$emit('load', {
 							map,
-							mapServices:this.lMap,
+							mapServices: this.lMap,
 							ryMapTool: this.$refs.mapTool
 						});
-						
+
 					}
 				});
 			},

package/src/views/map/index.vue

@@ -5,7 +5,14 @@
 			: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">
+			@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>
 
 		<button @click="onClick()">测试</button>
@@ -33,8 +40,8 @@
 	import RyClustersMarker from '@/components/maps/ryClustersMarker/src/index.vue';
 	import RyPolygonGeo from '@/components/maps/ryPolygonGeo/src/index.vue';
 	import geoJson from "./330112";
-
-
+	import LineObj from './obj'
+	import RyLines from '@/components/maps/ryLines/src/index.vue';
 
 	export default {
 		components: {
@@ -44,12 +51,15 @@
 			RyPolygons,
 			RyClustersMarker,
 			RyPolygonGeo,
+			RyLines
 		},
 		data() {
 			return {
 				map: null,
 				lMap: null,
 				polygonColorObj: null,
+				lineData: null,
+				isShowPaly: false,
 				// const bbox = [ 118.84072600000002, 29.937127000000032, 119.86315600000012, 30.445895000000064 ];
 				// const center = [119.34667114000006, 30.198078622500038];
 
@@ -139,10 +149,17 @@
 			onShowPaly(b) {
 				this.isShowPaly = b;
 			},
+			trackPlayEvent(e) {
+				console.log(e);
+			},
 			load(obj) {
 				console.log(obj);
 				this.lMap = obj.mapServices;
 				this.map = obj.map;
+				setTimeout(r => {
+					this.lineData = LineObj;
+				}, 3000);
+				this.lineData = LineObj;
 			},
 			drawSuccess(obj) {
 				this.polygonModel = {
@@ -156,6 +173,7 @@
 			},
 			drawError(obj) {},
 			mapClick(e) {
+				console.log('ee========',e);
 				// alert(e);
 			},
 			onLoad(e) {},