diff --git a/sgzb-ui/public/index.html b/sgzb-ui/public/index.html index 63e9fadc..82b4e090 100644 --- a/sgzb-ui/public/index.html +++ b/sgzb-ui/public/index.html @@ -11,6 +11,9 @@ <%= webpackConfig.name %> + + + + diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue index 6eb7a8f8..768b29c1 100644 --- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue +++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue @@ -533,7 +533,7 @@ - +
@@ -557,13 +557,13 @@ import { listHouseTree } from '@/api/store/shelves' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import QRCode from 'qrcodejs2' -import BindIOT from './component/BindIOT.vue' -import MapDIalog from './component/MapDIalog.vue' +import BindIOT from './component/BindIOT' +import MapDialog from './component/MapDialog' export default { name: 'Devices', dicts: ['sys_normal_disable'], - components: { Treeselect, BindIOT, MapDIalog }, + components: { Treeselect, BindIOT, MapDialog }, data() { return { openMap: false, @@ -820,8 +820,13 @@ export default { }, handleMap(row) { console.log('~ handleMap ~ 地图', row) + const params = { + deviceType: row.deviceType, + } // 点击打开弹框 - this.openMap = true + this.$refs.mapDIalog.openMapDialog(true) + this.$refs.mapDIalog.getEquipmentInfo(params) + this.$refs.mapDIalog.initMap() } }, }