From f674f6fd290adcc6555471864b379003035cbae7 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 22 Jul 2025 10:26:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20mes=E6=8A=A5=E8=AD=A6=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8A=A0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/vulcAlarmStandard/types.ts | 59 ++++++++++++++++++++--- src/views/mes/vulcAlarmStandard/index.vue | 30 +++++++++++- 2 files changed, 80 insertions(+), 9 deletions(-) diff --git a/src/api/mes/vulcAlarmStandard/types.ts b/src/api/mes/vulcAlarmStandard/types.ts index 734c544..b90b497 100644 --- a/src/api/mes/vulcAlarmStandard/types.ts +++ b/src/api/mes/vulcAlarmStandard/types.ts @@ -1,6 +1,6 @@ export interface VulcAlarmStandardVO { /** - * 报警项目ID + * 报警标准ID */ alarmStandardId: string | number; @@ -54,11 +54,26 @@ export interface VulcAlarmStandardVO { */ remark: string; + /** + * 数据类型 + */ + dataType: string; + + /** + * 地址 + */ + pointAddress: string; + + /** + * 频率(毫秒) + */ + stepTime: number; + } export interface VulcAlarmStandardForm extends BaseEntity { /** - * 报警项目ID + * 报警标准ID */ alarmStandardId?: string | number; @@ -112,12 +127,27 @@ export interface VulcAlarmStandardForm extends BaseEntity { */ remark?: string; + /** + * 数据类型 + */ + dataType?: string; + + /** + * 地址 + */ + pointAddress?: string; + + /** + * 频率(毫秒) + */ + stepTime?: number; + } export interface VulcAlarmStandardQuery extends PageQuery { /** - * 报警项目ID + * 报警标准ID */ alarmStandardId?: string | number; @@ -166,10 +196,25 @@ export interface VulcAlarmStandardQuery extends PageQuery { */ activeFlag?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 数据类型 + */ + dataType?: string; + + /** + * 地址 + */ + pointAddress?: string; + + /** + * 频率(毫秒) + */ + stepTime?: number; + + /** + * 日期范围参数 + */ + params?: any; } diff --git a/src/views/mes/vulcAlarmStandard/index.vue b/src/views/mes/vulcAlarmStandard/index.vue index 5443141..a66a5fc 100644 --- a/src/views/mes/vulcAlarmStandard/index.vue +++ b/src/views/mes/vulcAlarmStandard/index.vue @@ -88,6 +88,13 @@ width='120' /> + + + + + + @@ -497,6 +501,13 @@ const handleExport = () => { }, `qcInspectionItem_${new Date().getTime()}.xlsx`) } +/** 导出模板按钮操作 */ +const handleExportTemplate = () => { + proxy?.download('qms/qcInspectionItem/exportTemplate', { + + }, `qcInspectionItem_template_${new Date().getTime()}.xlsx`) +} + /** 查询检测项类别列表 */ let qcInspectionItemCategoryList = ref([]); const getCategoryList = async () => { diff --git a/src/views/qms/qcInspectionTemplate/index.vue b/src/views/qms/qcInspectionTemplate/index.vue index b8e291c..b284e7b 100644 --- a/src/views/qms/qcInspectionTemplate/index.vue +++ b/src/views/qms/qcInspectionTemplate/index.vue @@ -34,6 +34,12 @@ 导出 + + 导出模板 + + + 导入 + @@ -309,11 +315,12 @@ +