Merge branch 'qll' into dev

src/views/draw/metadata/detail.vue

@@ -352,7 +352,7 @@
 								<el-input v-model="positionForm.latitude" disabled></el-input>
 								<div class="tip">请在下面地图上单击，拾取经纬度</div>
 							</el-form-item>
-							<baidu-map class="bm-position" :center="backForm.keyword" @ready="handleMap">
+							<baidu-map class="bm-position" :center="city" @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>
@@ -505,7 +505,7 @@ export default {
 			loading:false,
 			domain: process.env.BASE_API,
 			requestPath: requestPath,
-			//packet:{lng: 116.404, lat: 39.915},
+			packet:{lng: 116.404, lat: 39.915},
 			entityVisible:false,
 			personLinkVisible:false,
 			positionLinkVisible:false,
@@ -723,7 +723,8 @@ export default {
 			}	else if(this.backForm.state==4){
 				this.timerLinkVisible=true;
 			}
-			this.backForm.keyword=keyword;			
+			this.backForm.keyword=keyword;		
+			this.city=keyword;//地图的显示中心	
 			this.backDetial()
 		},
 		resetEntity(){
@@ -791,6 +792,11 @@ export default {
 					}else if(this.backForm.state==3){
 						if(res.data.data){
 							this.positionForm=res.data.data;
+							if(!this.positionForm.longitude){
+								this.city="北京";//地图的显示中心
+							}
+						}else{
+							this.city="北京";//地图的显示中心
 						}
 					}else if(this.backForm.state==2){
 						this.organizationForm=res.data.data||{};