代码合并

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

@@ -544,7 +544,7 @@ import MapDialog from './component/MapDIalog'
 export default {
     name: 'Devices',
     dicts: ['sys_normal_disable'],
-    components: { Treeselect },
+    components: { Treeselect, BindIOT, MapDialog },
     data() {
         return {
             openMap: false,

sgzb-ui/vue.config.js

@@ -48,7 +48,7 @@ module.exports = {
         // target: `http://192.168.2.82:28080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅
         // target: `http://192.168.2.209:28080`, //福
-        target: `http://192.168.2.114:39080`, //福
+        target: `http://192.168.2.114:39080`, //王
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;