From eb31da72e0397c935faa9744e4c1716ff1ee277b Mon Sep 17 00:00:00 2001 From: sheng <905537351@qq.com> Date: Mon, 22 Jun 2026 15:50:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=AE=BE=E5=A4=87=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增计划与生产设备监控 V2 页面 - 新增设备监控接口、路由和中英文文案 - 更新迁移任务列表中的设备监控状态 --- docs/迁移任务列表.md | 6 +- .../equipment-monitoring.js | 19 ++ src/locales/en.json | 17 ++ src/locales/zh-chs.json | 17 ++ src/router/modules/planning-production.js | 6 + .../equipment-monitoring/index.vue | 221 ++++++++++++++++++ 6 files changed, 283 insertions(+), 3 deletions(-) create mode 100644 src/api/planning-production/equipment-monitoring.js create mode 100644 src/views/planning-production/production-monitoring/equipment-monitoring/index.vue diff --git a/docs/迁移任务列表.md b/docs/迁移任务列表.md index dd594f05..4e889ba7 100644 --- a/docs/迁移任务列表.md +++ b/docs/迁移任务列表.md @@ -3,8 +3,8 @@ > 根据 `后台Webman界面截图对照表.md` 生成。状态以当前 V2 项目中已落地的页面目录为准。 - 总功能数:79 -- 已迁移:23 -- 未迁移:56 +- 已迁移:24 +- 未迁移:55 | 状态 | 一级模块 | 二级模块 | 三级模块 | 功能说明 | V2 目标路径 | |:---:|---|---|---|---|---| @@ -51,7 +51,7 @@ | ⬜ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 电池复投管理 (Rework Management) | 返工管理 | 待确认 | | ✅ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 托盘管理 (Tray Management) | 托盘管理 | `src/views/planning-production/production-monitoring/tray-management/` | | ⬜ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 托盘登录 (Tray Registration) | 托盘登记 | 待确认 | -| ⬜ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 设备监控 (Equipment Monitoring) | 设备监控 | 待确认 | +| ✅ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 设备监控 (Equipment Monitoring) | 设备监控 | `src/views/planning-production/production-monitoring/equipment-monitoring/` | | ✅ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 电池工序管理 (Process Execution) | 工序管理 | `src/views/planning-production/production-monitoring/process-execution/` | | ⬜ | 质量管理 (Quality Management) | 过程控制 (Process Control) | 检验类别管理 (Inspection Type Management) | | 待确认 | | ⬜ | 质量管理 (Quality Management) | 过程控制 (Process Control) | 首巡检项目配置 (First Article Inspection Configuration) | | 待确认 | diff --git a/src/api/planning-production/equipment-monitoring.js b/src/api/planning-production/equipment-monitoring.js new file mode 100644 index 00000000..1e60c472 --- /dev/null +++ b/src/api/planning-production/equipment-monitoring.js @@ -0,0 +1,19 @@ +import { request } from '@/api/_service' + +const BASE = 'production_configuration/device_model/device_management/' + +function apiParams (method, data = {}) { + return { + method, + platform: 'background', + ...data + } +} + +export function getDeviceAll (data) { + return request({ + url: BASE + 'all', + method: 'get', + params: apiParams('production_configuration_device_model_device_management_all', data) + }) +} diff --git a/src/locales/en.json b/src/locales/en.json index 3ae80dfd..c4f32711 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -993,6 +993,23 @@ "class": "Grade", "previous_process": "Previous Process", "current_process": "Current Process" + }, + "equipment_monitoring": { + "device_total": "Total Devices", + "device_code": "Device Code", + "device_name": "Device Name", + "area": "Plant Area", + "production_line": "Production Line", + "workstation": "Workstation", + "last_response": "Last Response", + "work_status": "Status", + "msg": "Message", + "run": "Running", + "manual": "Manual", + "finished": "Completed", + "exception": "Exception", + "offline": "Offline", + "idle": "Waiting for Material" } }, "alert_center": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index c96a0282..3827fcde 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -993,6 +993,23 @@ "class": "档位", "previous_process": "上一工序", "current_process": "当前工序" + }, + "equipment_monitoring": { + "device_total": "设备总数", + "device_code": "设备编码", + "device_name": "设备名称", + "area": "厂区", + "production_line": "产线", + "workstation": "工作站", + "last_response": "最后响应", + "work_status": "工作状态", + "msg": "信息", + "run": "运行中", + "manual": "手动中", + "finished": "已完成", + "exception": "异常中", + "offline": "离线中", + "idle": "待料中" } }, "alert_center": { diff --git a/src/router/modules/planning-production.js b/src/router/modules/planning-production.js index 4038ff35..45595d98 100644 --- a/src/router/modules/planning-production.js +++ b/src/router/modules/planning-production.js @@ -44,6 +44,12 @@ export default { meta: { ...meta, cache: true, title: '托盘管理' }, component: _import('planning-production/production-monitoring/tray-management') }, + { + path: 'produce/monitor/device', + name: `${pre}monitor-device`, + meta: { ...meta, cache: true, title: '设备监控' }, + component: _import('planning-production/production-monitoring/equipment-monitoring') + }, { path: 'produce/monitor/change_battery_process', name: `${pre}monitor-change_battery_process`, diff --git a/src/views/planning-production/production-monitoring/equipment-monitoring/index.vue b/src/views/planning-production/production-monitoring/equipment-monitoring/index.vue new file mode 100644 index 00000000..5e2c5405 --- /dev/null +++ b/src/views/planning-production/production-monitoring/equipment-monitoring/index.vue @@ -0,0 +1,221 @@ + + + + + + {{ $t(key('device_total')) }} + {{ totalDeviceCount }} + + + {{ $t(key(item.label)) }} + {{ item.count }} + + + + + + + + {{ statusName(row.status) }} + + + + {{ row.status === 'TROUBLE' ? row.msg : '' }} + + + + + + + + + + +