From 0574f22fefc074e062da9e565ebf78ada3dee496 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 29 Sep 2025 14:06:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E5=AD=97=E6=AE=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改设备信息页面字段标签，将"设备位置"和"设备类型"相关表单项进行注释调整 - 更新设备详情展示逻辑，将"运行天数"改为"建立天数"更符合业务含义 - 调整报警信息关联字段，从deviceId改为deviceName并更新相关查询参数 - 优化设备生命周期事件处理，增加报警信息列表加载功能 - 完善设备维护统计接口调用，修复报警信息获取逻辑 - 更新设备详情页签展示结构，移除冗余的维护信息和备注字段 - 调整巡检状态字典映射，优化故障记录和巡检记录展示内容 - 修正采购记录展示字段，统一激活状态标签显示 - 优化设备类型名称获取方式，从字典查询改为直接使用deviceTypeName字段 - 完善报警信息查询参数，更新报警级别和处理状态字段映射 --- src/api/dms/baseAlarmInfo/types.ts | 6 + src/api/dms/dmsBaseMachineInfo/types.ts | 6 + src/views/dms/baseAlarmInfo/index.vue | 8 +- src/views/dms/prodBaseMachineInfo/index.vue | 123 +++++++++++++------- src/views/wms/instockOrderCopy/backup.vue | 10 +- src/views/wms/instockOrderCopy/index.vue | 4 +- 6 files changed, 107 insertions(+), 50 deletions(-) diff --git a/src/api/dms/baseAlarmInfo/types.ts b/src/api/dms/baseAlarmInfo/types.ts index f099d41..6549015 100644 --- a/src/api/dms/baseAlarmInfo/types.ts +++ b/src/api/dms/baseAlarmInfo/types.ts @@ -72,6 +72,8 @@ export interface BaseAlarmInfoVO { releateadContent: string;//join映射字段,预留字段 + deviceName?: string; + } export interface BaseAlarmInfoForm extends BaseEntity { @@ -148,6 +150,8 @@ export interface BaseAlarmInfoForm extends BaseEntity { releateadContent?: string;//join映射字段,预留字段 + deviceName?: string; + } export interface BaseAlarmInfoQuery extends PageQuery { @@ -229,6 +233,8 @@ export interface BaseAlarmInfoQuery extends PageQuery { releateadContent?: string;//join映射字段,预留字段 + + deviceName?: string; } diff --git a/src/api/dms/dmsBaseMachineInfo/types.ts b/src/api/dms/dmsBaseMachineInfo/types.ts index 6af0cf3..f66a88f 100644 --- a/src/api/dms/dmsBaseMachineInfo/types.ts +++ b/src/api/dms/dmsBaseMachineInfo/types.ts @@ -85,6 +85,8 @@ export interface ProdBaseMachineInfoVO { photoAddress?: string; ossId?: string | number; + deviceTypeName?: string; + } export interface ProdBaseMachineInfoForm extends BaseEntity { @@ -146,6 +148,8 @@ export interface ProdBaseMachineInfoForm extends BaseEntity { photoAddress?: string; ossId?: string | number; + deviceTypeName?: string; + } export interface ProdBaseMachineInfoQuery extends PageQuery { @@ -201,6 +205,8 @@ export interface ProdBaseMachineInfoQuery extends PageQuery { photoAddress?: string; ossId?: string | number; + deviceTypeName?: string; + /** * 日期范围参数 */ diff --git a/src/views/dms/baseAlarmInfo/index.vue b/src/views/dms/baseAlarmInfo/index.vue index 0ef02e9..1c7b6c8 100644 --- a/src/views/dms/baseAlarmInfo/index.vue +++ b/src/views/dms/baseAlarmInfo/index.vue @@ -95,7 +95,7 @@ - + @@ -274,7 +274,7 @@ const dialog = reactive({ // 列显隐信息 const columns = ref([ - { key: 0, label: `报警信息ID`, visible: false }, + { key: 0, label: `报警信息`, visible: false }, { key: 1, label: `报警信息类型`, visible: true }, { key: 2, label: `报警信息类型相关；`, visible: false }, { key: 3, label: `报警设备`, visible: true }, @@ -306,7 +306,8 @@ const initFormData: BaseAlarmInfoForm = { handleTime: undefined, alarmTypeName: undefined, alarmLevelName: undefined, - releateadContent: undefined + releateadContent: undefined, + deviceName: undefined, } const data = reactive>({ form: {...initFormData}, @@ -328,6 +329,7 @@ const data = reactive>({ alarmTypeName: undefined, alarmLevelName: undefined, releateadContent: undefined, + deviceName: undefined, params: { } }, diff --git a/src/views/dms/prodBaseMachineInfo/index.vue b/src/views/dms/prodBaseMachineInfo/index.vue index bb34c10..d867398 100644 --- a/src/views/dms/prodBaseMachineInfo/index.vue +++ b/src/views/dms/prodBaseMachineInfo/index.vue @@ -1,20 +1,4 @@ - - + - + - + { dialogtable.value[currentRowIndex.value].materialId = selectedMaterial.value.materialId; dialogtable.value[currentRowIndex.value].materialName = selectedMaterial.value.materialName; dialogtable.value[currentRowIndex.value].materialCode = selectedMaterial.value.materialCode; - dialogtable.value[currentRowIndex.value].materialUnit = selectedMaterial.value.materialUnit; - dialogtable.value[currentRowIndex.value].materialSpec = selectedMaterial.value.materialSpec; + dialogtable.value[currentRowIndex.value].unitName = selectedMaterial.value.materialUnit; + dialogtable.value[currentRowIndex.value].materialSpe = selectedMaterial.value.materialSpec; // 可以根据需要添加更多字段 } } diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue index caeac1b..bfb309d 100644 --- a/src/views/wms/instockOrderCopy/index.vue +++ b/src/views/wms/instockOrderCopy/index.vue @@ -536,9 +536,9 @@ - +