diff --git a/src/views/business/measure/item/components/seventeen/templateDetail.vue b/src/views/business/measure/item/components/seventeen/templateDetail.vue index 6a11390..f40fcc0 100644 --- a/src/views/business/measure/item/components/seventeen/templateDetail.vue +++ b/src/views/business/measure/item/components/seventeen/templateDetail.vue @@ -1011,6 +1011,12 @@ tempList = tempList.concat(isolationDegreeList.value) } if (form.value.gainFlatness) { // 增益、增益平坦度 + gainFlatnessList.value = gainFlatnessList.value.map((item) => { + return { + ...item, + flatnessUrel: gainFlatnessList.value[0].flatnessUrel, + } + }) tempList = tempList.concat(gainFlatnessList.value) } if (form.value.couplingDirection) { // 耦合度、方向性 @@ -1198,7 +1204,7 @@ - + diff --git a/src/views/business/measure/item/components/seventeen/templateDetail.vue b/src/views/business/measure/item/components/seventeen/templateDetail.vue index 6a11390..f40fcc0 100644 --- a/src/views/business/measure/item/components/seventeen/templateDetail.vue +++ b/src/views/business/measure/item/components/seventeen/templateDetail.vue @@ -1011,6 +1011,12 @@ tempList = tempList.concat(isolationDegreeList.value) } if (form.value.gainFlatness) { // 增益、增益平坦度 + gainFlatnessList.value = gainFlatnessList.value.map((item) => { + return { + ...item, + flatnessUrel: gainFlatnessList.value[0].flatnessUrel, + } + }) tempList = tempList.concat(gainFlatnessList.value) } if (form.value.couplingDirection) { // 耦合度、方向性 @@ -1198,7 +1204,7 @@ - + diff --git a/src/views/business/measure/item/components/seventeen/templateTable.vue b/src/views/business/measure/item/components/seventeen/templateTable.vue index 26f57ce..609fe75 100644 --- a/src/views/business/measure/item/components/seventeen/templateTable.vue +++ b/src/views/business/measure/item/components/seventeen/templateTable.vue @@ -5,6 +5,7 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' import type { dictType } from '@/global' +import { isMerge, mergeTableRow, useMergeTableRow } from '@/commonMethods/useMergeTableRow' // ------------------定义props、 emit------------------- const props = defineProps({ @@ -39,6 +40,11 @@ default: 'default', }, // 表格大小，默认，small,mini等，与el-table条件相同 type: String, + // 需要合并的列 + needMergeCells: { + type: Array, + default: () => ([]), + }, }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange']) // ------------------------------------------字典---------------------------------------------- @@ -96,6 +102,29 @@ } } +watch(() => props.data, (newValue, old) => { + console.log('监听到表格变化', newValue) + + if (!props.needMergeCells.length) { + return + } + if (newValue) { + if (Array.isArray(newValue) && newValue?.length) { + const data = newValue[newValue.length - 1] + + if (isMerge(data)) { + console.log('isMerge') + return + } + } + console.log('要合并了') + useMergeTableRow(newValue, props.needMergeCells) + } +}, { + deep: true, + immediate: true, +}) + // 最终展示列 const columnsFiltered: Ref = ref([]) // 切换列 @@ -136,6 +165,7 @@ table.value!.clearSelection() singleChecked.value = '' } + defineExpose({ clearMulti, initColumnsState, }) @@ -155,6 +185,7 @@ stripe :size="size" style="width: 100%;" + :span-method="mergeTableRow" @selection-change="handleSelectionChange" @row-click="rowClick" @row-dblclick="rowDbClick" diff --git a/src/views/business/measure/item/components/seventeen/templateDetail.vue b/src/views/business/measure/item/components/seventeen/templateDetail.vue index 6a11390..f40fcc0 100644 --- a/src/views/business/measure/item/components/seventeen/templateDetail.vue +++ b/src/views/business/measure/item/components/seventeen/templateDetail.vue @@ -1011,6 +1011,12 @@ tempList = tempList.concat(isolationDegreeList.value) } if (form.value.gainFlatness) { // 增益、增益平坦度 + gainFlatnessList.value = gainFlatnessList.value.map((item) => { + return { + ...item, + flatnessUrel: gainFlatnessList.value[0].flatnessUrel, + } + }) tempList = tempList.concat(gainFlatnessList.value) } if (form.value.couplingDirection) { // 耦合度、方向性 @@ -1198,7 +1204,7 @@ - + diff --git a/src/views/business/measure/item/components/seventeen/templateTable.vue b/src/views/business/measure/item/components/seventeen/templateTable.vue index 26f57ce..609fe75 100644 --- a/src/views/business/measure/item/components/seventeen/templateTable.vue +++ b/src/views/business/measure/item/components/seventeen/templateTable.vue @@ -5,6 +5,7 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' import type { dictType } from '@/global' +import { isMerge, mergeTableRow, useMergeTableRow } from '@/commonMethods/useMergeTableRow' // ------------------定义props、 emit------------------- const props = defineProps({ @@ -39,6 +40,11 @@ default: 'default', }, // 表格大小，默认，small,mini等，与el-table条件相同 type: String, + // 需要合并的列 + needMergeCells: { + type: Array, + default: () => ([]), + }, }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange']) // ------------------------------------------字典---------------------------------------------- @@ -96,6 +102,29 @@ } } +watch(() => props.data, (newValue, old) => { + console.log('监听到表格变化', newValue) + + if (!props.needMergeCells.length) { + return + } + if (newValue) { + if (Array.isArray(newValue) && newValue?.length) { + const data = newValue[newValue.length - 1] + + if (isMerge(data)) { + console.log('isMerge') + return + } + } + console.log('要合并了') + useMergeTableRow(newValue, props.needMergeCells) + } +}, { + deep: true, + immediate: true, +}) + // 最终展示列 const columnsFiltered: Ref = ref([]) // 切换列 @@ -136,6 +165,7 @@ table.value!.clearSelection() singleChecked.value = '' } + defineExpose({ clearMulti, initColumnsState, }) @@ -155,6 +185,7 @@ stripe :size="size" style="width: 100%;" + :span-method="mergeTableRow" @selection-change="handleSelectionChange" @row-click="rowClick" @row-dblclick="rowDbClick" diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 81cd328..3c35943 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -42,6 +42,7 @@ pointerDeflectionStabilityRemark: '', // 指针偏转平稳性备注说明 tightness: '', // 密封性 tightnessRemark: '', // 密封性备注说明 + zeroDrift: '', // 零位飘移 zeroDriftResult: '', // 零位飘移结果（合格/不合格，直接存文字） insulationResistance: '', // 绝缘电阻 insulationResistanceRemark: '', // 绝缘电阻备注说明-0.02活塞式压力计 @@ -484,6 +485,7 @@ itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观 itemFormData.value.supplyVoltage = res.data.measureItemConfigPistonGauge.supplyVoltage // 供电电压 + itemFormData.value.zeroDrift = res.data.measureItemConfigPistonGauge.zeroDrift ? '1' : '' // 零位漂移 if (solveList !== 'notNeedList') { initInputData(res.data.measureItemDataPistonGaugeList) } @@ -1046,7 +1048,7 @@ -
+
零位漂移:
@@ -1072,7 +1074,7 @@