diff --git a/src/api/storeManage/deviceManage/device.js b/src/api/storeManage/deviceManage/device.js
index 4a184bd..07b199f 100644
--- a/src/api/storeManage/deviceManage/device.js
+++ b/src/api/storeManage/deviceManage/device.js
@@ -76,7 +76,7 @@ function getUrl(data, optTYpe) {
url = 'api/insidedevices/'
} else if (data.deviceTypeId.name === '通道门' || data.deviceTypeId.name === '手持式RFID读写器') {
url = 'api/outsidedevices/'
- } else if (data.deviceTypeId.name === '条码打印机') {
+ } else if (data.deviceTypeId.name === '条码打印机' || data.deviceTypeId.name === '门禁') {
url = 'api/device/'
}
if (optTYpe === 'add') {
diff --git a/src/views/storeManage/deviceManage/module/deviceDetail.vue b/src/views/storeManage/deviceManage/module/deviceDetail.vue
index 5bc9c73..204bf71 100644
--- a/src/views/storeManage/deviceManage/module/deviceDetail.vue
+++ b/src/views/storeManage/deviceManage/module/deviceDetail.vue
@@ -39,10 +39,10 @@
-
+
-
+
@@ -463,12 +463,16 @@ export default {
[CRUD.HOOK.afterRefresh](crud) {
console.log('crud.data', crud.data)
const RFID_DEVICE_TYPE_ID = 'E2767FEACA9CE0E3B16B89'
+ // 新增的设备类型ID - 直接在线
+ const ONLINE_DEVICE_TYPE_ID = 'DD656054BE3D1DF1E2F1FC'
crud.data.forEach(element => {
console.log('element', element)
// 检查设备类型ID是否存在
if (element.deviceTypeId?.id === RFID_DEVICE_TYPE_ID) {
this.getRFIDReadStatus(element)
+ } else if (element.deviceTypeId?.id === ONLINE_DEVICE_TYPE_ID) {
+ element.deviceState = 1
} else {
if (element.deviceIp) {
this.getDeviceState(element)
@@ -491,9 +495,9 @@ export default {
},
getRFIDReadStatus(element) {
- crudDevice.FetchRFIDReadStatus({ id: element.deviceTypeId.id })
+ crudDevice.FetchRFIDReadStatus({ id: element.id })
.then((data) => {
- element.deviceState = data === 0 ? 1 : 0
+ element.deviceState = data === '0' ? 1 : 0
})
.catch((error) => {
console.error('获取RFID设备状态失败:', error)