From b8a587fd00f77209f00c3fa1b278f3583011f233 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Mar 2023 16:31:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10540=E3=80=8110885=E3=80=8110818?=
 =?UTF-8?q?=E3=80=8110566=E3=80=8110418?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Detail/Function/components/Simple.vue     | 31 ++++++-------------
 src/views/media/Device/Channel/Live/index.vue |  9 +++++-
 src/views/system/Relationship/index.vue       |  3 ++
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/views/device/Instance/Detail/Function/components/Simple.vue b/src/views/device/Instance/Detail/Function/components/Simple.vue
index 93f4cd82..fb0f2247 100644
--- a/src/views/device/Instance/Detail/Function/components/Simple.vue
+++ b/src/views/device/Instance/Detail/Function/components/Simple.vue
@@ -61,26 +61,10 @@
                                                 "
                                                 :itemType="record.type"
                                                 :options="
-                                                    record.type === 'enum'
-                                                        ? (
-                                                              record?.options
-                                                                  ?.elements || []
-                                                          ).map((item:any) => ({
-                                                                  label: item.text,
-                                                                  value: item.value,
-                                                              }))
-                                                        : record.type === 'boolean'
-                                                        ? [
-                                                              {
-                                                                  label: '是',
-                                                                  value: true,
-                                                              },
-                                                              {
-                                                                  label: '否',
-                                                                  value: false,
-                                                              },
-                                                          ]
-                                                        : undefined
+                                                    (record?.options || []).map((item:any) => ({
+                                                        label: item.text,
+                                                        value: item.value,
+                                                    }))
                                                 "
                                             />
                                         </j-form-item>
@@ -107,7 +91,10 @@
                     </j-col>
                     <j-col :span="9">
                         <h6>执行结果：</h6>
-                        <span :ref="`result${func.id}Ref`" class="execute-result">
+                        <span
+                            :ref="`result${func.id}Ref`"
+                            class="execute-result"
+                        >
                             {{ func.executeResult }}
                         </span>
                     </j-col>
@@ -192,7 +179,7 @@ const newFunctions = computed(() => {
             executeResult: '',
         });
     });
-    // console.log('newFunctions: ', result)
+    // console.log('newFunctions: ', result);
     return result;
 });
 
diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue
index 6874d884..6acc86c1 100644
--- a/src/views/media/Device/Channel/Live/index.vue
+++ b/src/views/media/Device/Channel/Live/index.vue
@@ -25,7 +25,14 @@
                     <div class="tool-item" @click.stop="handleRefresh">
                         刷新
                     </div>
-                    <div class="tool-item" @click.stop="handleReset">重置</div>
+                    <div class="tool-item">
+                        <j-popconfirm
+                            title="重置将断开直播, 可能会影响其他播放者"
+                            @confirm="() => handleReset"
+                        >
+                            重置
+                        </j-popconfirm>
+                    </div>
                 </div>
                 <LivePlayer
                     ref="player"
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index 44800204..2c9f9f24 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -45,6 +45,7 @@
                         </PermissionButton>
 
                         <PermissionButton
+                            :danger="true"
                             :hasPermission="`${permission}:delete`"
                             type="link"
                             :tooltip="{ title: '删除' }"
@@ -161,6 +162,8 @@ const table = {
             if (resp.status === 200) {
                 tableRef.value?.reload();
                 message.success('操作成功!');
+            } else {
+                message.error(resp.message);
             }
         });
     },