From cb3a6071bdc2f4029bbb3deb09c3434bb938f314 Mon Sep 17 00:00:00 2001 From: haoliang <821644@qq.com> Date: Sun, 3 May 2026 09:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86=E5=90=8E?= =?UTF-8?q?=E5=8F=B04=E4=B8=AABug=20+=20=E6=94=B9=E8=BF=9BPing=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug1(告警中心分页不工作): AlertPage.vue添加watch监听page.page和page.pageSize变化触发loadData Bug2(仪表盘按钮报错): DashboardPage.vue为刷新配置/停止采集/启动采集添加ElMessage成功提示,导入ElMessage Bug3(设备详情页数据不对): MachineService四个方法从返回空数据改为查询实际数据 - GetStatus: 从Machine entity的last_*字段获取实时状态 - GetTodayProduction: 从cnc_daily_production或cnc_production_segment查今日产量 - GetProductionTrend: 从cnc_daily_production或segment查7天趋势 - GetCollectRecords: 从cnc_collect_record查最近20条采集记录 - IMachineRepository新增4个方法声明,MachineRepository实现SQL查询 Bug4(产量报表员工筛选不正确): - DailyProductionRepository.GetList添加WorkerId过滤(通过cnc_worker_machine关联表) - ProductionController.GetSummary扩展参数接受startDate/endDate/machineId/workerId - IProductionService/ProductionService.GetSummary签名同步更新 Ping逻辑改进: CollectWorker从Ping采集URL主机改为Ping每台机床IP地址 - 新增PingAllMachines()并行Ping所有机床IP,逐台更新在线状态 - 新增PingHost()执行单次ICMP Ping(超时2秒) - 移除旧的PingAddress()(Ping URL主机)和UpdateMachineOnlineStatus()(批量更新) --- frontend/src/views/alert/AlertPage.vue | 7 +- .../src/views/dashboard/DashboardPage.vue | 7 +- src/CncCollector/Core/CollectWorker.cs | 75 ++++++++++------- .../Impl/DailyProductionRepository.cs | 7 ++ src/CncRepository/Impl/MachineRepository.cs | 82 +++++++++++++++++++ .../Interface/IMachineRepository.cs | 8 ++ src/CncService/Impl/MachineService.cs | 24 ++++-- src/CncService/Impl/ProductionService.cs | 13 +-- .../Interface/IProductionService.cs | 2 +- .../Controllers/ProductionController.cs | 4 +- .../ProductionServiceTests.cs | 4 +- 11 files changed, 182 insertions(+), 51 deletions(-) diff --git a/frontend/src/views/alert/AlertPage.vue b/frontend/src/views/alert/AlertPage.vue index 745b0ff..02c6560 100644 --- a/frontend/src/views/alert/AlertPage.vue +++ b/frontend/src/views/alert/AlertPage.vue @@ -106,7 +106,7 @@