Merge remote-tracking branch 'origin/master'

gassafety-web/src/components/mapDialog/checkDeviceLoaction.vue

@@ -26,7 +26,7 @@
     <div style="width: 47vw; height: 65vh" id="container"></div>
 
     <el-col :span="8" class="button">
-      <el-input id="ss" placeholder="输入地址" v-model="keyWorld"  ></el-input>
+      <el-input id="ss" placeholder="输入地址" v-model="keyWorld" size="small" ></el-input>
       <el-button size="small" type="primary" icon="el-icon-search" @click="search" style="position: fixed;margin-left: 3px;">搜索</el-button>
     </el-col>
 
@@ -131,9 +131,9 @@
   }
 
   .button{
-    position: relative;
-    top: -453px;
-    left: 14px;
+    position: absolute;
+    top: 140px;
+    left: 35px;
   }
 
   .button .el-input{