diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index 7540458..e72d3dc 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -77,6 +77,7 @@ const rippleVoltageList = ref([]) // 纹波电压 const outputVoltageStabilityList = ref([]) // 输出电压短期稳定性 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({}) +const measureItemData = ref([]) const setListDict = () => { listDict.value = { '1-电源电压调整率': lineVoltageRegulationList.value, // 1 @@ -217,7 +218,16 @@ itemId: $route.query.itemId, // 检定项id orderId: $route.query.orderId, // 任务单id sampleId: $route.query.sampleId, // 被检设备id - }).then((res) => { + }).then(async (res) => { + // 获取检定项数据 + const params = { + id: $route.query.itemId, + itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名字 + belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置字典code + } + const response = await getItemInfo(params) + measureItemData.value = JSON.parse(JSON.stringify(response.data.measureItemDataDcPowerList)) + console.log(res.data, '编辑 详情') // 有关于检定项的数据 itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 @@ -231,28 +241,29 @@ }) } // 最大允许误差 计算 -const calcMaxError = (item: any) => { - console.log(item, '1111') +const calcMaxError = (item: any, index: number, type: string) => { + let initData = {} as any + if (type === 'all') { + initData = measureItemData.value[index] + } + else { + initData = measureItemData.value.filter((citem: any) => citem.dataType === item.dataType)[index] + } + console.log(initData, '对应的鉴定数据') // 1数字式、2指针式 if (item.dataTypeType === '1') { - if (item.maximumError === '2') { - // const a = (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)) || 0 - // console.log(a, 'aaa') - // console.log(transformDecimal(a, 3)) - return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)) || 0 + if (initData.maximumError === '2') { + return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB) * Number(initData.resolution)) || 0 } - else if (item.maximumError === '3') { - // const b = (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)) || 0 - // console.log(b, 'aaa') - // console.log(transformDecimal(b, 3)) - return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)) || 0 + else if (initData.maximumError === '3') { + return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB)) || 0 } - else if (item.maximumError === '1') { - return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0 + else if (initData.maximumError === '1') { + return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0 } } else if (item.dataTypeType === '2') { - return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0 + return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0 } } // 初始化数据 @@ -271,7 +282,7 @@ // 初始化输入数据 function initInputData(data: any[]) { initAllData() - data.forEach((item) => { + data.forEach((item, index) => { switch (item.dataType) { case '1': // 电源电压调整率 @@ -283,15 +294,15 @@ break case '3': // 电压示值误差 - voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: Number(calcMaxError(item) || 0).toFixed(2) }) + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(2) }) break case '4': // 电流示值误差(直接测量) - ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: Number(calcMaxError(item) || 0).toFixed(3) }) + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(3) }) break case '5': // 电流示值误差(间接测量) - ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: Number(calcMaxError(item)).toFixed(3) }) + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: Number(calcMaxError(item, index, 'all')).toFixed(3) }) break case '6': // 纹波电压 @@ -333,6 +344,7 @@ itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量) itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压 itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性 + measureItemData.value = JSON.parse(JSON.stringify(res.data.measureItemDataDcPowerList)) initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' }))) }) } @@ -369,11 +381,11 @@ const params = { belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置 itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称 - measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })).map((item: any) => { + measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })).map((item: any, index: number) => { if (item.dataType === '3' || item.dataType === '4' || item.dataType === '5') { return { ...item, - maximumError: Number(calcMaxError(item) || 0).toFixed(item.dataType === '3' ? 2 : 3), + maximumError: Number(calcMaxError(item, index, 'item') || 0).toFixed(item.dataType === '3' ? 2 : 3), } } else { diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index 7540458..e72d3dc 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -77,6 +77,7 @@ const rippleVoltageList = ref([]) // 纹波电压 const outputVoltageStabilityList = ref([]) // 输出电压短期稳定性 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({}) +const measureItemData = ref([]) const setListDict = () => { listDict.value = { '1-电源电压调整率': lineVoltageRegulationList.value, // 1 @@ -217,7 +218,16 @@ itemId: $route.query.itemId, // 检定项id orderId: $route.query.orderId, // 任务单id sampleId: $route.query.sampleId, // 被检设备id - }).then((res) => { + }).then(async (res) => { + // 获取检定项数据 + const params = { + id: $route.query.itemId, + itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名字 + belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置字典code + } + const response = await getItemInfo(params) + measureItemData.value = JSON.parse(JSON.stringify(response.data.measureItemDataDcPowerList)) + console.log(res.data, '编辑 详情') // 有关于检定项的数据 itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 @@ -231,28 +241,29 @@ }) } // 最大允许误差 计算 -const calcMaxError = (item: any) => { - console.log(item, '1111') +const calcMaxError = (item: any, index: number, type: string) => { + let initData = {} as any + if (type === 'all') { + initData = measureItemData.value[index] + } + else { + initData = measureItemData.value.filter((citem: any) => citem.dataType === item.dataType)[index] + } + console.log(initData, '对应的鉴定数据') // 1数字式、2指针式 if (item.dataTypeType === '1') { - if (item.maximumError === '2') { - // const a = (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)) || 0 - // console.log(a, 'aaa') - // console.log(transformDecimal(a, 3)) - return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)) || 0 + if (initData.maximumError === '2') { + return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB) * Number(initData.resolution)) || 0 } - else if (item.maximumError === '3') { - // const b = (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)) || 0 - // console.log(b, 'aaa') - // console.log(transformDecimal(b, 3)) - return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)) || 0 + else if (initData.maximumError === '3') { + return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB)) || 0 } - else if (item.maximumError === '1') { - return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0 + else if (initData.maximumError === '1') { + return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0 } } else if (item.dataTypeType === '2') { - return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0 + return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0 } } // 初始化数据 @@ -271,7 +282,7 @@ // 初始化输入数据 function initInputData(data: any[]) { initAllData() - data.forEach((item) => { + data.forEach((item, index) => { switch (item.dataType) { case '1': // 电源电压调整率 @@ -283,15 +294,15 @@ break case '3': // 电压示值误差 - voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: Number(calcMaxError(item) || 0).toFixed(2) }) + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(2) }) break case '4': // 电流示值误差(直接测量) - ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: Number(calcMaxError(item) || 0).toFixed(3) }) + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(3) }) break case '5': // 电流示值误差(间接测量) - ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: Number(calcMaxError(item)).toFixed(3) }) + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: Number(calcMaxError(item, index, 'all')).toFixed(3) }) break case '6': // 纹波电压 @@ -333,6 +344,7 @@ itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量) itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压 itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性 + measureItemData.value = JSON.parse(JSON.stringify(res.data.measureItemDataDcPowerList)) initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' }))) }) } @@ -369,11 +381,11 @@ const params = { belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置 itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称 - measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })).map((item: any) => { + measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })).map((item: any, index: number) => { if (item.dataType === '3' || item.dataType === '4' || item.dataType === '5') { return { ...item, - maximumError: Number(calcMaxError(item) || 0).toFixed(item.dataType === '3' ? 2 : 3), + maximumError: Number(calcMaxError(item, index, 'item') || 0).toFixed(item.dataType === '3' ? 2 : 3), } } else { diff --git a/src/views/quality/internal/internalPlan/components/edit.vue b/src/views/quality/internal/internalPlan/components/edit.vue index 2fb75ac..2ce275b 100644 --- a/src/views/quality/internal/internalPlan/components/edit.vue +++ b/src/views/quality/internal/internalPlan/components/edit.vue @@ -37,6 +37,7 @@ planUserList: [] as any, // 组员 }) // 用户列表 +const userList = ref([]) const userList1 = ref([]) const userList2 = ref([]) // 表单验证规则 @@ -146,9 +147,9 @@ }) } // 用户 - // getUserList({ offset: 1, limit: 99999 }).then((res) => { - // userList.value = res.data.rows - // }) + getUserList({ offset: 1, limit: 99999 }).then((res) => { + userList.value = res.data.rows + }) userList1.value = [...await filterUser(quality.roleTips['质量负责人']), ...await filterUser(quality.roleTips['内审组长'])] userList2.value = await filterUser(quality.roleTips['内审组员']) }