代码合并

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

@@ -1,6 +1,6 @@
 <template>
     <!-- 编码设备管理 -->
-    <div class="app-container" id="devices">
+    <div class="app-container" id="devices" v-if="!props.isShow">
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -513,6 +513,10 @@
                 <!-- <el-button type="primary" @click="downloadCode">下 载</el-button> -->
             </div>
         </el-dialog>
+        <MapDialog ref="mapDialog" @getList="getList" />
+    </div>
+    <div v-else>
+        <BindIOT :props="props" />
     </div>
 </template>
 
@@ -534,12 +538,22 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import QRCode from 'qrcodejs2'
 
+import BindIOT from './component/BindIOT'
+import MapDialog from './component/MapDIalog'
+
 export default {
     name: 'Devices',
     dicts: ['sys_normal_disable'],
     components: { Treeselect },
     data() {
         return {
+            openMap: false,
+            isShow: false,
+            props: {
+                isShow: false,
+                typeId: '',
+                maCode: '',
+            },
             // 遮罩层
             loading: true,
             // 选中数组