From a02e4efa51420f0c56b3c795d4d9c76055425cea Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Mon, 5 Jun 2023 11:29:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Instance/Detail/Running/Property/index.vue   | 4 +++-
 .../Scene/Save/action/Notify/variableItem/User.vue            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/device/Instance/Detail/Running/Property/index.vue b/src/views/device/Instance/Detail/Running/Property/index.vue
index fd9db835..c45500b4 100644
--- a/src/views/device/Instance/Detail/Running/Property/index.vue
+++ b/src/views/device/Instance/Detail/Running/Property/index.vue
@@ -251,6 +251,7 @@ const subscribeProperty = () => {
 };
 
 const getDashboard = async () => {
+    if(!dataSource.value?.length) return 
     const param = [
         {
             dashboard: 'device',
@@ -302,9 +303,10 @@ const query = (params: Record<string, any>) =>
             });
             arr = _.cloneDeep(li);
         }
+        dataSource.value = arr.slice(_from, _to)
         resolve({
             result: {
-                data: arr.slice(_from, _to),
+                data: dataSource.value,
                 pageIndex: params.pageIndex || 0,
                 pageSize: params.pageSize || 12,
                 total: arr.length,
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
index 1016aec4..2fdb15df 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
@@ -274,7 +274,7 @@ const getUser = async (_source: string, _triggerType: string) => {
             children: relationResp.result.map((item: any) => {
                 const obj = {
                     ...item,
-                    value: item.id,
+                    value: item.relation,
                     key: item.id,
                     title: item.name,
                     isRelation: true,