diff --git a/src/router/modules/equipment.ts b/src/router/modules/equipment.ts index 388ac88..4936d63 100644 --- a/src/router/modules/equipment.ts +++ b/src/router/modules/equipment.ts @@ -444,6 +444,18 @@ activeMenu: '/standard/bookInfoList', }, }, + { // 第17套: S参数 + path: '/standardEquipmentConfig/seventeenth/:type/:id?', + name: 'StandardBookInfoConfigSixteen', + component: () => import('@/views/equipement/standard/book/components/config/seventeenth/config.vue'), + meta: { + title: '配置核查项', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/bookInfoList', + }, + }, { // 第18套: 失真度 path: '/standardEquipmentConfig/eighteenth/:type/:id?', name: 'StandardBookInfoConfigEighteen', diff --git a/src/router/modules/equipment.ts b/src/router/modules/equipment.ts index 388ac88..4936d63 100644 --- a/src/router/modules/equipment.ts +++ b/src/router/modules/equipment.ts @@ -444,6 +444,18 @@ activeMenu: '/standard/bookInfoList', }, }, + { // 第17套: S参数 + path: '/standardEquipmentConfig/seventeenth/:type/:id?', + name: 'StandardBookInfoConfigSixteen', + component: () => import('@/views/equipement/standard/book/components/config/seventeenth/config.vue'), + meta: { + title: '配置核查项', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/bookInfoList', + }, + }, { // 第18套: 失真度 path: '/standardEquipmentConfig/eighteenth/:type/:id?', name: 'StandardBookInfoConfigEighteen', diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue index 017127d..2a8fdc0 100644 --- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue @@ -17,6 +17,7 @@ import { calculateHandle, getInfo } from '@/api/business/taskMeasure/measureData' import { getInfo as getItemInfo } from '@/api/business/measure/item' import { useCheckList } from '@/commonMethods/useCheckList' +import { useMergeTableRow } from '@/commonMethods/useMergeTableRow' const props = defineProps({ infoId: String, // id @@ -34,7 +35,7 @@ belongStandardEquipment: '', // 标准装置code belongStandardEquipmentName: '', // 标准装置名称 appearance: '1', // 外观（1/0） - appearanceRemark: '', // 外观备注说明 + appearanceRemark: '/', // 外观备注说明 showAppearance: true, // 是否显示外观 repeatability: true, // 重复性 localIndicationError: true, // 局部示值误差 @@ -306,6 +307,7 @@ offsetErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } }) indicationErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) indicationErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) + mergeCell() // 合并单元格 if (repeatabilityPt1List.value.length) { itemFormData.value.aEquipmentId_1 = repeatabilityPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1 itemFormData.value.aDeviceNumber_1 = repeatabilityPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号 @@ -840,6 +842,7 @@ } }) } + mergeCell() // 合并单元格 } tableLoading_1.value = false tableLoading_2.value = false @@ -985,6 +988,15 @@ itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1 } // ------------------------------------------钩子---------------------------------------------- +// 单元格合并 +function mergeCell() { + useMergeTableRow(repeatabilityPt1List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(repeatabilityPt2List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt1List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt2List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt1List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt2List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 +} watch(() => props.infoId, (newValue) => { if (newValue) { @@ -1064,6 +1076,15 @@ // itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1 // }, { deep: true, immediate: true }) +const changeRadioAppearance = (value: string) => { + if (`${value}` === '1') { // 合格 + itemFormData.value.appearanceRemark = '/' + } + else if (`${value}` === '0') { // 不合格 + itemFormData.value.appearanceRemark = '' + } +} + onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id @@ -1111,7 +1132,7 @@ - + 合格 @@ -1121,7 +1142,7 @@ - + import('@/views/equipement/standard/book/components/config/seventeenth/config.vue'), + meta: { + title: '配置核查项', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/bookInfoList', + }, + }, { // 第18套: 失真度 path: '/standardEquipmentConfig/eighteenth/:type/:id?', name: 'StandardBookInfoConfigEighteen', diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue index 017127d..2a8fdc0 100644 --- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue @@ -17,6 +17,7 @@ import { calculateHandle, getInfo } from '@/api/business/taskMeasure/measureData' import { getInfo as getItemInfo } from '@/api/business/measure/item' import { useCheckList } from '@/commonMethods/useCheckList' +import { useMergeTableRow } from '@/commonMethods/useMergeTableRow' const props = defineProps({ infoId: String, // id @@ -34,7 +35,7 @@ belongStandardEquipment: '', // 标准装置code belongStandardEquipmentName: '', // 标准装置名称 appearance: '1', // 外观（1/0） - appearanceRemark: '', // 外观备注说明 + appearanceRemark: '/', // 外观备注说明 showAppearance: true, // 是否显示外观 repeatability: true, // 重复性 localIndicationError: true, // 局部示值误差 @@ -306,6 +307,7 @@ offsetErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } }) indicationErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) indicationErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) + mergeCell() // 合并单元格 if (repeatabilityPt1List.value.length) { itemFormData.value.aEquipmentId_1 = repeatabilityPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1 itemFormData.value.aDeviceNumber_1 = repeatabilityPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号 @@ -840,6 +842,7 @@ } }) } + mergeCell() // 合并单元格 } tableLoading_1.value = false tableLoading_2.value = false @@ -985,6 +988,15 @@ itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1 } // ------------------------------------------钩子---------------------------------------------- +// 单元格合并 +function mergeCell() { + useMergeTableRow(repeatabilityPt1List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(repeatabilityPt2List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt1List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt2List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt1List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt2List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 +} watch(() => props.infoId, (newValue) => { if (newValue) { @@ -1064,6 +1076,15 @@ // itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1 // }, { deep: true, immediate: true }) +const changeRadioAppearance = (value: string) => { + if (`${value}` === '1') { // 合格 + itemFormData.value.appearanceRemark = '/' + } + else if (`${value}` === '0') { // 不合格 + itemFormData.value.appearanceRemark = '' + } +} + onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id @@ -1111,7 +1132,7 @@ - + 合格 @@ -1121,7 +1142,7 @@ - + import('@/views/equipement/standard/book/components/config/seventeenth/config.vue'), + meta: { + title: '配置核查项', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/bookInfoList', + }, + }, { // 第18套: 失真度 path: '/standardEquipmentConfig/eighteenth/:type/:id?', name: 'StandardBookInfoConfigEighteen', diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue index 017127d..2a8fdc0 100644 --- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue @@ -17,6 +17,7 @@ import { calculateHandle, getInfo } from '@/api/business/taskMeasure/measureData' import { getInfo as getItemInfo } from '@/api/business/measure/item' import { useCheckList } from '@/commonMethods/useCheckList' +import { useMergeTableRow } from '@/commonMethods/useMergeTableRow' const props = defineProps({ infoId: String, // id @@ -34,7 +35,7 @@ belongStandardEquipment: '', // 标准装置code belongStandardEquipmentName: '', // 标准装置名称 appearance: '1', // 外观（1/0） - appearanceRemark: '', // 外观备注说明 + appearanceRemark: '/', // 外观备注说明 showAppearance: true, // 是否显示外观 repeatability: true, // 重复性 localIndicationError: true, // 局部示值误差 @@ -306,6 +307,7 @@ offsetErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } }) indicationErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) indicationErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) + mergeCell() // 合并单元格 if (repeatabilityPt1List.value.length) { itemFormData.value.aEquipmentId_1 = repeatabilityPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1 itemFormData.value.aDeviceNumber_1 = repeatabilityPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号 @@ -840,6 +842,7 @@ } }) } + mergeCell() // 合并单元格 } tableLoading_1.value = false tableLoading_2.value = false @@ -985,6 +988,15 @@ itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1 } // ------------------------------------------钩子---------------------------------------------- +// 单元格合并 +function mergeCell() { + useMergeTableRow(repeatabilityPt1List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(repeatabilityPt2List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt1List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt2List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt1List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt2List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 +} watch(() => props.infoId, (newValue) => { if (newValue) { @@ -1064,6 +1076,15 @@ // itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1 // }, { deep: true, immediate: true }) +const changeRadioAppearance = (value: string) => { + if (`${value}` === '1') { // 合格 + itemFormData.value.appearanceRemark = '/' + } + else if (`${value}` === '0') { // 不合格 + itemFormData.value.appearanceRemark = '' + } +} + onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id @@ -1111,7 +1132,7 @@ - + 合格 @@ -1121,7 +1142,7 @@ - + diff --git a/src/router/modules/equipment.ts b/src/router/modules/equipment.ts index 388ac88..4936d63 100644 --- a/src/router/modules/equipment.ts +++ b/src/router/modules/equipment.ts @@ -444,6 +444,18 @@ activeMenu: '/standard/bookInfoList', }, }, + { // 第17套: S参数 + path: '/standardEquipmentConfig/seventeenth/:type/:id?', + name: 'StandardBookInfoConfigSixteen', + component: () => import('@/views/equipement/standard/book/components/config/seventeenth/config.vue'), + meta: { + title: '配置核查项', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/bookInfoList', + }, + }, { // 第18套: 失真度 path: '/standardEquipmentConfig/eighteenth/:type/:id?', name: 'StandardBookInfoConfigEighteen', diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue index 017127d..2a8fdc0 100644 --- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue @@ -17,6 +17,7 @@ import { calculateHandle, getInfo } from '@/api/business/taskMeasure/measureData' import { getInfo as getItemInfo } from '@/api/business/measure/item' import { useCheckList } from '@/commonMethods/useCheckList' +import { useMergeTableRow } from '@/commonMethods/useMergeTableRow' const props = defineProps({ infoId: String, // id @@ -34,7 +35,7 @@ belongStandardEquipment: '', // 标准装置code belongStandardEquipmentName: '', // 标准装置名称 appearance: '1', // 外观（1/0） - appearanceRemark: '', // 外观备注说明 + appearanceRemark: '/', // 外观备注说明 showAppearance: true, // 是否显示外观 repeatability: true, // 重复性 localIndicationError: true, // 局部示值误差 @@ -306,6 +307,7 @@ offsetErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } }) indicationErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) indicationErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) + mergeCell() // 合并单元格 if (repeatabilityPt1List.value.length) { itemFormData.value.aEquipmentId_1 = repeatabilityPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1 itemFormData.value.aDeviceNumber_1 = repeatabilityPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号 @@ -840,6 +842,7 @@ } }) } + mergeCell() // 合并单元格 } tableLoading_1.value = false tableLoading_2.value = false @@ -985,6 +988,15 @@ itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1 } // ------------------------------------------钩子---------------------------------------------- +// 单元格合并 +function mergeCell() { + useMergeTableRow(repeatabilityPt1List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(repeatabilityPt2List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt1List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt2List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt1List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt2List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 +} watch(() => props.infoId, (newValue) => { if (newValue) { @@ -1064,6 +1076,15 @@ // itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1 // }, { deep: true, immediate: true }) +const changeRadioAppearance = (value: string) => { + if (`${value}` === '1') { // 合格 + itemFormData.value.appearanceRemark = '/' + } + else if (`${value}` === '0') { // 不合格 + itemFormData.value.appearanceRemark = '' + } +} + onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id @@ -1111,7 +1132,7 @@ - + 合格 @@ -1121,7 +1142,7 @@ - + diff --git a/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts b/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts index 90d0d17..9df0465 100644 --- a/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts +++ b/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts @@ -1,7 +1,18 @@ export interface IList { id: string // id，更新/删除使用参数 equipmentId: string // 配套设备id - params: string // 核查项目(字典value) itemCategoryId?: string // 核查项分类id(能够确定是哪个标准装置) - + params: string // 核查项目(字典value) + typeValue?: string // 类型 + checkType?: string // 核查类型(字典value) + vswr?: string // VSWR + amplitude?: string // 幅度 + amplitudeUnit?: string // 幅度单位 + cycleNumber: number // 循环次数 + frequency?: string | number | undefined // 频率 + frequencyUnit?: string // 频率单位 + phase?: string // 相位 + phaseUnit?: string // 相位单位 + remark: string // 核查项备注 + urel: string | number | undefined // U(k=2) } diff --git a/src/router/modules/equipment.ts b/src/router/modules/equipment.ts index 388ac88..4936d63 100644 --- a/src/router/modules/equipment.ts +++ b/src/router/modules/equipment.ts @@ -444,6 +444,18 @@ activeMenu: '/standard/bookInfoList', }, }, + { // 第17套: S参数 + path: '/standardEquipmentConfig/seventeenth/:type/:id?', + name: 'StandardBookInfoConfigSixteen', + component: () => import('@/views/equipement/standard/book/components/config/seventeenth/config.vue'), + meta: { + title: '配置核查项', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/bookInfoList', + }, + }, { // 第18套: 失真度 path: '/standardEquipmentConfig/eighteenth/:type/:id?', name: 'StandardBookInfoConfigEighteen', diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue index 017127d..2a8fdc0 100644 --- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue @@ -17,6 +17,7 @@ import { calculateHandle, getInfo } from '@/api/business/taskMeasure/measureData' import { getInfo as getItemInfo } from '@/api/business/measure/item' import { useCheckList } from '@/commonMethods/useCheckList' +import { useMergeTableRow } from '@/commonMethods/useMergeTableRow' const props = defineProps({ infoId: String, // id @@ -34,7 +35,7 @@ belongStandardEquipment: '', // 标准装置code belongStandardEquipmentName: '', // 标准装置名称 appearance: '1', // 外观（1/0） - appearanceRemark: '', // 外观备注说明 + appearanceRemark: '/', // 外观备注说明 showAppearance: true, // 是否显示外观 repeatability: true, // 重复性 localIndicationError: true, // 局部示值误差 @@ -306,6 +307,7 @@ offsetErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } }) indicationErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) indicationErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) + mergeCell() // 合并单元格 if (repeatabilityPt1List.value.length) { itemFormData.value.aEquipmentId_1 = repeatabilityPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1 itemFormData.value.aDeviceNumber_1 = repeatabilityPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号 @@ -840,6 +842,7 @@ } }) } + mergeCell() // 合并单元格 } tableLoading_1.value = false tableLoading_2.value = false @@ -985,6 +988,15 @@ itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1 } // ------------------------------------------钩子---------------------------------------------- +// 单元格合并 +function mergeCell() { + useMergeTableRow(repeatabilityPt1List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(repeatabilityPt2List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt1List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt2List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt1List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt2List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 +} watch(() => props.infoId, (newValue) => { if (newValue) { @@ -1064,6 +1076,15 @@ // itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1 // }, { deep: true, immediate: true }) +const changeRadioAppearance = (value: string) => { + if (`${value}` === '1') { // 合格 + itemFormData.value.appearanceRemark = '/' + } + else if (`${value}` === '0') { // 不合格 + itemFormData.value.appearanceRemark = '' + } +} + onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id @@ -1111,7 +1132,7 @@ - + 合格 @@ -1121,7 +1142,7 @@ - + diff --git a/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts b/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts index 90d0d17..9df0465 100644 --- a/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts +++ b/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts @@ -1,7 +1,18 @@ export interface IList { id: string // id，更新/删除使用参数 equipmentId: string // 配套设备id - params: string // 核查项目(字典value) itemCategoryId?: string // 核查项分类id(能够确定是哪个标准装置) - + params: string // 核查项目(字典value) + typeValue?: string // 类型 + checkType?: string // 核查类型(字典value) + vswr?: string // VSWR + amplitude?: string // 幅度 + amplitudeUnit?: string // 幅度单位 + cycleNumber: number // 循环次数 + frequency?: string | number | undefined // 频率 + frequencyUnit?: string // 频率单位 + phase?: string // 相位 + phaseUnit?: string // 相位单位 + remark: string // 核查项备注 + urel: string | number | undefined // U(k=2) } diff --git a/src/views/equipement/standard/book/components/config/seventeenth/templateTable.vue b/src/views/equipement/standard/book/components/config/seventeenth/templateTable.vue index 727432c..dc8e402 100644 --- a/src/views/equipement/standard/book/components/config/seventeenth/templateTable.vue +++ b/src/views/equipement/standard/book/components/config/seventeenth/templateTable.vue @@ -44,6 +44,8 @@ // ------------------------------------------字典---------------------------------------------- const standardFrequencyUnitList = ref([]) // 频率单位公用 const standardAmplitudeUnitList = ref([]) // 幅度单位公用 +const standard17VSMRList = ref([]) // VSMR +const standard17TypeValueList = ref([]) // 类型 /** * 获取字典 @@ -57,6 +59,14 @@ getDictByCode('standardAmplitudeUnit').then((response) => { standardAmplitudeUnitList.value = response.data }) + // VSMR + getDictByCode('standard17VSMR').then((response) => { + standard17VSMRList.value = response.data + }) + // 类型 + getDictByCode('standard17TypeValue').then((response) => { + standard17TypeValueList.value = response.data + }) } getDict() @@ -172,58 +182,31 @@ /> --> - - + + + + - - - - - - - - - - - - - - + + + + import('@/views/equipement/standard/book/components/config/seventeenth/config.vue'), + meta: { + title: '配置核查项', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/bookInfoList', + }, + }, { // 第18套: 失真度 path: '/standardEquipmentConfig/eighteenth/:type/:id?', name: 'StandardBookInfoConfigEighteen', diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue index 017127d..2a8fdc0 100644 --- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue @@ -17,6 +17,7 @@ import { calculateHandle, getInfo } from '@/api/business/taskMeasure/measureData' import { getInfo as getItemInfo } from '@/api/business/measure/item' import { useCheckList } from '@/commonMethods/useCheckList' +import { useMergeTableRow } from '@/commonMethods/useMergeTableRow' const props = defineProps({ infoId: String, // id @@ -34,7 +35,7 @@ belongStandardEquipment: '', // 标准装置code belongStandardEquipmentName: '', // 标准装置名称 appearance: '1', // 外观（1/0） - appearanceRemark: '', // 外观备注说明 + appearanceRemark: '/', // 外观备注说明 showAppearance: true, // 是否显示外观 repeatability: true, // 重复性 localIndicationError: true, // 局部示值误差 @@ -306,6 +307,7 @@ offsetErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } }) indicationErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) indicationErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } }) + mergeCell() // 合并单元格 if (repeatabilityPt1List.value.length) { itemFormData.value.aEquipmentId_1 = repeatabilityPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1 itemFormData.value.aDeviceNumber_1 = repeatabilityPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号 @@ -840,6 +842,7 @@ } }) } + mergeCell() // 合并单元格 } tableLoading_1.value = false tableLoading_2.value = false @@ -985,6 +988,15 @@ itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1 } // ------------------------------------------钩子---------------------------------------------- +// 单元格合并 +function mergeCell() { + useMergeTableRow(repeatabilityPt1List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(repeatabilityPt2List.value, ['deltaMAverage', 'sValue', 'uRValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt1List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(offsetErrorPt2List.value, ['deltaMThrowMax', 'maxOffsetLoadPoint', 'uEValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt1List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 + useMergeTableRow(indicationErrorPt2List.value, ['deltaMAverage', 'mReduceDeltaM', 'uSValue']) // 合并单元格 +} watch(() => props.infoId, (newValue) => { if (newValue) { @@ -1064,6 +1076,15 @@ // itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1 // }, { deep: true, immediate: true }) +const changeRadioAppearance = (value: string) => { + if (`${value}` === '1') { // 合格 + itemFormData.value.appearanceRemark = '/' + } + else if (`${value}` === '0') { // 不合格 + itemFormData.value.appearanceRemark = '' + } +} + onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id @@ -1111,7 +1132,7 @@ - + 合格 @@ -1121,7 +1142,7 @@ - + diff --git a/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts b/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts index 90d0d17..9df0465 100644 --- a/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts +++ b/src/views/equipement/standard/book/components/config/seventeenth/seventeenth-interface.ts @@ -1,7 +1,18 @@ export interface IList { id: string // id，更新/删除使用参数 equipmentId: string // 配套设备id - params: string // 核查项目(字典value) itemCategoryId?: string // 核查项分类id(能够确定是哪个标准装置) - + params: string // 核查项目(字典value) + typeValue?: string // 类型 + checkType?: string // 核查类型(字典value) + vswr?: string // VSWR + amplitude?: string // 幅度 + amplitudeUnit?: string // 幅度单位 + cycleNumber: number // 循环次数 + frequency?: string | number | undefined // 频率 + frequencyUnit?: string // 频率单位 + phase?: string // 相位 + phaseUnit?: string // 相位单位 + remark: string // 核查项备注 + urel: string | number | undefined // U(k=2) } diff --git a/src/views/equipement/standard/book/components/config/seventeenth/templateTable.vue b/src/views/equipement/standard/book/components/config/seventeenth/templateTable.vue index 727432c..dc8e402 100644 --- a/src/views/equipement/standard/book/components/config/seventeenth/templateTable.vue +++ b/src/views/equipement/standard/book/components/config/seventeenth/templateTable.vue @@ -44,6 +44,8 @@ // ------------------------------------------字典---------------------------------------------- const standardFrequencyUnitList = ref([]) // 频率单位公用 const standardAmplitudeUnitList = ref([]) // 幅度单位公用 +const standard17VSMRList = ref([]) // VSMR +const standard17TypeValueList = ref([]) // 类型 /** * 获取字典 @@ -57,6 +59,14 @@ getDictByCode('standardAmplitudeUnit').then((response) => { standardAmplitudeUnitList.value = response.data }) + // VSMR + getDictByCode('standard17VSMR').then((response) => { + standard17VSMRList.value = response.data + }) + // 类型 + getDictByCode('standard17TypeValue').then((response) => { + standard17TypeValueList.value = response.data + }) } getDict() @@ -172,58 +182,31 @@ /> --> - - + + + + - - - - - - - - - - - - - - + + + + import type { Ref } from 'vue' import { onMounted, ref } from 'vue' -import dayjs from 'dayjs' -import { ElLoading, ElMessage } from 'element-plus' -import type { FormRules } from 'element-plus' -import type { IForm, IStandardList, ITechFiles } from '../book-interface' +import { ElMessage } from 'element-plus' +import type { IStandardList } from '../book-interface' import selectCheckItem from '../dialog/selectCheckItem.vue' -import selectBuildStandardDialog from './selectBuildStandardDialog.vue' -import selectTechFiles from './selectTechFiles.vue' import SelectEquipmentDialog from '@/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue' import { getDictByCode } from '@/api/system/dict' -import type { TableColumn } from '@/components/NormalTable/table_interface' import useUserStore from '@/store/modules/user' -import type { deptType, dictType } from '@/global' -import { getDeptTreeList } from '@/api/system/dept' -import { getUserList } from '@/api/system/user' -import showPhoto from '@/components/showPhoto/index.vue' -import { UploadFile } from '@/api/file' -import { toTreeList } from '@/utils/structure' +import type { dictType } from '@/global' import { useCheckList } from '@/commonMethods/useCheckList' -import { useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable' -import { isNumber } from '@/utils/validate' import { getUid } from '@/utils/getUid' import { addEquipment, deleteEquipment, getEquipmentList } from '@/api/equipment/standard/book' import { useMergeCells } from '@/commonMethods/useMergeCells' @@ -380,13 +368,13 @@ }) } else { - const p = { - ...row, - itemCategoryId: checkDataList.value[0].id, - itemCategoryName: checkDataList.value[0].categoryName, - belongStandardEquipment: standardMap.value[props.standardName as string], // 检校标准装置 - belongStandardEquipmentName: props.standardName, // 检校标准装置名称 - } + // const p = { + // ...row, + // itemCategoryId: checkDataList.value[0].id, + // itemCategoryName: checkDataList.value[0].categoryName, + // belongStandardEquipment: standardMap.value[props.standardName as string], // 检校标准装置 + // belongStandardEquipmentName: props.standardName, // 检校标准装置名称 + // } $router.push({ path: `/standardEquipmentConfig/${pathPart}/${type}/${row.id}`, query: { @@ -448,6 +436,9 @@ else if (standardMap.value[props.standardName as string] === '16') { // 低频信号源 pathPart = 'sixteen' } + else if (standardMap.value[props.standardName as string] === '17') { // S参数 + pathPart = 'seventeenth' + } else if (standardMap.value[props.standardName as string] === '18') { // 失真度 pathPart = 'eighteenth' }