diff --git a/apps/web-antd/src/views/iot/device/device/data.ts b/apps/web-antd/src/views/iot/device/device/data.ts index 424f0ef92..5edd1cc0d 100644 --- a/apps/web-antd/src/views/iot/device/device/data.ts +++ b/apps/web-antd/src/views/iot/device/device/data.ts @@ -239,7 +239,7 @@ export function useGridFormSchema(): VbenFormSchema[] { label: '设备状态', component: 'Select', componentProps: { - options: getDictOptions(DICT_TYPE.IOT_DEVICE_STATUS, 'number'), + options: getDictOptions(DICT_TYPE.IOT_DEVICE_STATE, 'number'), placeholder: '请选择设备状态', allowClear: true, }, @@ -295,12 +295,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { slots: { default: 'groups' }, }, { - field: 'status', + field: 'state', title: '设备状态', minWidth: 100, cellRender: { name: 'CellDict', - props: { type: DICT_TYPE.IOT_DEVICE_STATUS }, + props: { type: DICT_TYPE.IOT_DEVICE_STATE }, }, }, { diff --git a/apps/web-antd/src/views/iot/device/device/index.vue b/apps/web-antd/src/views/iot/device/device/index.vue index f83a7c14a..d06649d66 100644 --- a/apps/web-antd/src/views/iot/device/device/index.vue +++ b/apps/web-antd/src/views/iot/device/device/index.vue @@ -307,7 +307,7 @@ onMounted(async () => { style="width: 200px" > diff --git a/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue b/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue index efaad5976..8f8afc3e0 100644 --- a/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue +++ b/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue @@ -294,7 +294,7 @@ onMounted(async () => { style="width: 240px" > @@ -373,7 +373,7 @@ onMounted(async () => { diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue index d4b6b06cb..5ba870c61 100644 --- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue +++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue @@ -106,7 +106,7 @@ function handleAuthInfoDialogClose() { diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts index c2ffca955..73a5c57dc 100644 --- a/packages/constants/src/dict-enum.ts +++ b/packages/constants/src/dict-enum.ts @@ -155,7 +155,6 @@ const IOT_DICT = { IOT_DATA_SINK_TYPE_ENUM: 'iot_data_sink_type_enum', // IoT 数据流转目的类型 IOT_DATA_TYPE: 'iot_data_type', // IOT 数据类型 IOT_DEVICE_STATE: 'iot_device_state', // IOT 设备状态 - IOT_DEVICE_STATUS: 'iot_device_status', // IOT 设备状态 IOT_LOCATION_TYPE: 'iot_location_type', // IOT 定位类型 IOT_NET_TYPE: 'iot_net_type', // IOT 联网方式 IOT_OTA_TASK_DEVICE_SCOPE: 'iot_ota_task_device_scope', // IoT OTA任务设备范围