From 6745594e3a331ce58252089f4f4eb44d8a8dbb0c Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 21 Mar 2025 14:03:05 +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=E8=A7=84=E5=88=99=E5=9C=BA=E6=99=AF=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E5=99=A8=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rule/scene/components/DeviceListener.vue  | 56 ++++++++++++-------
 .../components/DeviceListenerCondition.vue    |  2 +-
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/views/iot/rule/scene/components/DeviceListener.vue b/src/views/iot/rule/scene/components/DeviceListener.vue
index 09d51d54..161ac867 100644
--- a/src/views/iot/rule/scene/components/DeviceListener.vue
+++ b/src/views/iot/rule/scene/components/DeviceListener.vue
@@ -27,7 +27,9 @@
       </div>
       <!-- 删除触发器 -->
       <div class="device-listener-delete">
-        <slot></slot>
+        <el-tooltip content="删除触发器" placement="top">
+          <slot></slot>
+        </el-tooltip>
       </div>
     </div>
     <!-- 触发器条件 -->
@@ -54,26 +56,37 @@
           @update:model-value="(val) => (condition.parameters[index2] = val)"
           class="mb-10px last:mb-0"
         >
-          <!-- 删除规则 -->
-          <el-button
-            class="device-listener-delete"
-            type="danger"
-            circle
-            :icon="Delete"
-            size="small"
-            @click="removeConditionParameter(condition.parameters, index2)"
-          />
+          <el-tooltip content="删除参数" placement="top">
+            <el-button
+              class="device-listener-delete"
+              type="danger"
+              circle
+              :icon="Delete"
+              size="small"
+              @click="removeConditionParameter(condition.parameters, index2)"
+            />
+          </el-tooltip>
         </DeviceListenerCondition>
       </div>
-      <div class="flex flex-1 flex-col items-center justify-center w-a h-a">
-        <!-- 添加规则 -->
-        <el-button
-          type="primary"
-          circle
-          :icon="Plus"
-          size="small"
-          @click="addConditionParameter(condition.parameters)"
-        />
+      <!-- 添加参数 -->
+      <div class="flex flex-1 flex-col items-center justify-center w-60px h-a">
+        <el-tooltip content="添加参数" placement="top">
+          <el-button
+            type="primary"
+            circle
+            :icon="Plus"
+            size="small"
+            @click="addConditionParameter(condition.parameters)"
+          />
+        </el-tooltip>
+      </div>
+      <!-- 删除条件 -->
+      <div
+        class="device-listener-condition flex flex-1 flex-col items-center justify-center w-a h-a"
+      >
+        <el-tooltip content="删除条件" placement="top">
+          <el-button type="danger" :icon="Delete" size="small" @click="removeCondition(index)" />
+        </el-tooltip>
       </div>
     </div>
     <el-text class="ml-10px!" type="primary" @click="addCondition">添加触发条件</el-text>
@@ -104,7 +117,10 @@ const addCondition = () => {
     parameters: []
   })
 }
-
+/** 移除触发条件 */
+const removeCondition = (index: number) => {
+  triggerConfig.value.conditions.splice(index, 1)
+}
 /** 添加参数 */
 const addConditionParameter = (conditionParameters: IotRuleSceneTriggerConditionParameter[]) => {
   conditionParameters.push({} as IotRuleSceneTriggerConditionParameter)
diff --git a/src/views/iot/rule/scene/components/DeviceListenerCondition.vue b/src/views/iot/rule/scene/components/DeviceListenerCondition.vue
index 6bf48a34..eac40cdc 100644
--- a/src/views/iot/rule/scene/components/DeviceListenerCondition.vue
+++ b/src/views/iot/rule/scene/components/DeviceListenerCondition.vue
@@ -15,7 +15,7 @@
     </el-select>
     <el-select
       v-model="conditionParameter.operator"
-      class="!w-240px mr-10px"
+      class="!w-180px mr-10px"
       clearable
       placeholder="请选择条件"
     >