From be82fca30c81342438fdb549b979af68d1a33431 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Fri, 3 Apr 2026 09:42:22 +0800 Subject: [PATCH] =?UTF-8?q?change(api):=20=E5=AE=8C=E5=96=84=E6=B5=A6?= =?UTF-8?q?=E6=9E=97=E6=88=90=E5=B1=B1=E6=9C=80=E6=96=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复设备管理新增按钮点击事件绑定错误 - 移除入库单条码配置对话框及相关逻辑 - 新增设备管理报表相关API接口 - 在审批页面添加驳回按钮及相关逻辑 -重构故障工单处理页面为只读模式 --- src/api/dms/report/index.ts | 149 +++- src/api/mes/mixTrace/index.ts | 11 + .../dms/dmsFaultInstanceActivity/backup.vue | 671 ++++++------------ src/views/dms/prodBaseMachineInfo/index.vue | 2 +- .../qms/qcUnqualifiedApproval/approval.vue | 57 +- src/views/wms/instockOrderCopy/inAndOut.vue | 38 +- 6 files changed, 423 insertions(+), 505 deletions(-) diff --git a/src/api/dms/report/index.ts b/src/api/dms/report/index.ts index 64d5584..a53b017 100644 --- a/src/api/dms/report/index.ts +++ b/src/api/dms/report/index.ts @@ -2,6 +2,7 @@ import request from '@/utils/request'; import { FaultTraceQuery, FaultTraceVO } from './types'; import { RealtimeAlarmQuery, RealtimeAlarmVO } from './types'; +import { DowntimeReportQuery, DowntimeReportVO } from './types'; export function listFaultTrace(query: FaultTraceQuery) { @@ -36,4 +37,150 @@ export function exportRealtimeAlarm(query: RealtimeAlarmQuery) { data: query, responseType: 'blob', }); -} \ No newline at end of file +} + +// 新增:停机统计 +export function listDowntime(query: DowntimeReportQuery) { + return request({ + url: '/dms/report/downtime/list', + method: 'get', + params: query, + }); +} + +export function exportDowntime(query: DowntimeReportQuery) { + return request({ + url: '/dms/report/downtime/export', + method: 'post', + data: query, + responseType: 'blob', + }); +} + + + +// 查询设备利用率分析报表列表 +export function listDeviceUtilization(query) { + return request({ + url: '/dms/device/report/utilization/list', + method: 'get', + params: query + }) +} + +// 导出设备利用率分析报表 +export function exportDeviceUtilization(query) { + return request({ + url: '/dms/device/report/utilization/export', + method: 'post', + data: query + }) +} + +// 查询维护成本分析报表列表 +export function listMaintenanceCost(query) { + return request({ + url: '/dms/device/report/maintenanceCost/list', + method: 'get', + params: query + }) +} + +// 导出维护成本分析报表 +export function exportMaintenanceCost(query) { + return request({ + url: '/dms/device/report/maintenanceCost/export', + method: 'post', + data: query + }) +} + +// 查询设备健康分析报表列表 +export function listDeviceHealth(query) { + return request({ + url: '/dms/device/report/health/list', + method: 'get', + params: query + }) +} + +// 导出设备健康分析报表 +export function exportDeviceHealth(query) { + return request({ + url: '/dms/device/report/health/export', + method: 'post', + data: query + }) +} + +// 查询巡检执行效率报表列表 +export function listInspectionEfficiency(query) { + return request({ + url: '/dms/device/report/inspectionEfficiency/list', + method: 'get', + params: query + }) +} + +// 导出巡检执行效率报表 +export function exportInspectionEfficiency(query) { + return request({ + url: '/dms/device/report/inspectionEfficiency/export', + method: 'post', + data: query + }) +} + +// 查询润滑维护分析报表列表 +export function listLubricationAnalysis(query) { + return request({ + url: '/dms/device/report/lubricationAnalysis/list', + method: 'get', + params: query + }) +} + +// 导出润滑维护分析报表 +export function exportLubricationAnalysis(query) { + return request({ + url: '/dms/device/report/lubricationAnalysis/export', + method: 'post', + data: query + }) +} + +// 查询设备采购分析报表列表 +export function listProcurementAnalysis(query) { + return request({ + url: '/dms/device/report/procurementAnalysis/list', + method: 'get', + params: query + }) +} + +// 导出设备采购分析报表 +export function exportProcurementAnalysis(query) { + return request({ + url: '/dms/device/report/procurementAnalysis/export', + method: 'post', + data: query + }) +} + +// 查询设备生命周期报表列表 +export function listDeviceLifecycle(query) { + return request({ + url: '/dms/device/report/lifecycle/list', + method: 'get', + params: query + }) +} + +// 导出设备生命周期报表 +export function exportDeviceLifecycle(query) { + return request({ + url: '/dms/device/report/lifecycle/export', + method: 'post', + data: query + }) +} diff --git a/src/api/mes/mixTrace/index.ts b/src/api/mes/mixTrace/index.ts index c010cce..2806c3f 100644 --- a/src/api/mes/mixTrace/index.ts +++ b/src/api/mes/mixTrace/index.ts @@ -47,6 +47,17 @@ export const getMixTraceDetail = ( }); }; +/** + * 最新曲线(按时间段筛选,取最新一条) + */ +export const getLatestCurve = (query: MixTraceQuery): AxiosPromise => { + return request({ + url: '/mes/mixTrace/curve/latest', + method: 'get', + params: query + }); +}; + /** * SPC样本列表(图6)- 分页 */ diff --git a/src/views/dms/dmsFaultInstanceActivity/backup.vue b/src/views/dms/dmsFaultInstanceActivity/backup.vue index db10a06..34b665f 100644 --- a/src/views/dms/dmsFaultInstanceActivity/backup.vue +++ b/src/views/dms/dmsFaultInstanceActivity/backup.vue @@ -4,20 +4,7 @@
- - 暂存 - - - 提交 - + - + @@ -62,174 +49,108 @@ - + - + - + - + - + -

{{ currentStepTitle }}

+

PDA端创建的工单详情(只读)

- - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - -