From 279d88e7298f1ccd5980d27c75a293be70a4d96b Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 29 Mar 2025 12:52:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=91IoT:=20=E5=9C=BA=E6=99=AF=E8=81=94=E5=8A=A8=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=99=A8-=E6=95=B0=E6=8D=AE=E6=A1=A5=E6=A2=81?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/device/device/index.ts            |  2 +-
 src/api/iot/rule/databridge/index.ts          |  6 +--
 .../components/action/ActionExecutor.vue      |  1 +
 .../components/action/DataBridgeAction.vue    | 37 ++++++-------------
 4 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/api/iot/device/device/index.ts b/src/api/iot/device/device/index.ts
index b32eaf642..6b5fa1564 100644
--- a/src/api/iot/device/device/index.ts
+++ b/src/api/iot/device/device/index.ts
@@ -170,7 +170,7 @@ export const DeviceApi = {
   // 根据ProductKey和DeviceNames获取设备列表
   getDevicesByProductKeyAndNames: async (productKey: string, deviceNames: string[]) => {
     return await request.get({
-      url: `/iot/device/get-by-product-key-and-names`,
+      url: `/iot/device/list-by-product-key-and-names`,
       params: {
         productKey,
         deviceNames: deviceNames.join(',')
diff --git a/src/api/iot/rule/databridge/index.ts b/src/api/iot/rule/databridge/index.ts
index b19b8e8cf..02568ccfe 100644
--- a/src/api/iot/rule/databridge/index.ts
+++ b/src/api/iot/rule/databridge/index.ts
@@ -124,8 +124,8 @@ export const DataBridgeApi = {
     return await request.delete({ url: `/iot/data-bridge/delete?id=` + id })
   },
 
-  // 导出数据桥梁 Excel
-  exportDataBridge: async (params) => {
-    return await request.download({ url: `/iot/data-bridge/export-excel`, params })
+  // 查询数据桥梁（精简）列表
+  getSimpleDataBridgeList() {
+    return request.get({ url: '/iot/data-bridge/simple-list' })
   }
 }
diff --git a/src/views/iot/rule/scene/components/action/ActionExecutor.vue b/src/views/iot/rule/scene/components/action/ActionExecutor.vue
index 3d9e4d4ac..79b2409a2 100644
--- a/src/views/iot/rule/scene/components/action/ActionExecutor.vue
+++ b/src/views/iot/rule/scene/components/action/ActionExecutor.vue
@@ -79,6 +79,7 @@
 
 <script setup lang="ts">
 import { useVModel } from '@vueuse/core'
+import { isEmpty } from '@/utils/is'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import ProductTableSelect from '@/views/iot/product/product/components/ProductTableSelect.vue'
 import DeviceTableSelect from '@/views/iot/device/device/components/DeviceTableSelect.vue'
diff --git a/src/views/iot/rule/scene/components/action/DataBridgeAction.vue b/src/views/iot/rule/scene/components/action/DataBridgeAction.vue
index ffca12fd7..8a4f35aad 100644
--- a/src/views/iot/rule/scene/components/action/DataBridgeAction.vue
+++ b/src/views/iot/rule/scene/components/action/DataBridgeAction.vue
@@ -1,13 +1,8 @@
 <template>
   <div class="bg-[#dbe5f6] p-10px">
     <div class="flex items-center">
-      <span class="mr-10px w-80px">数据桥接</span>
-      <el-select
-        v-model="dataBridgeId"
-        class="!w-240px"
-        clearable
-        placeholder="选择数据桥接"
-      >
+      <span class="mr-10px w-80px">数据桥梁</span>
+      <el-select v-model="dataBridgeId" class="!w-240px" clearable placeholder="选择数据桥接">
         <el-option
           v-for="bridge in dataBridgeList"
           :key="bridge.id"
@@ -21,6 +16,7 @@
 
 <script setup lang="ts">
 import { useVModel } from '@vueuse/core'
+import { DataBridgeApi } from '@/api/iot/rule/databridge'
 
 /** 数据桥接执行器组件 */
 defineOptions({ name: 'DataBridgeAction' })
@@ -29,23 +25,14 @@ const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
 const dataBridgeId = useVModel(props, 'modelValue', emits)
 
-// 模拟数据桥接列表，实际项目中应该从API获取
-const dataBridgeList = ref([
-  { id: 1, name: '数据桥接1' },
-  { id: 2, name: '数据桥接2' },
-  { id: 3, name: '数据桥接3' }
-])
+const dataBridgeList = ref<any[]>([]) // 数据桥接列表
 
-// 实际项目中，应该从API获取数据桥接列表
-// const getDataBridgeList = async () => {
-//   try {
-//     dataBridgeList.value = await DataBridgeApi.getSimpleList()
-//   } catch (error) {
-//     console.error('获取数据桥接列表失败', error)
-//   }
-// }
+// 获取数据桥接列表
+const getDataBridgeList = async () => {
+  dataBridgeList.value = await DataBridgeApi.getSimpleDataBridgeList()
+}
 
-// onMounted(() => {
-//   getDataBridgeList()
-// })
-</script> 
+onMounted(() => {
+  getDataBridgeList()
+})
+</script>