diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecord.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecord.java index db1fe703..3b8e2e74 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecord.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import java.io.Serializable; @@ -153,6 +154,9 @@ public class MesXslRubberQuickTestRecord implements Serializable { @TableField(exist = false) @Schema(description = "曲线图数据点") + //update-begin---author:jiangxh ---date:2026-06-29 for:【快检记录】主表曲线图列表JSON别名----------- + @JsonAlias("chart_point_list") + //update-end---author:jiangxh ---date:2026-06-29 for:【快检记录】主表曲线图列表JSON别名----------- private List chartPointList; //update-end---author:jiangxh ---date:2026-06-22 for:【快检记录】数据标准明细与曲线图----------- } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecordChartPoint.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecordChartPoint.java index 306d3d2a..de4230d9 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecordChartPoint.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecordChartPoint.java @@ -3,6 +3,7 @@ package org.jeecg.modules.xslmes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import java.io.Serializable; @@ -32,19 +33,26 @@ public class MesXslRubberQuickTestRecordChartPoint implements Serializable { @Schema(description = "主表ID mes_xsl_rubber_quick_test_record.id") private String recordId; + //update-begin---author:jiangxh ---date:2026-06-29 for:【快检记录】曲线图字段兼容桌面端与下划线JSON----------- @Excel(name = "时间(min)", width = 12, type = 10) + @JsonAlias("time_min") private BigDecimal timeMin; @Excel(name = "上模温度", width = 12, type = 10) + @JsonAlias("upper_temp") private BigDecimal upperTemp; @Excel(name = "下模温度", width = 12, type = 10) + @JsonAlias("lower_temp") private BigDecimal lowerTemp; @Excel(name = "S'(dNm)", width = 12, type = 10) + @JsonAlias("torque_s") private BigDecimal torqueS; + @JsonAlias("sort_no") private Integer sortNo; + //update-end---author:jiangxh ---date:2026-06-29 for:【快检记录】曲线图字段兼容桌面端与下划线JSON----------- private String createBy; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/MesXslRubberQuickTestRecord.data.ts b/jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/MesXslRubberQuickTestRecord.data.ts index 41dd03d2..42c03cc6 100644 --- a/jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/MesXslRubberQuickTestRecord.data.ts +++ b/jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/MesXslRubberQuickTestRecord.data.ts @@ -223,10 +223,10 @@ export const rawLineJVxeColumns: JVxeColumn[] = [ componentProps: numProps, }, { - title: '行检验结果', + title: '单次检验结果', key: 'rowInspectResult', type: JVxeTypes.select, - width: 110, + width: 130, disabled: true, dictCode: 'xslmes_rubber_quick_test_record_result', }, diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/components/MesXslRubberQuickTestRecordModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/components/MesXslRubberQuickTestRecordModal.vue index f5b71716..1d8ef90f 100644 --- a/jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/components/MesXslRubberQuickTestRecordModal.vue +++ b/jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestRecord/components/MesXslRubberQuickTestRecordModal.vue @@ -6,6 +6,7 @@ width="1200px" @register="registerModal" @ok="handleSubmit" + @visible-change="onModalVisibleChange" >