diff --git a/src/api/reader.ts b/src/api/reader.ts index b05b634..7360639 100644 --- a/src/api/reader.ts +++ b/src/api/reader.ts @@ -2,7 +2,7 @@ import axios from 'axios' import request from './request' const readerType: { [key: string]: string } = { - readerWriter: 'http://127.0.0.1:8083/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器 + readerWriter: 'http://127.0.0.1:8083/business/readWriter/tIdAndMiniAndGun/readList', // 有线扫码枪和大读写器 // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器 } // 获取大读写器读写内容 diff --git a/src/api/reader.ts b/src/api/reader.ts index b05b634..7360639 100644 --- a/src/api/reader.ts +++ b/src/api/reader.ts @@ -2,7 +2,7 @@ import axios from 'axios' import request from './request' const readerType: { [key: string]: string } = { - readerWriter: 'http://127.0.0.1:8083/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器 + readerWriter: 'http://127.0.0.1:8083/business/readWriter/tIdAndMiniAndGun/readList', // 有线扫码枪和大读写器 // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器 } // 获取大读写器读写内容 diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 66cfc36..4741aed 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -766,13 +766,21 @@ console.log('***************************') const label = value.rfid console.log(label) - scanEquipmentRef.value.closeDialog() - equipmentLabelBind({ label, equipmentId: ruleForm.value.equipmentId }).then((res) => { + // scanEquipmentRef.value.closeDialog() + const handler = () => { ElMessage.success('标签绑定成功') scanEquipmentRef.value.closeDialog() // initDialog() ruleForm.value.rfid = label - }) + } + if (dialogStatus.value === 'update') { + equipmentLabelBind({ label, equipmentId: ruleForm.value.equipmentId }).then((res) => { + handler() + }) + } + else { + handler() + } } // ----------------------------------------------------------------------------------------------- defineExpose({ ruleForm, apply, editForm, submitForm, saveForm, delForm, print, cancelForm })