From a410fb40f6a9a1c89a66d85c421921ca21fa8e45 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 21 Mar 2025 15:54:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=91IoT:=20=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/IoTDeviceTableSelect.vue | 300 ++++++++++++++++++ ...stSelect.vue => IoTProductTableSelect.vue} | 8 +- .../rule/scene/components/DeviceListener.vue | 40 ++- 3 files changed, 337 insertions(+), 11 deletions(-) create mode 100644 src/views/iot/device/device/components/IoTDeviceTableSelect.vue rename src/views/iot/product/product/components/{ProductListSelect.vue => IoTProductTableSelect.vue} (98%) diff --git a/src/views/iot/device/device/components/IoTDeviceTableSelect.vue b/src/views/iot/device/device/components/IoTDeviceTableSelect.vue new file mode 100644 index 000000000..28ca03cc7 --- /dev/null +++ b/src/views/iot/device/device/components/IoTDeviceTableSelect.vue @@ -0,0 +1,300 @@ + + + diff --git a/src/views/iot/product/product/components/ProductListSelect.vue b/src/views/iot/product/product/components/IoTProductTableSelect.vue similarity index 98% rename from src/views/iot/product/product/components/ProductListSelect.vue rename to src/views/iot/product/product/components/IoTProductTableSelect.vue index 12a8afc89..965508c97 100644 --- a/src/views/iot/product/product/components/ProductListSelect.vue +++ b/src/views/iot/product/product/components/IoTProductTableSelect.vue @@ -121,7 +121,7 @@ import { DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import { ProductApi, ProductVO } from '@/api/iot/product/product' -defineOptions({ name: 'IoTProductSelectForm' }) +defineOptions({ name: 'IoTProductTableSelect' }) const props = defineProps({ multiple: { @@ -177,6 +177,7 @@ const open = async () => { // 重置选择状态 selectedProducts.value = [] selectedId.value = undefined + await getList() } defineExpose({ open }) @@ -213,9 +214,4 @@ const submitForm = async () => { emit('success', props.multiple ? selectedProducts.value : selectedProducts.value[0]) dialogVisible.value = false } - -/** 初始化 **/ -onMounted(() => { - getList() -}) diff --git a/src/views/iot/rule/scene/components/DeviceListener.vue b/src/views/iot/rule/scene/components/DeviceListener.vue index 95fa89345..3a948c432 100644 --- a/src/views/iot/rule/scene/components/DeviceListener.vue +++ b/src/views/iot/rule/scene/components/DeviceListener.vue @@ -19,13 +19,15 @@
产品 - + {{ !product ? '选择产品' : product.name }}
设备 - 选择设备 + + {{ isEmpty(deviceList) ? '选择设备' : triggerConfig.deviceNames.join(',') }} +
@@ -93,20 +95,30 @@
添加触发条件 - + + +