Commit 50bc5aedd1d66eb86cbb15082b4b69e0a8277017
Merge branch 'f-dev' into 'main'
fix: See merge request huang/yun-teng-iot-front!312
Showing
1 changed file
with
10 additions
and
2 deletions
| ... | ... | @@ -155,7 +155,7 @@ |
| 155 | 155 | </div> |
| 156 | 156 | </template> |
| 157 | 157 | <script lang="ts"> |
| 158 | - import { defineComponent, reactive, unref, nextTick } from 'vue'; | |
| 158 | + import { defineComponent, reactive, unref, nextTick, h } from 'vue'; | |
| 159 | 159 | import { DeviceState, DeviceTypeEnum } from '/@/api/device/model/deviceModel'; |
| 160 | 160 | import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table'; |
| 161 | 161 | import { columns, searchFormSchema } from './config/device.data'; |
| ... | ... | @@ -272,7 +272,9 @@ |
| 272 | 272 | // 该设备是否正在被场景联动使用中? |
| 273 | 273 | const isEnabled = await checkDeviceOccupied(record.id); |
| 274 | 274 | if (!isEnabled.data) { |
| 275 | - createMessage.warn(`${isEnabled.message}`); | |
| 275 | + const props = { style: { maxWidth: '600' + 'px' } }; | |
| 276 | + const small = h('small', ''); | |
| 277 | + createMessage.warn(h('h2', props, [`${isEnabled.message}`, small])); | |
| 276 | 278 | } else { |
| 277 | 279 | await cancelDispatchCustomer(record); |
| 278 | 280 | handleReload(); |
| ... | ... | @@ -343,3 +345,9 @@ |
| 343 | 345 | }, |
| 344 | 346 | }); |
| 345 | 347 | </script> |
| 348 | + | |
| 349 | +<style scoped lang="css"> | |
| 350 | + /* /deep/.ant-message-notice-content { | |
| 351 | + max-width: 600px !important; | |
| 352 | + } */ | |
| 353 | +</style> | ... | ... |