diff --git a/src/commonMethods/useSign.ts b/src/commonMethods/useSign.ts index 738b64e..44990c5 100644 --- a/src/commonMethods/useSign.ts +++ b/src/commonMethods/useSign.ts @@ -41,3 +41,24 @@ return tempValue } } + +/** + * 去掉正负号和 + - + * @param value 需要去掉正负号的数据 + * @param removeIsolatedSign 是否去掉 + - + */ +export function removeSignAll(value: number | string) { + if (`${value}` === '') { + return value + } + let tempValue = `${value}` + + if (tempValue.slice(0, 1) === '±') { + tempValue = tempValue.slice(1) + } + if ((tempValue.slice(0, 1) === '+' || tempValue.slice(0, 1) === '-')) { + tempValue = tempValue.slice(1) + } + return tempValue +} + diff --git a/src/commonMethods/useSign.ts b/src/commonMethods/useSign.ts index 738b64e..44990c5 100644 --- a/src/commonMethods/useSign.ts +++ b/src/commonMethods/useSign.ts @@ -41,3 +41,24 @@ return tempValue } } + +/** + * 去掉正负号和 + - + * @param value 需要去掉正负号的数据 + * @param removeIsolatedSign 是否去掉 + - + */ +export function removeSignAll(value: number | string) { + if (`${value}` === '') { + return value + } + let tempValue = `${value}` + + if (tempValue.slice(0, 1) === '±') { + tempValue = tempValue.slice(1) + } + if ((tempValue.slice(0, 1) === '+' || tempValue.slice(0, 1) === '-')) { + tempValue = tempValue.slice(1) + } + return tempValue +} + diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index 62ef4a2..d84c838 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -113,7 +113,7 @@ @change="handleInputNumberChange(scope)" /> - + diff --git a/src/commonMethods/useSign.ts b/src/commonMethods/useSign.ts index 738b64e..44990c5 100644 --- a/src/commonMethods/useSign.ts +++ b/src/commonMethods/useSign.ts @@ -41,3 +41,24 @@ return tempValue } } + +/** + * 去掉正负号和 + - + * @param value 需要去掉正负号的数据 + * @param removeIsolatedSign 是否去掉 + - + */ +export function removeSignAll(value: number | string) { + if (`${value}` === '') { + return value + } + let tempValue = `${value}` + + if (tempValue.slice(0, 1) === '±') { + tempValue = tempValue.slice(1) + } + if ((tempValue.slice(0, 1) === '+' || tempValue.slice(0, 1) === '-')) { + tempValue = tempValue.slice(1) + } + return tempValue +} + diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index 62ef4a2..d84c838 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -113,7 +113,7 @@ @change="handleInputNumberChange(scope)" /> - + diff --git a/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts b/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts index 119f900..58b94a8 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts +++ b/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts @@ -49,4 +49,7 @@ zeroDriftOne?: string zeroDriftThree?: string zeroDriftTwo?: string + + returnErrorBak?: string + indicatingErrorBak?: string // 示值误差 } diff --git a/src/commonMethods/useSign.ts b/src/commonMethods/useSign.ts index 738b64e..44990c5 100644 --- a/src/commonMethods/useSign.ts +++ b/src/commonMethods/useSign.ts @@ -41,3 +41,24 @@ return tempValue } } + +/** + * 去掉正负号和 + - + * @param value 需要去掉正负号的数据 + * @param removeIsolatedSign 是否去掉 + - + */ +export function removeSignAll(value: number | string) { + if (`${value}` === '') { + return value + } + let tempValue = `${value}` + + if (tempValue.slice(0, 1) === '±') { + tempValue = tempValue.slice(1) + } + if ((tempValue.slice(0, 1) === '+' || tempValue.slice(0, 1) === '-')) { + tempValue = tempValue.slice(1) + } + return tempValue +} + diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index 62ef4a2..d84c838 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -113,7 +113,7 @@ @change="handleInputNumberChange(scope)" /> - + diff --git a/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts b/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts index 119f900..58b94a8 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts +++ b/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts @@ -49,4 +49,7 @@ zeroDriftOne?: string zeroDriftThree?: string zeroDriftTwo?: string + + returnErrorBak?: string + indicatingErrorBak?: string // 示值误差 } diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index f5231db..781df4e 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -18,7 +18,7 @@ import { useCheckList } from '@/commonMethods/useCheckList' import multiTable from '@/components/MultiHeaderTable/index.vue' import { calc } from '@/utils/useCalc' -import { removeSign } from '@/commonMethods/useSign' +import { removeSign, removeSignAll } from '@/commonMethods/useSign' import { caculateDecimalDigits } from '@/views/business/measure/item/useCalculateResolution' import { useRound } from '@/commonMethods/useRound' @@ -638,7 +638,7 @@ // return false // } // } - if (itemFormData.value.itemCategoryName === '数字压力计') { + if (itemFormData.value.zeroDrift === '1' && itemFormData.value.itemCategoryName === '数字压力计') { if (!useCheckList(zeroDriftResultList.value, columns_zeroDriftResult.value, '零位漂移')) { return false } @@ -666,7 +666,7 @@ return false } // 校验数字压力计零位漂移 - if (itemFormData.value.itemCategoryName === '数字压力计') { + if (itemFormData.value.zeroDrift === '1' && itemFormData.value.itemCategoryName === '数字压力计') { if (!useCheckList(zeroDriftResultList.value, columns_zeroDriftResult.value, '零位漂移')) { return false } @@ -709,6 +709,7 @@ ...item, workLineEquation: itemFormData.value.workLineEquation === '最小二乘法：yLS = a + bp' ? '最小二乘法' : itemFormData.value.workLineEquation, // 工作直线方程（压力传感器） dataType: '1', // 电接点一般压力表计算上面表格字段 + lastCycleSensitivity: itemFormData.value.lastCycleSensitivity, // 上一周期灵敏度 } }) as any // 下面表格入参list @@ -763,8 +764,8 @@ }) // 检定数据 // =====================电接点一般压力第二结果判断=========== const result = resultListElectricContact.value.every((item: any) => { - return Number(item.maxPointDeviation) <= Number(removeSign(item.allowPointDeviation, true)) - && Number(item.maxDifferentGap) <= Number(removeSign(item.allowDifferentGap, true)) + return Number(removeSignAll(item.maxPointDeviation)) <= Number(removeSignAll(item.allowPointDeviation)) + && Number(removeSignAll(item.maxDifferentGap)) <= Number(removeSignAll(item.allowDifferentGap)) }) itemFormData.value.otherOutcome = result ? '合格' : '不合格' // 第二结果 } @@ -773,9 +774,9 @@ // ==================第一结果判断==================== // 判断结果：示值误差最大值、轻敲位移最大值、回程误差最大值均在允许值内，则合格，否则不合格。 const result = resultList.value.every((item) => { - return Number(item.maxIndicatingError) <= Number(item.indicatingError!.slice(1)) - && Number(item.maxFrictionError) <= Number(item.frictionError) - && Number(item.maxReturnError) <= Number(item.returnError) + return Number(removeSignAll(item.maxIndicatingError!)) <= Number(removeSignAll(item.indicatingError!)) + && Number(removeSignAll(item.maxFrictionError!)) <= Number(removeSignAll(item.frictionError!)) + && Number(removeSignAll(item.maxReturnError!)) <= Number(removeSignAll(item.returnError!)) }) itemFormData.value.outcome = result ? '合格' : '不合格' } @@ -789,14 +790,14 @@ }) resultList.value = res.data.filter((item: { dataCategory: string }) => item.dataCategory === '2') resultList.value = resultList.value.map((item: IDetailMeasureList) => { - item.indicatingError = list.value[0].indicatingError // 示值误差 - item.returnError = list.value[0].returnError // 回程误差、回程误差允许值 + item.indicatingError = list.value[0].indicatingErrorBak // 示值误差 + item.returnError = list.value[0].returnErrorBak // 回程误差、回程误差允许值 return item }) // 检定数据 // 判断结果：示值误差最大值、回程误差最大值均在允许值内，则合格，否则不合格。 const result = resultList.value.every((item) => { - return Number(item.maxIndicatingError) <= Number(item.indicatingError!.slice(1)) - && Number(item.maxReturnError) <= Number(item.returnError) + return Number(removeSignAll(item.maxIndicatingError!)) <= Number(removeSignAll(item.indicatingError!)) + && Number(removeSignAll(item.maxReturnError!)) <= Number(removeSignAll(item.returnError!)) }) itemFormData.value.outcome = result ? '合格' : '不合格' } @@ -838,8 +839,8 @@ }) // 判断结果：示值误差最大值、回程误差最大值均在允许值内，则合格，否则不合格。 const result = resultList.value.every((item) => { - return Number(item.maxIndicatingError) <= Number(item.indicatingError!.slice(1)) - && Number(item.maxReturnError) <= Number(item.returnError) + return Number(removeSignAll(item.maxIndicatingError!)) <= Number(removeSignAll(item.indicatingError!)) + && Number(removeSignAll(item.maxReturnError!)) <= Number(removeSignAll(item.returnError!)) }) itemFormData.value.outcome = result ? '合格' : '不合格' } diff --git a/src/commonMethods/useSign.ts b/src/commonMethods/useSign.ts index 738b64e..44990c5 100644 --- a/src/commonMethods/useSign.ts +++ b/src/commonMethods/useSign.ts @@ -41,3 +41,24 @@ return tempValue } } + +/** + * 去掉正负号和 + - + * @param value 需要去掉正负号的数据 + * @param removeIsolatedSign 是否去掉 + - + */ +export function removeSignAll(value: number | string) { + if (`${value}` === '') { + return value + } + let tempValue = `${value}` + + if (tempValue.slice(0, 1) === '±') { + tempValue = tempValue.slice(1) + } + if ((tempValue.slice(0, 1) === '+' || tempValue.slice(0, 1) === '-')) { + tempValue = tempValue.slice(1) + } + return tempValue +} + diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index 62ef4a2..d84c838 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -113,7 +113,7 @@ @change="handleInputNumberChange(scope)" /> - + diff --git a/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts b/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts index 119f900..58b94a8 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts +++ b/src/views/business/taskMeasure/measureData/components/fourth/fourth-interface.ts @@ -49,4 +49,7 @@ zeroDriftOne?: string zeroDriftThree?: string zeroDriftTwo?: string + + returnErrorBak?: string + indicatingErrorBak?: string // 示值误差 } diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index f5231db..781df4e 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -18,7 +18,7 @@ import { useCheckList } from '@/commonMethods/useCheckList' import multiTable from '@/components/MultiHeaderTable/index.vue' import { calc } from '@/utils/useCalc' -import { removeSign } from '@/commonMethods/useSign' +import { removeSign, removeSignAll } from '@/commonMethods/useSign' import { caculateDecimalDigits } from '@/views/business/measure/item/useCalculateResolution' import { useRound } from '@/commonMethods/useRound' @@ -638,7 +638,7 @@ // return false // } // } - if (itemFormData.value.itemCategoryName === '数字压力计') { + if (itemFormData.value.zeroDrift === '1' && itemFormData.value.itemCategoryName === '数字压力计') { if (!useCheckList(zeroDriftResultList.value, columns_zeroDriftResult.value, '零位漂移')) { return false } @@ -666,7 +666,7 @@ return false } // 校验数字压力计零位漂移 - if (itemFormData.value.itemCategoryName === '数字压力计') { + if (itemFormData.value.zeroDrift === '1' && itemFormData.value.itemCategoryName === '数字压力计') { if (!useCheckList(zeroDriftResultList.value, columns_zeroDriftResult.value, '零位漂移')) { return false } @@ -709,6 +709,7 @@ ...item, workLineEquation: itemFormData.value.workLineEquation === '最小二乘法：yLS = a + bp' ? '最小二乘法' : itemFormData.value.workLineEquation, // 工作直线方程（压力传感器） dataType: '1', // 电接点一般压力表计算上面表格字段 + lastCycleSensitivity: itemFormData.value.lastCycleSensitivity, // 上一周期灵敏度 } }) as any // 下面表格入参list @@ -763,8 +764,8 @@ }) // 检定数据 // =====================电接点一般压力第二结果判断=========== const result = resultListElectricContact.value.every((item: any) => { - return Number(item.maxPointDeviation) <= Number(removeSign(item.allowPointDeviation, true)) - && Number(item.maxDifferentGap) <= Number(removeSign(item.allowDifferentGap, true)) + return Number(removeSignAll(item.maxPointDeviation)) <= Number(removeSignAll(item.allowPointDeviation)) + && Number(removeSignAll(item.maxDifferentGap)) <= Number(removeSignAll(item.allowDifferentGap)) }) itemFormData.value.otherOutcome = result ? '合格' : '不合格' // 第二结果 } @@ -773,9 +774,9 @@ // ==================第一结果判断==================== // 判断结果：示值误差最大值、轻敲位移最大值、回程误差最大值均在允许值内，则合格，否则不合格。 const result = resultList.value.every((item) => { - return Number(item.maxIndicatingError) <= Number(item.indicatingError!.slice(1)) - && Number(item.maxFrictionError) <= Number(item.frictionError) - && Number(item.maxReturnError) <= Number(item.returnError) + return Number(removeSignAll(item.maxIndicatingError!)) <= Number(removeSignAll(item.indicatingError!)) + && Number(removeSignAll(item.maxFrictionError!)) <= Number(removeSignAll(item.frictionError!)) + && Number(removeSignAll(item.maxReturnError!)) <= Number(removeSignAll(item.returnError!)) }) itemFormData.value.outcome = result ? '合格' : '不合格' } @@ -789,14 +790,14 @@ }) resultList.value = res.data.filter((item: { dataCategory: string }) => item.dataCategory === '2') resultList.value = resultList.value.map((item: IDetailMeasureList) => { - item.indicatingError = list.value[0].indicatingError // 示值误差 - item.returnError = list.value[0].returnError // 回程误差、回程误差允许值 + item.indicatingError = list.value[0].indicatingErrorBak // 示值误差 + item.returnError = list.value[0].returnErrorBak // 回程误差、回程误差允许值 return item }) // 检定数据 // 判断结果：示值误差最大值、回程误差最大值均在允许值内，则合格，否则不合格。 const result = resultList.value.every((item) => { - return Number(item.maxIndicatingError) <= Number(item.indicatingError!.slice(1)) - && Number(item.maxReturnError) <= Number(item.returnError) + return Number(removeSignAll(item.maxIndicatingError!)) <= Number(removeSignAll(item.indicatingError!)) + && Number(removeSignAll(item.maxReturnError!)) <= Number(removeSignAll(item.returnError!)) }) itemFormData.value.outcome = result ? '合格' : '不合格' } @@ -838,8 +839,8 @@ }) // 判断结果：示值误差最大值、回程误差最大值均在允许值内，则合格，否则不合格。 const result = resultList.value.every((item) => { - return Number(item.maxIndicatingError) <= Number(item.indicatingError!.slice(1)) - && Number(item.maxReturnError) <= Number(item.returnError) + return Number(removeSignAll(item.maxIndicatingError!)) <= Number(removeSignAll(item.indicatingError!)) + && Number(removeSignAll(item.maxReturnError!)) <= Number(removeSignAll(item.returnError!)) }) itemFormData.value.outcome = result ? '合格' : '不合格' } diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue index 694eea4..e8bd42c 100644 --- a/src/views/business/taskMeasure/myTask/list.vue +++ b/src/views/business/taskMeasure/myTask/list.vue @@ -398,21 +398,21 @@ }) }) }).catch(() => { - $router.push({ - path: 'measureData/edit', - query: { - ...checkoutRow.value, - itemId: itemData.id, // 检定项id - itemCategoryId: itemData.itemCategoryId, // 检定项分类id - itemCategoryName: itemData.itemCategoryName, // 检定项分类名称 - belongStandardEquipment: itemData.belongStandardEquipment, // 检校标准装置Code - belongStandardEquipmentName: itemData.belongStandardEquipmentName, // 检校标准装置名称 - checkCycle: checkoutRow.value.checkCycle, // 检定周期 - customerName: checkoutRow.value.customerName, // 委托单位 - helpFieldInstruction: itemData.helpFieldInstruction, // 辅助字段说明 - helpInstruction: itemData.helpInstruction, // 辅助字段 - }, - }) + // $router.push({ + // path: 'measureData/edit', + // query: { + // ...checkoutRow.value, + // itemId: itemData.id, // 检定项id + // itemCategoryId: itemData.itemCategoryId, // 检定项分类id + // itemCategoryName: itemData.itemCategoryName, // 检定项分类名称 + // belongStandardEquipment: itemData.belongStandardEquipment, // 检校标准装置Code + // belongStandardEquipmentName: itemData.belongStandardEquipmentName, // 检校标准装置名称 + // checkCycle: checkoutRow.value.checkCycle, // 检定周期 + // customerName: checkoutRow.value.customerName, // 委托单位 + // helpFieldInstruction: itemData.helpFieldInstruction, // 辅助字段说明 + // helpInstruction: itemData.helpInstruction, // 辅助字段 + // }, + // }) }) } else {