Merge branch 'f-dev' into 'main'

fix：

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

@@ -155,7 +155,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, reactive, unref, nextTick } from 'vue';
+  import { defineComponent, reactive, unref, nextTick, h } from 'vue';
   import { DeviceState, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { DeviceState, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { columns, searchFormSchema } from './config/device.data';
   import { columns, searchFormSchema } from './config/device.data';
@@ -272,7 +272,9 @@
           // 该设备是否正在被场景联动使用中？
           // 该设备是否正在被场景联动使用中？
           const isEnabled = await checkDeviceOccupied(record.id);
           const isEnabled = await checkDeviceOccupied(record.id);
           if (!isEnabled.data) {
           if (!isEnabled.data) {
-            createMessage.warn(`${isEnabled.message}`);
+            const props = { style: { maxWidth: '600' + 'px' } };
+            const small = h('small', '');
+            createMessage.warn(h('h2', props, [`${isEnabled.message}`, small]));
           } else {
           } else {
             await cancelDispatchCustomer(record);
             await cancelDispatchCustomer(record);
             handleReload();
             handleReload();
@@ -343,3 +345,9 @@
     },
     },
   });
   });
 </script>
 </script>
+
+<style scoped lang="css">
+  /* /deep/.ant-message-notice-content {
+    max-width: 600px !important;
+  } */
+</style>