diff --git a/apps/web-antd/src/views/ops/work-order/components/cleaning-actions.vue b/apps/web-antd/src/views/ops/work-order/components/cleaning-actions.vue index 6e0d48b99..1cb95e888 100644 --- a/apps/web-antd/src/views/ops/work-order/components/cleaning-actions.vue +++ b/apps/web-antd/src/views/ops/work-order/components/cleaning-actions.vue @@ -5,8 +5,7 @@ import { IconifyIcon } from '@vben/icons'; import { Button, message } from 'ant-design-vue'; -import { sendDeviceMessage } from '#/api/iot/device/device'; -import { manualCompleteOrder } from '#/api/ops/cleaning'; +import { manualCompleteOrder, sendDeviceNotify } from '#/api/ops/cleaning'; defineOptions({ name: 'CleaningActions' }); @@ -21,10 +20,10 @@ const emit = defineEmits<{ async function handleVoiceNotify() { if (!props.order.assigneeId) return; try { - await sendDeviceMessage({ - deviceId: props.order.assigneeId, - method: 'voice.broadcast', - params: { content: `请注意:${props.order.title}` }, + await sendDeviceNotify({ + badgeId: props.order.assigneeId, + type: 'VOICE' as const, + content: `请注意:${props.order.title}`, }); message.success('语音提醒已发送'); } catch { diff --git a/apps/web-antd/src/views/ops/work-order/detail/index.vue b/apps/web-antd/src/views/ops/work-order/detail/index.vue index dcff0e318..b3f0273e1 100644 --- a/apps/web-antd/src/views/ops/work-order/detail/index.vue +++ b/apps/web-antd/src/views/ops/work-order/detail/index.vue @@ -564,6 +564,7 @@ function handleUpgrade() { orderId: order.value.id, orderCode: order.value.orderCode, currentPriority: order.value.priority, + orderType: order.value.orderType, }) .open(); } @@ -573,6 +574,7 @@ function handleCancel() { orderId: order.value.id, orderCode: order.value.orderCode, title: order.value.title, + orderType: order.value.orderType, }) .open(); } @@ -753,6 +755,14 @@ onUnmounted(stopPolling); 分配执行人 +