diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..2e87f71 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -3,7 +3,6 @@ import { ref } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' -import type { IEquipmentScan } from './scan-interface' import scanImg from '@/assets/images/scan.png' import { getDictByCode } from '@/api/system/dict' import { getReadList, getReaderEquipmentList } from '@/api/reader' @@ -24,7 +23,7 @@ const singleChecked = ref('') // 单选选中id // 扫描到的标签列表 -const list = ref([]) +const list = ref([]) // 获取数据 const mesureTypeMap = ref({}) as any @@ -92,7 +91,7 @@ if (isBinding.value) { // 标签绑定 list.value = response.data.map((item: string) => { return { - label: item, + rfid: item, } }) } diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..2e87f71 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -3,7 +3,6 @@ import { ref } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' -import type { IEquipmentScan } from './scan-interface' import scanImg from '@/assets/images/scan.png' import { getDictByCode } from '@/api/system/dict' import { getReadList, getReaderEquipmentList } from '@/api/reader' @@ -24,7 +23,7 @@ const singleChecked = ref('') // 单选选中id // 扫描到的标签列表 -const list = ref([]) +const list = ref([]) // 获取数据 const mesureTypeMap = ref({}) as any @@ -92,7 +91,7 @@ if (isBinding.value) { // 标签绑定 list.value = response.data.map((item: string) => { return { - label: item, + rfid: item, } }) } diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 0beb48c..2ffbf71 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -567,7 +567,7 @@ // 扫描结束 const scanOver = (value: any) => { console.log('***************************') - const label = value.label + const label = value.rfid console.log(label) scanEquipmentRef.value.closeDialog() equipmentLabelBind({ label, sampleId: ruleForm.value.equipmentId }).then((res) => {