From 78c5fb941df47c71d069e37f41c76f8b6d5f3099 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Wed, 29 Mar 2023 13:36:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug=E5=91=8A=E8=AD=A6=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E8=B7=B3=E8=BD=AC=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Detail/ChildDevice/BindChildDevice/index.vue         | 7 ++++++-
 src/views/device/Product/Save/index.vue                  | 9 +--------
 src/views/rule-engine/Alarm/Configuration/index.vue      | 9 +++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
index 59aca823..95cf2311 100644
--- a/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
@@ -27,7 +27,11 @@
                     terms: [
                         {
                             terms: [
-                                { column: 'parentId$isnull', value: '1' },
+                                {
+                                    column: 'parentId$isnull',
+                                    value: '',
+                                    type: 'or',
+                                },
                                 {
                                     column: 'parentId$not',
                                     value: detail.id,
@@ -43,6 +47,7 @@
                                     type: 'and',
                                 },
                             ],
+                            type: 'and',
                         },
                         {
                             terms: [
diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue
index af70c3d1..b9f693d3 100644
--- a/src/views/device/Product/Save/index.vue
+++ b/src/views/device/Product/Save/index.vue
@@ -85,6 +85,7 @@
                         :value="form.deviceType"
                         :options="deviceList"
                         @change="changeDeviceType"
+                        :disabled="disabled"
                     >
                         <template #title="item">
                             <span>{{ item.title }}</span>
@@ -265,13 +266,6 @@ const dealProductTree = (arr: any) => {
         return element
     });
 };
-watch(
-    () => props.isAdd,
-    () => {
-        // queryProductTree();
-    },
-    { immediate: true, deep: true },
-);
 /**
  * 显示弹窗
  */
@@ -318,7 +312,6 @@ const submitData = () => {
     formRef.value
         .validate()
         .then(async () => {
-            console.log(form);
             // 新增
             if (props.isAdd === 1) {
                 if (form.id === '') {
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index b64c1eb4..f2eff490 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -42,6 +42,15 @@
                             enabled: 'processing',
                             disabled: 'error',
                         }"
+                        @click="
+                            () => {
+                                menuStory.jumpPage(
+                                    'rule-engine/Alarm/Configuration/Save',
+                                    {},
+                                    { id: slotProps.id },
+                                );
+                            }
+                        "
                     >
                         <template #img>
                             <slot name="img">