Merge tag 'map_list_location' into develop

no message

resources/js/views/map/index.vue

@@ -55,12 +55,13 @@
     <el-dialog
       :title="dialogTitle"
       :visible.sync="dialogTableVisible"
-      width="40%"
+      width="35%"
       :modal="false"
+      top="20vh"
       custom-class="zero-dialog"
     >
       <el-table :data="gridData" :show-header="false">
-        <el-table-column property="title"></el-table-column>
+        <el-table-column property="title" width="180px"></el-table-column>
         <el-table-column property="content"></el-table-column>
       </el-table>
     </el-dialog>
@@ -313,8 +314,10 @@ export default {
     getUserDeviceInfo(id) {
       deviceinfo(id)
         .then(res => {
-          this.dialogTableVisible = true;
           const deviceInfo = res.data;
+          this.center = deviceInfo.devicecoord.replace(/\s*/g, '').split(',');
+          this.dialogTableVisible = true;
+          this.markersDeviceVisible = true;
           this.gridData = [
             {
               title: '设备编号',
@@ -512,4 +515,9 @@ export default {
   padding: 0px 10px 0px 10px;
   background-color: #ffffff;
 }
+.zero-dialog {
+  float: right;
+  right: 1px;
+  bottom: 1px;
+}
 </style>