From ce0d23d07d98d5a81c8a35583386655478d86fd3 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Sat, 15 Jul 2023 17:50:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DataCollect/Channel/Save/index.vue    |  2 +-
 src/views/link/Type/index.vue                   | 17 ++++++++++++++++-
 .../rule-engine/Alarm/Configuration/index.vue   |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue
index ab13be20..c416f5f3 100644
--- a/src/views/DataCollect/Channel/Save/index.vue
+++ b/src/views/DataCollect/Channel/Save/index.vue
@@ -291,7 +291,7 @@ const getProvidersList = async () => {
             arr.includes(item.alias),
         );
         providersList.value = providers;
-        if (arr.includes('OPC_UA')) {
+        if (arr.includes('opc-ua')) {
             getOptionsList();
         }
     }
diff --git a/src/views/link/Type/index.vue b/src/views/link/Type/index.vue
index c9a82a9b..8a110c78 100644
--- a/src/views/link/Type/index.vue
+++ b/src/views/link/Type/index.vue
@@ -160,7 +160,7 @@
                     </template>
                     <template #shareCluster="slotProps">
                         {{
-                            slotProps.shareCluster === 'true'
+                            slotProps.shareCluster === true
                                 ? '共享配置'
                                 : '独立配置'
                         }}
@@ -378,9 +378,24 @@ const getDetails = (slotProps: Partial<Record<string, any>>) => {
     } else {
         !!cluster[0].configuration.publicHos && (head = '公网:');
     }
+    if( !shareCluster  && cluster.length > 1){
+        const contentItem2 = (cluster[0].configuration.publicHost ||
+              cluster[0].configuration.remoteHost) +
+          ':' +
+          (cluster[0].configuration.publicPort ||
+              cluster[0].configuration.remotePort)
+        let headItme2 ='远程'
+         !!cluster[0].configuration.publicHos && (headItme2 = '公网:');
+         if(cluster.length > 2){
+            return head + headers + content + " "  + headItme2 + headers + contentItem2 + '。。。'
+         } 
+         return  head + headers + content + " "  + headItme2 + headers + contentItem2 
+    }
     return head + headers + content;
 };
 
+
+
 const getSupports = async () => {
     const res: any = await supports();
     options.value = res.result.map((item: any) => ({
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index 25d37db1..833c03f6 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -466,6 +466,7 @@ const getActions = (
                     data?.state?.value !== 'disabled'
                         ? '请先禁用该告警，再删除'
                         : '删除',
+                placement:"topLeft"
             },
             popConfirm: {
                 title: '确认删除?',