Merge branch 'qll' into dev

src/views/draw/metadata/detail.vue

@@ -346,12 +346,15 @@
 							</el-form-item>
 							<el-form-item label="经度:">
 								<el-input v-model="positionForm.longitude" disabled></el-input>
+								<div class="tip">请在下面地图上单击，拾取经纬度</div>
 							</el-form-item>
 							<el-form-item label="维度:">
 								<el-input v-model="positionForm.latitude" disabled></el-input>
+								<div class="tip">请在下面地图上单击，拾取经纬度</div>
 							</el-form-item>
-							<baidu-map class="bm-position" center="北京">
-								<bm-marker :position="packet" :dragging="true" @dragging="removePacket">
+							<baidu-map class="bm-position" :center="backForm.keyword" @ready="handleMap">
+								<bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
+								<bm-marker :position="{'lng': positionForm.longitude, 'lat': positionForm.latitude}" :dragging="true" @dragging="remove">
 								</bm-marker>
 							</baidu-map>	
 						</el-form>
@@ -502,8 +505,7 @@ export default {
 			loading:false,
 			domain: process.env.BASE_API,
 			requestPath: requestPath,
-			center: {lng: 116.404, lat: 39.915},
-			packet:{lng: 116.404, lat: 39.915},
+			//packet:{lng: 116.404, lat: 39.915},
 			entityVisible:false,
 			personLinkVisible:false,
 			positionLinkVisible:false,
@@ -590,19 +592,30 @@ export default {
 		this.entityForm.resourceId=this.$route.query.id;
 		this.getDetail();
 		this.getPerson();
-		this.handleMap();
+		//this.handleMap();
 	},
 	methods: {
 		//window.open(`${this.domain}${requestPath.file}?fileName=${val}&isOnLine=true`)
-		handleMap(){ 
-			var myGeo = new BMap.Geocoder();      
+		handleMap({BMap, map}){ 
+			//var myGeo = new BMap.Geocoder();      
 			// 将地址解析结果显示在地图上，并调整地图视野   
-			myGeo.getPoint("昆明市", function(point){ 
+			//myGeo.getPoint("昆明市", function(point){ 
 				//console.log(point,'ppppppp')     
-				if (point) {      
+				//if (point) {      
 						// map.centerAndZoom(point, 16);      
 						// map.addOverlay(new BMap.Marker(point));      
-				}
+				//}
+			//});
+			//console.log(BMap, map)
+			let _this=this;
+			let myMap=map;
+			// var map = new BMap.Map('myMap');
+			map.addEventListener("click",function(e){
+				let target=e;
+				_this.remove(target)
+				//this.positionForm.longitude=target.point.lng;
+				//this.positionForm.latitude=target.point.lat;
+				console.log(e,"测试一下")
 			});
 		},
 		getDetail(){
@@ -883,9 +896,9 @@ export default {
 			})
 		},
 		linkSip(){
-			this.$router.push({path:"/draw/msgPacket",query:{id:this.id,resourceType:this.resourceType}})
+			this.$router.push({path:"/draw/msg",query:{id:this.id,resourceType:this.resourceType}})
 		},
-		removePacket(target){
+		remove(target){
 			let _this=this;
 			let point=target.point;
 			this.positionForm.longitude=point.lng;

src/views/draw/metadata/index.scss

@@ -5,6 +5,11 @@
         z-index: 1;
         margin-right: 20px;
     }
+    .tip{
+        color: #FBA57F;
+        font-size: 12px;
+        line-height: 22px;
+    }
     .ref_btn{
         color: #868BA3;
         cursor: pointer;