From c40ed5b715f3892f6afa3a9bdc003d00138e3401 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Tue, 14 Jul 2026 13:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E5=A2=9E=E5=8A=A0=E9=92=89?= =?UTF-8?q?=E9=92=89=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemSetting/StationManage.tsx | 19 +++++--- src/components/alerts/AlarmOverview.tsx | 45 +------------------ src/pages/WorkOrder.tsx | 10 ++--- 3 files changed, 20 insertions(+), 54 deletions(-) diff --git a/src/components/SystemSetting/StationManage.tsx b/src/components/SystemSetting/StationManage.tsx index 5ff5477..0cf3e3c 100644 --- a/src/components/SystemSetting/StationManage.tsx +++ b/src/components/SystemSetting/StationManage.tsx @@ -36,6 +36,7 @@ export default function StationManage() { // 监听钉钉推送开关状态,用于联动显示隐藏、动态校验 const dingTalkPushWatch = Form.useWatch('dingTalkPush', form); + const dingTalkOrderPushWatch = Form.useWatch(['dingTalkOrderPush'], form); // 分区弹窗 const [areaVisible, setAreaVisible] = useState(false); @@ -133,6 +134,7 @@ export default function StationManage() { form.setFieldsValue({ status: 1, dingTalkPush: 0, + dingTalkOrderPush: 0, emailPush: 0, alertPush: 0 }); @@ -145,6 +147,7 @@ export default function StationManage() { form.setFieldsValue({ ...record, status: record.status === 1, + dingTalkOrderPush: record.dingTalkOrderPush === 1, dingTalkPush: record.dingTalkPush === 1, emailPush: record.emailPush === 1, alertPush: record.alertPush === 1, @@ -157,6 +160,7 @@ export default function StationManage() { const params = { ...values, status: values.status ? 1 : 0, + dingTalkOrderPush: values.dingTalkOrderPush ? 1 : 0, dingTalkPush: values.dingTalkPush ? 1 : 0, emailPush: values.emailPush ? 1 : 0, alertPush: values.alertPush ? 1 : 0, @@ -357,17 +361,22 @@ export default function StationManage() { 消息推送配置 - - + + - + + + + + + - + @@ -375,7 +384,7 @@ export default function StationManage() { {/* 钉钉开关开启才显示Token、密钥 */} - {dingTalkPushWatch ? ( + {dingTalkPushWatch || dingTalkOrderPushWatch ? ( - {/* 处理操作 */} - - - - - - - - - {/* 通知与订阅 */} - - - - - - 短信 - - - - - - - {/**/} - 钉钉 - - - - - - - {/**/} - 邮件 - - - - - - {/* 底部按钮 */} - + )} diff --git a/src/pages/WorkOrder.tsx b/src/pages/WorkOrder.tsx index 5e3b7d8..94e27be 100644 --- a/src/pages/WorkOrder.tsx +++ b/src/pages/WorkOrder.tsx @@ -427,11 +427,13 @@ const WorkOrderPage = () => { // 提交执行工单 const submitExecute = async (values) => { try { + const startTimeStr = dayjs(values.startTime).format('YYYY-MM-DD HH:mm:ss'); + // 调用 startWorkOrder 接口,传递 ids 和 选择的设备 id const params = { ids: values.orderIds, deviceId: values.deviceId, - startTime: values.startTime + startTime: startTimeStr }; const res = await startWorkOrder(params); if (res.code == 200) { @@ -787,11 +789,9 @@ const WorkOrderPage = () => { 来源:{sourceTypeMap[currentDetail?.sourceType] || '--'} 工单类型:{getWorkOrderTypeText(currentDetail?.orderType)} - 计划时间: + 执行开始时间: - {currentDetail?.planStartTime && currentDetail?.planEndTime - ? `${dayjs(currentDetail.planStartTime).format('YYYY-MM-DD HH:mm')} ~ ${dayjs(currentDetail.planEndTime).format('YYYY-MM-DD HH:mm')}` - : '--'} + {currentDetail?.actualStartTime} 关联设备:{currentDetail?.deviceName || '无'}