代码合并

sgzb-ui/public/index.html

@@ -203,6 +203,13 @@
       color: #FFF;
       opacity: 0.5;
     }
+
+
+    /** 去除百度地图的水印和logo */
+    .BMap_cpyCtrl,
+    .anchorBL {
+      display: none;
+    }
   </style>
 </head>
 

sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue

@@ -532,7 +532,12 @@
                 <!-- <el-button type="primary" @click="downloadCode">下 载</el-button> -->
             </div>
         </el-dialog>
-        <MapDialog ref="mapDialog" @getList="getList" />
+        <MapDialog
+            v-if="mapDialogVisible"
+            :deviceName="deviceName"
+            :deviceType="deviceType"
+            @handelCloseDialog="handelCloseDialog"
+        />
     </div>
     <div v-else>
         <BindIOT :props="props" />
@@ -637,6 +642,9 @@ export default {
                     },
                 ],
             },
+            mapDialogVisible: false,
+            deviceName: '',
+            deviceType: '',
         }
     },
     created() {
@@ -833,13 +841,14 @@ export default {
         },
         // 查看设备地图
         handleMap(row) {
-            console.log('~ handleMap ~ 地图', row)
+            this.deviceName = row.specificationType
-            const params = {
+            this.deviceType = row.maStatusName
-                deviceType: row.deviceType,
+            this.mapDialogVisible = true
-            }
+        },
-            // 点击打开弹框
+
-            this.$refs.mapDialog.openMapDialog(true)
+        /** 关闭地图弹框 */
-            this.$refs.mapDialog.getEquipmentInfo(params)
+        handelCloseDialog() {
+            this.mapDialogVisible = false
         },
     },
 }