Merge branch 'ww' into 'main'

fix: DEFECT-774 device info not update on scene the linkage switch org

See merge request huang/yun-teng-iot-front!341

@@ -17,10 +17,13 @@
         <!-- <Divider orientation="left">触发器</Divider> -->
         <!-- <Divider orientation="left">触发器</Divider> -->
         <Divider orientation="left"
         <Divider orientation="left"
           ><a-tooltip>
           ><a-tooltip>
-            <template #title>场景联动触发的首要条件，"触发器"之间的关系为或，“执行条件”与“触发器”之间的关系为且。</template>
-            触发器<QuestionCircleOutlined :style="{fontSize: '14px',marginLeft:'5px'}"/>
-          </a-tooltip></Divider
-        >
+            <template #title
+              >场景联动触发的首要条件，"触发器"之间的关系为或，“执行条件”与“触发器”之间的关系为且。</template
+            >
+            触发器<QuestionCircleOutlined
+              :style="{ fontSize: '14px', marginLeft: '5px' }"
+            /> </a-tooltip
+        ></Divider>
         <div>
         <div>
           <template v-for="(item, index) in triggerData" :key="item">
           <template v-for="(item, index) in triggerData" :key="item">
             <TriggerOrCondition
             <TriggerOrCondition
@@ -44,11 +47,14 @@
         <!-- 执行条件-begin -->
         <!-- 执行条件-begin -->
         <Divider orientation="left"
         <Divider orientation="left"
           ><a-tooltip>
           ><a-tooltip>
-            <template #title>场景联动触发的次要条件，"执行条件"之间的关系为或，
-“执行条件”与“触发器”之间的关系为且。</template>
-            执行条件<QuestionCircleOutlined :style="{fontSize: '14px',marginLeft:'5px'}"/>
-          </a-tooltip></Divider
-        >
+            <template #title
+              >场景联动触发的次要条件，"执行条件"之间的关系为或，
+              “执行条件”与“触发器”之间的关系为且。</template
+            >
+            执行条件<QuestionCircleOutlined
+              :style="{ fontSize: '14px', marginLeft: '5px' }"
+            /> </a-tooltip
+        ></Divider>
         <div>
         <div>
           <template v-for="(item, index) in conditionData" :key="item">
           <template v-for="(item, index) in conditionData" :key="item">
             <TriggerOrCondition
             <TriggerOrCondition
@@ -72,10 +78,13 @@
         <!-- 执行动作-begin -->
         <!-- 执行动作-begin -->
         <Divider orientation="left"
         <Divider orientation="left"
           ><a-tooltip>
           ><a-tooltip>
-            <template #title>触发器和执行条件都满足时，场景联动会做什么，例如：设备联动、告警通知等。</template>
-            执行动作<QuestionCircleOutlined :style="{fontSize: '14px',marginLeft:'5px'}"/>
-          </a-tooltip></Divider
-        >
+            <template #title
+              >触发器和执行条件都满足时，场景联动会做什么，例如：设备联动、告警通知等。</template
+            >
+            执行动作<QuestionCircleOutlined
+              :style="{ fontSize: '14px', marginLeft: '5px' }"
+            /> </a-tooltip
+        ></Divider>
         <div>
         <div>
           <template v-for="(item, index) in actionData" :key="item">
           <template v-for="(item, index) in actionData" :key="item">
             <Action
             <Action
@@ -110,7 +119,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { genTriggerOrConditionData, genActionData } from './config/formatData.ts';
   import { genTriggerOrConditionData, genActionData } from './config/formatData.ts';
   import { Divider } from 'ant-design-vue';
   import { Divider } from 'ant-design-vue';
-  import { PlusOutlined,QuestionCircleOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import {
   import {
     screenLinkPageAddApi,
     screenLinkPageAddApi,
@@ -543,11 +552,11 @@
   const alarmConfigList = ref([]);
   const alarmConfigList = ref([]);
   watch(organizationId, async (newValue: string) => {
   watch(organizationId, async (newValue: string) => {
     if (!newValue) return;
     if (!newValue) return;
-    const { items } = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
+    const { items = [] } = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
     //TODO fengtao
     //TODO fengtao
     getMasterDeviceList.value = await byOganizationIdGetMasterDevice(newValue);
     getMasterDeviceList.value = await byOganizationIdGetMasterDevice(newValue);
     //TODO fengtao
     //TODO fengtao
-    deviceList.value = items.map((item) => ({ label: item.name, value: item.tbDeviceId }));
+    deviceList.value = (items || []).map((item) => ({ label: item.name, value: item.tbDeviceId }));
     //TODO fengtao
     //TODO fengtao
     orgId.value = newValue;
     orgId.value = newValue;
     //TODO fengtao
     //TODO fengtao
@@ -682,7 +691,7 @@
   //TODO-fengtao
   //TODO-fengtao
   ///移除选择框默认样式（24px）否则超出默认宽度会造成页面样式错乱
   ///移除选择框默认样式（24px）否则超出默认宽度会造成页面样式错乱
   :deep(.ant-select-selector) {
   :deep(.ant-select-selector) {
-    padding-right: 0px !important;
+    padding-right: 0 !important;
   }
   }
 
 
   :deep(.ant-select-selection-overflow) {
   :deep(.ant-select-selection-overflow) {

@@ -56,7 +56,9 @@
 
 
 <template>
 <template>
   <div>
   <div>
-    <div class="text-center pt-5 px-5 pb-3 font-bold text-lg">{{ props.panelName || '' }}</div>
+    <div class="text-center pt-5 px-5 pb-3 font-bold text-lg truncate">
+      {{ props.panelName || '' }}
+    </div>
     <div class="flex justify-between w-full px-5 pb-5">
     <div class="flex justify-between w-full px-5 pb-5">
       <div class="flex" :style="{ width: `calc(100% - 60px)` }">
       <div class="flex" :style="{ width: `calc(100% - 60px)` }">
         <div
         <div