diff --git a/src/renderer/src/views/components/bottomSide/bottomSide.vue b/src/renderer/src/views/components/bottomSide/bottomSide.vue index 994a167..b430fcb 100644 --- a/src/renderer/src/views/components/bottomSide/bottomSide.vue +++ b/src/renderer/src/views/components/bottomSide/bottomSide.vue @@ -211,27 +211,6 @@ const bottomMenuList = ref([ availablePort.value + "/" + "GEMarker1/A-ablu-blank.png", - }, - attribute: { - goods: { - content: [ - { - id: 1, - name: '物资1', - cnt: 10 - }, - { - id: 2, - name: '物资2', - cnt: 10 - }, - { - id: 3, - name: '物资3', - cnt: 10 - } - ] - } } } }) diff --git a/src/renderer/src/views/components/propertyBox/attribute.vue b/src/renderer/src/views/components/propertyBox/attribute.vue index 6192e22..839038b 100644 --- a/src/renderer/src/views/components/propertyBox/attribute.vue +++ b/src/renderer/src/views/components/propertyBox/attribute.vue @@ -229,6 +229,7 @@ import { ref } from 'vue' import { inject } from 'vue' import { deviceApi } from '@/api/deviceManage' +import { MaterialApi } from '@/api/material' let ipcRenderer; if (window && window.process && window.process.type === 'renderer') { @@ -281,37 +282,15 @@ const goodsFilter = () => { } } } -const goodsSelect = (page) => { - allGoodsList.value = [ - // { - // id: '1', - // name: '物资1' - // }, - // { - // id: '2', - // name: '物资2' - // }, - // { - // id: '3', - // name: '物资3' - // }, - // { - // id: '4', - // name: '物资4' - // }, - // { - // id: '5', - // name: '物资5' - // }, - // { - // id: '6', - // name: '物资6' - // }, - // { - // id: '7', - // name: '物资7' - // } - ] +const goodsSelect = async (page) => { + let formData = new FormData() + formData.append('pageNum', 1) + formData.append('pageSize', 999999) + formData.append('name', goodsKeywords.value) + const res = await MaterialApi.getList(formData) + if (res.code === 200) { + allGoodsList.value = res.data.records + } for (let i = props.entityOptions.attributeGoods.length - 1; i >= 0; i--) { let flag = false for (let m = 0; m < allGoodsList.value.length; m++) {