Merge remote-tracking branch 'origin/master'

@@ -3,11 +3,11 @@
     <div :id="viewId" class="viewDiv">
     </div>
 	<div class="mapViewPoint">
-		<span class="key">比例尺:</span>
-		<span class="value">{{ mapInfo.scale }}km</span>
-		<span class="key">经度:</span>
+		<!-- <span class="key">比例尺:</span> -->
+		<div class="viewScale"><span class="value">{{ mapInfo.scale }}公里</span></div>
+		<span class="key">X坐标</span>
 		<span class="value">{{ mapInfo.x }}</span>
-		<span class="key">纬度:</span>
+		<span class="key">Y坐标</span>
 		<span class="value">{{ mapInfo.y }}</span>
 	</div>
   </div>  
@@ -70,7 +70,7 @@
 							var point = view.toMap({x: event.x, y: event.y});
 							self.mapInfo.x = point.longitude.toFixed(6);
 							self.mapInfo.y = point.latitude.toFixed(6);
-							self.mapInfo.scale = (view.scale/1000).toFixed(3);
+							self.mapInfo.scale = (view.scale/1000).toFixed(0);
 							
 						});
                     }).catch(err => {
@@ -90,22 +90,33 @@
           width: 100%;
           }
 		  .mapViewPoint{
+			      display: inline-flex;
 			      position: absolute;
 			      bottom: 10px;
 			      left: 5px;
-			      background-color: white;
-			      line-height: 36px;
-			      font-size: 12px;
-			      border-radius: 4px;
-				  box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
-				  .key{
-					  font-weight: 600;
-				  }
+				  line-height: 12px;
 				  .value{
 					  margin-left: 0px;
 				  }
 				  span{
 					  margin:0px 5px;
+					  font-family: SFUIDisplay-Medium;
+					  font-size: 12px;
+					  color: #4A4A4A;
+					  font-weight: bold;
+					  letter-spacing: 0;
+					  text-shadow: 0 -1px 0 #FFFFFF;
+					  position: relative;
+					  bottom: 9px;
+				  }
+				  .viewScale{
+					   width: auto;
+					     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANIAAAAOCAYAAABaZUIWAAAABGdBTUEAALGPC/xhBQAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAA0qADAAQAAAABAAAADgAAAAD7u0TwAAAA4ElEQVRoBe3a4QnCMBCG4UQcpKPU39kpq8UFsoObxBzVH6WeNHBQ2nsDFYlH4j3lI1QMoY/WWumXNorUMBDwKtCDUbRwyGficvOKQ98IWAqsglRrfaWUglzy3nIj1kLg7AL/8rEK0tkb5fsjcJQAQTpKnn0vJXDf0c0sD1o76ihBwK0AJ5LbW0/jlgLqiZRzniw3Yi0ELiAwaT1wImkyzCMwIECQBrAoRUAT+BUkfljQtJhHYBHYZCTK/OdvDvNSwysCCAwIPGOMj++JtEnYwEKUIuBVQHJDdrzeffq2F3gDSn1fbXNQA8oAAAAASUVORK5CYII=) top no-repeat;
+					     background-size: contain;
+					     background-position-y: 6px;
+						 span{
+							  margin: 0px 21px;
+						 }
 				  }
 		  }
   }

@@ -93,7 +93,7 @@
         </div>
 		<!-- 底部数据展示区域 -->
 		<div class="bottomResult" v-if="bottomResultDialog">
-			<div class="closeButn" @click="closeBufferDialog">
+			<div class="closeButn" @click="closeBufferDialog(false)">
 				<i class="el-icon-close"></i>
 			</div>
 			  <el-tabs v-model="activeName" >
@@ -476,8 +476,8 @@ export default {
 					  color: #F39835;
 				  }
 				  .active{
-					  border-bottom: 1.5px solid #409eff;
-					  padding-bottom: 5px;
+					  border-bottom: 2px solid #409eff;
+					  padding-bottom: 10px;
 				  }
 			  }
           .searchResult{
@@ -575,11 +575,10 @@ export default {
 		      background-color: #ffffff;
 		      margin: 10px;
 		      border-radius: 4px;
-			  padding: 5px;
 			  .closeButn{
 				  position: relative;
 				      float: right;
-				      font-size: 20px;
+				      font-size: 18px;
 				      color: #9B9B9B;
 					  z-index: 16;
 			  }
@@ -592,6 +591,14 @@ export default {
 			 /deep/ .el-table td, .el-table th.is-leaf {
 				  text-align: center;
 			  }
+			  /deep/ .el-tabs__nav :first{
+				  margin-left: 33px;
+			  }
+			  
+			  /deep/ .el-tabs__item.is-active{
+				  color: #505050;
+				  background-color:#ffffff;
+			  }
 	  }
   }
 </style>
\ No newline at end of file

@@ -377,7 +377,6 @@
 			        }
 			    }
 				//将那个导入图层清除
-				
 			    self.createBuffer(this.importGeo,self.bufferParams.distance,self.viewId,function (bufGeo) {
 			        self.identify(self.layerUrl,self.bufferParams.layerId,bufGeo,function(res){
 			            var resultes = res.results;
@@ -431,6 +430,7 @@
 			getDjzqList(){
 			    var self = this,
 			        djzqLayer= this.getLayerByName("DJZQ");
+					self.bufferParams.selectDjzq = "";
 			    self.djzqList = [];
 			    this.queryAttributes(this.layerUrl+"/"+djzqLayer.id,{"DJZQDM":this.bufferParams.selectDjq},function (features) {
 			        if(features != null){