diff --git a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue index a133b1e..a3efb72 100644 --- a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue @@ -407,42 +407,52 @@ const handlerData = (type: string, params: string, paramsName: string, data: any) => { let result = [] if (type === '重复性') { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + averageValue: '', + standardDeviation: '', + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '重复性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - averageValue: '', - standardDeviation: '', + ...params, editable: true, })) } else { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + testValueOneDate: '', + testValueTwoDate: '', + testValueThreeDate: '', + testValueFourDate: '', + testValueFiveDate: '', + testValueSixDate: '', + averageValue: '', + stability: '', + lessThan: '', + urel: item.urel, + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '稳定性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - testValueOneDate: '', - testValueTwoDate: '', - testValueThreeDate: '', - testValueFourDate: '', - testValueFiveDate: '', - testValueSixDate: '', - averageValue: '', - stability: '', - lessThan: '', - urel: item.urel, + ...params, editable: true, })) } @@ -592,9 +602,9 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - console.log(responseList, 'responseList') + const dep = JSON.parse(JSON.stringify(responseList)) // 控制tab - const needShowTab = uniqueMultiArray(responseList, 'params').map((item: any) => item.params) + const needShowTab = uniqueMultiArray(dep, 'params').map((item: any) => item.params) radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params)) current.value = '' setTimeout(() => { @@ -608,17 +618,17 @@ })) } // 频率 重复性 - const frequencyListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) + const frequencyListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) // 频率 稳定性 - const frequencyListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) + const frequencyListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) // 功率 重复性 - const powerListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) + const powerListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) // 功率 稳定性 - const powerListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) + const powerListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) // 相对电平 重复性 - const relativeLevelListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) + const relativeLevelListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) // 相对电平 稳定性 - const relativeLevelListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) + const relativeLevelListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) return { frequencyListRepeatabilityList, frequencyListStabilityList, @@ -745,7 +755,7 @@ columns_stability_frequency_check_data.value = columnsData return item = itemData }) - frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) + // frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) // 功率 powerListStabilityCheckData.value = powerListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -753,7 +763,7 @@ columns_stability_power_check_data.value = columnsData return item = itemData }) - powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) + // powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) // 相对电平 relativeLevelListStabilityCheckData.value = relativeLevelListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -761,7 +771,7 @@ columns_stability_relative_level_check_data.value = columnsData return item = itemData }) - relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) + // relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) } }) } @@ -844,12 +854,28 @@ return true } // -------------------------------------钩子----------------------------------------------------- +// 统计日期 +const dateCount = (columns: TableColumn[], index: number) => { + let dateNum = 0 // 稳定性表格有几个日期 + + // 统计有几个日期 + columns[index].children?.forEach((item) => { + if (item.text !== '-' && item.text !== '') { + dateNum += 1 + } + }) + return dateNum +} watch(() => [frequencyListStability.value, powerListStability.value, relativeLevelListStability.value], (newVal) => { - form.value['1-flit'] = newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['2-flit'] = newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['3-flit'] = newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + const dateNum1 = dateCount(columns_stability_frequency.value, 2) + const dateNum2 = dateCount(columns_stability_power.value, 3) + const dateNum3 = dateCount(columns_stability_relative_level.value, 3) + form.value['1-flit'] = dateNum1 < 4 ? '合格' : newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['2-flit'] = dateNum2 < 4 ? '合格' : newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['3-flit'] = dateNum3 < 4 ? '合格' : newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' }, { deep: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'frequency': // 频率 repeatabilityColumns.value = columns_repeatability_frequency.value // 重复性表头 @@ -871,7 +897,29 @@ break } }, { immediate: true }) - +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'frequency': // 频率 + listRepeatabilityCheckData.value = frequencyListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_frequency.value + listStabilityCheckData.value = frequencyListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_frequency_check_data.value + break + case 'power': // 功率 + listRepeatabilityCheckData.value = powerListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_power.value + listStabilityCheckData.value = powerListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_power_check_data.value + break + case 'relative-level': // 相对电平 + listRepeatabilityCheckData.value = relativeLevelListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_relative_level.value + listStabilityCheckData.value = relativeLevelListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_relative_level_check_data.value + break + } +}) onMounted(async () => { belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置 itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id diff --git a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue index a133b1e..a3efb72 100644 --- a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue @@ -407,42 +407,52 @@ const handlerData = (type: string, params: string, paramsName: string, data: any) => { let result = [] if (type === '重复性') { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + averageValue: '', + standardDeviation: '', + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '重复性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - averageValue: '', - standardDeviation: '', + ...params, editable: true, })) } else { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + testValueOneDate: '', + testValueTwoDate: '', + testValueThreeDate: '', + testValueFourDate: '', + testValueFiveDate: '', + testValueSixDate: '', + averageValue: '', + stability: '', + lessThan: '', + urel: item.urel, + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '稳定性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - testValueOneDate: '', - testValueTwoDate: '', - testValueThreeDate: '', - testValueFourDate: '', - testValueFiveDate: '', - testValueSixDate: '', - averageValue: '', - stability: '', - lessThan: '', - urel: item.urel, + ...params, editable: true, })) } @@ -592,9 +602,9 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - console.log(responseList, 'responseList') + const dep = JSON.parse(JSON.stringify(responseList)) // 控制tab - const needShowTab = uniqueMultiArray(responseList, 'params').map((item: any) => item.params) + const needShowTab = uniqueMultiArray(dep, 'params').map((item: any) => item.params) radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params)) current.value = '' setTimeout(() => { @@ -608,17 +618,17 @@ })) } // 频率 重复性 - const frequencyListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) + const frequencyListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) // 频率 稳定性 - const frequencyListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) + const frequencyListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) // 功率 重复性 - const powerListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) + const powerListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) // 功率 稳定性 - const powerListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) + const powerListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) // 相对电平 重复性 - const relativeLevelListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) + const relativeLevelListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) // 相对电平 稳定性 - const relativeLevelListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) + const relativeLevelListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) return { frequencyListRepeatabilityList, frequencyListStabilityList, @@ -745,7 +755,7 @@ columns_stability_frequency_check_data.value = columnsData return item = itemData }) - frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) + // frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) // 功率 powerListStabilityCheckData.value = powerListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -753,7 +763,7 @@ columns_stability_power_check_data.value = columnsData return item = itemData }) - powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) + // powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) // 相对电平 relativeLevelListStabilityCheckData.value = relativeLevelListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -761,7 +771,7 @@ columns_stability_relative_level_check_data.value = columnsData return item = itemData }) - relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) + // relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) } }) } @@ -844,12 +854,28 @@ return true } // -------------------------------------钩子----------------------------------------------------- +// 统计日期 +const dateCount = (columns: TableColumn[], index: number) => { + let dateNum = 0 // 稳定性表格有几个日期 + + // 统计有几个日期 + columns[index].children?.forEach((item) => { + if (item.text !== '-' && item.text !== '') { + dateNum += 1 + } + }) + return dateNum +} watch(() => [frequencyListStability.value, powerListStability.value, relativeLevelListStability.value], (newVal) => { - form.value['1-flit'] = newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['2-flit'] = newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['3-flit'] = newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + const dateNum1 = dateCount(columns_stability_frequency.value, 2) + const dateNum2 = dateCount(columns_stability_power.value, 3) + const dateNum3 = dateCount(columns_stability_relative_level.value, 3) + form.value['1-flit'] = dateNum1 < 4 ? '合格' : newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['2-flit'] = dateNum2 < 4 ? '合格' : newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['3-flit'] = dateNum3 < 4 ? '合格' : newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' }, { deep: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'frequency': // 频率 repeatabilityColumns.value = columns_repeatability_frequency.value // 重复性表头 @@ -871,7 +897,29 @@ break } }, { immediate: true }) - +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'frequency': // 频率 + listRepeatabilityCheckData.value = frequencyListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_frequency.value + listStabilityCheckData.value = frequencyListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_frequency_check_data.value + break + case 'power': // 功率 + listRepeatabilityCheckData.value = powerListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_power.value + listStabilityCheckData.value = powerListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_power_check_data.value + break + case 'relative-level': // 相对电平 + listRepeatabilityCheckData.value = relativeLevelListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_relative_level.value + listStabilityCheckData.value = relativeLevelListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_relative_level_check_data.value + break + } +}) onMounted(async () => { belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置 itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue index b9aa890..13a8e52 100644 --- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue @@ -314,7 +314,7 @@ const listRepeatabilityCheckDate = ref([]) // 重复性数据-- 查询历史日期 const listStability = ref([]) // 稳定性数据 const listStabilityCheckDate = ref([]) // 稳定性数据-- 查询历史日期 - +const repeatabilityColumnsCheckData = ref() const voltageListRepeatability = ref([]) // 直流电压重复性 const voltageListRepeatabilityCheckDate = ref([]) // 直流电压重复性 -- 查询历史日期 const voltageListStability = ref([]) // 直流电压稳定性 @@ -973,8 +973,10 @@ fetchHistoryIndication(currentDate.value) // 获取稳定性 } else { // 详情制作表头 + // if (props.pageType === 'detail') { return } // columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, voltageListStability.value, 3) columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, effectListStability.value, 3) + console.log(columns_stability_voltage, 'columns_stability_voltagecolumns_stability_voltage') columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) // columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) columns_stability_ripple_voltage.value = handleDetailTableTableHead(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) @@ -1012,22 +1014,83 @@ const num = props.pageType === 'edit' ? 5 : 4 // 直流电压 voltageListStability.value = voltageListStability.value.map((item) => { - // clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3) + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage.value, num, 3) columns_stability_voltage.value = columnsData return item = itemData }) voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3) + // 电源效应和负载效应 + effectListStability.value = effectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage.value, num, 3) + columns_stability_voltage.value = columnsData + return item = itemData + }) + effectListStability.value = handleSaveDateParams(columns_stability_voltage.value, effectListStability.value, 3) + // 直流电流（直接测量） + electricityDirectListStability.value = electricityDirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityDirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) + + // 直流电流（间接测量） + electricityIndirectListStability.value = electricityIndirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityIndirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) + // 纹波电压 + rippleVoltageListStability.value = rippleVoltageListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage.value, num, 4) + columns_stability_ripple_voltage.value = columnsData + return item = itemData + }) + rippleVoltageListStability.value = handleSaveDateParams(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) } else { // 直流电压 voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => { clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage_check_date.value, 5, 3) columns_stability_voltage_check_date.value = columnsData return item = itemData }) - voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // 电源效应和负载效应 + effectListStabilityCheckDate.value = effectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage_check_date.value, 5, 3) + columns_stability_voltage_check_date.value = columnsData + return item = itemData + }) + // 直流电流（直接测量） + electricityDirectListStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 直流电流（间接测量） + electricityIndirectListStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 纹波电压 + rippleVoltageListStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage_check_date.value, 5, 4) + columns_stability_ripple_voltage_check_date.value = columnsData + return item = itemData + }) } }) } @@ -1119,11 +1182,11 @@ } // -------------------------------------钩子----------------------------------------------------- // 统计日期 -const dateCount = (columns: TableColumn[]) => { +const dateCount = (columns: TableColumn[], index: number) => { let dateNum = 0 // 稳定性表格有几个日期 // 统计有几个日期 - columns[5].children?.forEach((item) => { + columns[index].children?.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -1132,45 +1195,46 @@ } // 监听稳定性表格--判断稳定性考核是否合格 watch([() => voltageListStability.value, () => effectListStability.value, () => electricityDirectListStability.value, () => electricityIndirectListStability.value, () => rippleVoltageListStability.value], (newValue: any) => { - console.log('监听稳定性表格') - - if (newValue[0] && newValue[0].length && newValue[0][0]?.averageValue) { // 直流电压 + console.log(newValue[0], 'newValue[0]') + if (newValue[0] && newValue[0].length) { // 直流电压 const result = newValue[0].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['1-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' + console.log(form.value, 'form.value') } - if (newValue[1] && newValue[1].length && newValue[1][0]?.averageValue) { // 电源效应和负载效应 + if (newValue[1] && newValue[1].length) { // 电源效应和负载效应 const result = newValue[1].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['2-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[2] && newValue[2].length && newValue[2][0]?.averageValue) { // 直流电流(直接测量) + if (newValue[2] && newValue[2].length) { // 直流电流(直接测量) const result = newValue[2].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['3-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[3] && newValue[3].length && newValue[3][0]?.averageValue) { // 直流电流(间接测量) + if (newValue[3] && newValue[3].length) { // 直流电流(间接测量) const result = newValue[3].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['4-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[4] && newValue[4].length && newValue[4][0]?.averageValue) { // 纹波电压 + if (newValue[4] && newValue[4].length) { // 纹波电压 const result = newValue[4].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_ripple_voltage.value) + const dateNum = dateCount(columns_stability_ripple_voltage.value, 4) form.value['5-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } }, { deep: true, immediate: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'voltage': // 直流电压 repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头 @@ -1204,6 +1268,41 @@ break } }, { immediate: true }) +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'voltage': // 直流电压 + listRepeatabilityCheckDate.value = voltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = voltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'effect': // 电源效应和负载效应 + listRepeatabilityCheckDate.value = effectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = effectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'electricity-direct': // 直接电流（直接测量） + listRepeatabilityCheckDate.value = electricityDirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'electricity-indirect': // 直接电流（间接测量） + listRepeatabilityCheckDate.value = electricityIndirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_electricity_indirect.value + listStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'ripple-voltage': // 纹波电压 + listRepeatabilityCheckDate.value = rippleVoltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_ripple_voltage.value + listStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_ripple_voltage_check_date.value + break + } +}) watch(() => props.pageType, (newVal) => { voltageListRepeatability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) effectListRepeatability.value = effectListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) @@ -1253,7 +1352,7 @@ { let result = [] if (type === '重复性') { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + averageValue: '', + standardDeviation: '', + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '重复性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - averageValue: '', - standardDeviation: '', + ...params, editable: true, })) } else { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + testValueOneDate: '', + testValueTwoDate: '', + testValueThreeDate: '', + testValueFourDate: '', + testValueFiveDate: '', + testValueSixDate: '', + averageValue: '', + stability: '', + lessThan: '', + urel: item.urel, + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '稳定性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - testValueOneDate: '', - testValueTwoDate: '', - testValueThreeDate: '', - testValueFourDate: '', - testValueFiveDate: '', - testValueSixDate: '', - averageValue: '', - stability: '', - lessThan: '', - urel: item.urel, + ...params, editable: true, })) } @@ -592,9 +602,9 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - console.log(responseList, 'responseList') + const dep = JSON.parse(JSON.stringify(responseList)) // 控制tab - const needShowTab = uniqueMultiArray(responseList, 'params').map((item: any) => item.params) + const needShowTab = uniqueMultiArray(dep, 'params').map((item: any) => item.params) radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params)) current.value = '' setTimeout(() => { @@ -608,17 +618,17 @@ })) } // 频率 重复性 - const frequencyListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) + const frequencyListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) // 频率 稳定性 - const frequencyListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) + const frequencyListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) // 功率 重复性 - const powerListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) + const powerListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) // 功率 稳定性 - const powerListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) + const powerListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) // 相对电平 重复性 - const relativeLevelListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) + const relativeLevelListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) // 相对电平 稳定性 - const relativeLevelListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) + const relativeLevelListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) return { frequencyListRepeatabilityList, frequencyListStabilityList, @@ -745,7 +755,7 @@ columns_stability_frequency_check_data.value = columnsData return item = itemData }) - frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) + // frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) // 功率 powerListStabilityCheckData.value = powerListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -753,7 +763,7 @@ columns_stability_power_check_data.value = columnsData return item = itemData }) - powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) + // powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) // 相对电平 relativeLevelListStabilityCheckData.value = relativeLevelListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -761,7 +771,7 @@ columns_stability_relative_level_check_data.value = columnsData return item = itemData }) - relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) + // relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) } }) } @@ -844,12 +854,28 @@ return true } // -------------------------------------钩子----------------------------------------------------- +// 统计日期 +const dateCount = (columns: TableColumn[], index: number) => { + let dateNum = 0 // 稳定性表格有几个日期 + + // 统计有几个日期 + columns[index].children?.forEach((item) => { + if (item.text !== '-' && item.text !== '') { + dateNum += 1 + } + }) + return dateNum +} watch(() => [frequencyListStability.value, powerListStability.value, relativeLevelListStability.value], (newVal) => { - form.value['1-flit'] = newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['2-flit'] = newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['3-flit'] = newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + const dateNum1 = dateCount(columns_stability_frequency.value, 2) + const dateNum2 = dateCount(columns_stability_power.value, 3) + const dateNum3 = dateCount(columns_stability_relative_level.value, 3) + form.value['1-flit'] = dateNum1 < 4 ? '合格' : newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['2-flit'] = dateNum2 < 4 ? '合格' : newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['3-flit'] = dateNum3 < 4 ? '合格' : newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' }, { deep: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'frequency': // 频率 repeatabilityColumns.value = columns_repeatability_frequency.value // 重复性表头 @@ -871,7 +897,29 @@ break } }, { immediate: true }) - +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'frequency': // 频率 + listRepeatabilityCheckData.value = frequencyListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_frequency.value + listStabilityCheckData.value = frequencyListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_frequency_check_data.value + break + case 'power': // 功率 + listRepeatabilityCheckData.value = powerListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_power.value + listStabilityCheckData.value = powerListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_power_check_data.value + break + case 'relative-level': // 相对电平 + listRepeatabilityCheckData.value = relativeLevelListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_relative_level.value + listStabilityCheckData.value = relativeLevelListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_relative_level_check_data.value + break + } +}) onMounted(async () => { belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置 itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue index b9aa890..13a8e52 100644 --- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue @@ -314,7 +314,7 @@ const listRepeatabilityCheckDate = ref([]) // 重复性数据-- 查询历史日期 const listStability = ref([]) // 稳定性数据 const listStabilityCheckDate = ref([]) // 稳定性数据-- 查询历史日期 - +const repeatabilityColumnsCheckData = ref() const voltageListRepeatability = ref([]) // 直流电压重复性 const voltageListRepeatabilityCheckDate = ref([]) // 直流电压重复性 -- 查询历史日期 const voltageListStability = ref([]) // 直流电压稳定性 @@ -973,8 +973,10 @@ fetchHistoryIndication(currentDate.value) // 获取稳定性 } else { // 详情制作表头 + // if (props.pageType === 'detail') { return } // columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, voltageListStability.value, 3) columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, effectListStability.value, 3) + console.log(columns_stability_voltage, 'columns_stability_voltagecolumns_stability_voltage') columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) // columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) columns_stability_ripple_voltage.value = handleDetailTableTableHead(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) @@ -1012,22 +1014,83 @@ const num = props.pageType === 'edit' ? 5 : 4 // 直流电压 voltageListStability.value = voltageListStability.value.map((item) => { - // clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3) + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage.value, num, 3) columns_stability_voltage.value = columnsData return item = itemData }) voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3) + // 电源效应和负载效应 + effectListStability.value = effectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage.value, num, 3) + columns_stability_voltage.value = columnsData + return item = itemData + }) + effectListStability.value = handleSaveDateParams(columns_stability_voltage.value, effectListStability.value, 3) + // 直流电流（直接测量） + electricityDirectListStability.value = electricityDirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityDirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) + + // 直流电流（间接测量） + electricityIndirectListStability.value = electricityIndirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityIndirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) + // 纹波电压 + rippleVoltageListStability.value = rippleVoltageListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage.value, num, 4) + columns_stability_ripple_voltage.value = columnsData + return item = itemData + }) + rippleVoltageListStability.value = handleSaveDateParams(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) } else { // 直流电压 voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => { clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage_check_date.value, 5, 3) columns_stability_voltage_check_date.value = columnsData return item = itemData }) - voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // 电源效应和负载效应 + effectListStabilityCheckDate.value = effectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage_check_date.value, 5, 3) + columns_stability_voltage_check_date.value = columnsData + return item = itemData + }) + // 直流电流（直接测量） + electricityDirectListStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 直流电流（间接测量） + electricityIndirectListStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 纹波电压 + rippleVoltageListStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage_check_date.value, 5, 4) + columns_stability_ripple_voltage_check_date.value = columnsData + return item = itemData + }) } }) } @@ -1119,11 +1182,11 @@ } // -------------------------------------钩子----------------------------------------------------- // 统计日期 -const dateCount = (columns: TableColumn[]) => { +const dateCount = (columns: TableColumn[], index: number) => { let dateNum = 0 // 稳定性表格有几个日期 // 统计有几个日期 - columns[5].children?.forEach((item) => { + columns[index].children?.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -1132,45 +1195,46 @@ } // 监听稳定性表格--判断稳定性考核是否合格 watch([() => voltageListStability.value, () => effectListStability.value, () => electricityDirectListStability.value, () => electricityIndirectListStability.value, () => rippleVoltageListStability.value], (newValue: any) => { - console.log('监听稳定性表格') - - if (newValue[0] && newValue[0].length && newValue[0][0]?.averageValue) { // 直流电压 + console.log(newValue[0], 'newValue[0]') + if (newValue[0] && newValue[0].length) { // 直流电压 const result = newValue[0].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['1-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' + console.log(form.value, 'form.value') } - if (newValue[1] && newValue[1].length && newValue[1][0]?.averageValue) { // 电源效应和负载效应 + if (newValue[1] && newValue[1].length) { // 电源效应和负载效应 const result = newValue[1].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['2-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[2] && newValue[2].length && newValue[2][0]?.averageValue) { // 直流电流(直接测量) + if (newValue[2] && newValue[2].length) { // 直流电流(直接测量) const result = newValue[2].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['3-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[3] && newValue[3].length && newValue[3][0]?.averageValue) { // 直流电流(间接测量) + if (newValue[3] && newValue[3].length) { // 直流电流(间接测量) const result = newValue[3].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['4-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[4] && newValue[4].length && newValue[4][0]?.averageValue) { // 纹波电压 + if (newValue[4] && newValue[4].length) { // 纹波电压 const result = newValue[4].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_ripple_voltage.value) + const dateNum = dateCount(columns_stability_ripple_voltage.value, 4) form.value['5-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } }, { deep: true, immediate: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'voltage': // 直流电压 repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头 @@ -1204,6 +1268,41 @@ break } }, { immediate: true }) +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'voltage': // 直流电压 + listRepeatabilityCheckDate.value = voltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = voltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'effect': // 电源效应和负载效应 + listRepeatabilityCheckDate.value = effectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = effectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'electricity-direct': // 直接电流（直接测量） + listRepeatabilityCheckDate.value = electricityDirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'electricity-indirect': // 直接电流（间接测量） + listRepeatabilityCheckDate.value = electricityIndirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_electricity_indirect.value + listStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'ripple-voltage': // 纹波电压 + listRepeatabilityCheckDate.value = rippleVoltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_ripple_voltage.value + listStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_ripple_voltage_check_date.value + break + } +}) watch(() => props.pageType, (newVal) => { voltageListRepeatability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) effectListRepeatability.value = effectListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) @@ -1253,7 +1352,7 @@ { let result = [] if (type === '重复性') { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + averageValue: '', + standardDeviation: '', + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '重复性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - averageValue: '', - standardDeviation: '', + ...params, editable: true, })) } else { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + testValueOneDate: '', + testValueTwoDate: '', + testValueThreeDate: '', + testValueFourDate: '', + testValueFiveDate: '', + testValueSixDate: '', + averageValue: '', + stability: '', + lessThan: '', + urel: item.urel, + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '稳定性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - testValueOneDate: '', - testValueTwoDate: '', - testValueThreeDate: '', - testValueFourDate: '', - testValueFiveDate: '', - testValueSixDate: '', - averageValue: '', - stability: '', - lessThan: '', - urel: item.urel, + ...params, editable: true, })) } @@ -592,9 +602,9 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - console.log(responseList, 'responseList') + const dep = JSON.parse(JSON.stringify(responseList)) // 控制tab - const needShowTab = uniqueMultiArray(responseList, 'params').map((item: any) => item.params) + const needShowTab = uniqueMultiArray(dep, 'params').map((item: any) => item.params) radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params)) current.value = '' setTimeout(() => { @@ -608,17 +618,17 @@ })) } // 频率 重复性 - const frequencyListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) + const frequencyListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) // 频率 稳定性 - const frequencyListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) + const frequencyListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) // 功率 重复性 - const powerListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) + const powerListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) // 功率 稳定性 - const powerListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) + const powerListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) // 相对电平 重复性 - const relativeLevelListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) + const relativeLevelListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) // 相对电平 稳定性 - const relativeLevelListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) + const relativeLevelListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) return { frequencyListRepeatabilityList, frequencyListStabilityList, @@ -745,7 +755,7 @@ columns_stability_frequency_check_data.value = columnsData return item = itemData }) - frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) + // frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) // 功率 powerListStabilityCheckData.value = powerListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -753,7 +763,7 @@ columns_stability_power_check_data.value = columnsData return item = itemData }) - powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) + // powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) // 相对电平 relativeLevelListStabilityCheckData.value = relativeLevelListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -761,7 +771,7 @@ columns_stability_relative_level_check_data.value = columnsData return item = itemData }) - relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) + // relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) } }) } @@ -844,12 +854,28 @@ return true } // -------------------------------------钩子----------------------------------------------------- +// 统计日期 +const dateCount = (columns: TableColumn[], index: number) => { + let dateNum = 0 // 稳定性表格有几个日期 + + // 统计有几个日期 + columns[index].children?.forEach((item) => { + if (item.text !== '-' && item.text !== '') { + dateNum += 1 + } + }) + return dateNum +} watch(() => [frequencyListStability.value, powerListStability.value, relativeLevelListStability.value], (newVal) => { - form.value['1-flit'] = newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['2-flit'] = newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['3-flit'] = newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + const dateNum1 = dateCount(columns_stability_frequency.value, 2) + const dateNum2 = dateCount(columns_stability_power.value, 3) + const dateNum3 = dateCount(columns_stability_relative_level.value, 3) + form.value['1-flit'] = dateNum1 < 4 ? '合格' : newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['2-flit'] = dateNum2 < 4 ? '合格' : newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['3-flit'] = dateNum3 < 4 ? '合格' : newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' }, { deep: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'frequency': // 频率 repeatabilityColumns.value = columns_repeatability_frequency.value // 重复性表头 @@ -871,7 +897,29 @@ break } }, { immediate: true }) - +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'frequency': // 频率 + listRepeatabilityCheckData.value = frequencyListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_frequency.value + listStabilityCheckData.value = frequencyListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_frequency_check_data.value + break + case 'power': // 功率 + listRepeatabilityCheckData.value = powerListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_power.value + listStabilityCheckData.value = powerListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_power_check_data.value + break + case 'relative-level': // 相对电平 + listRepeatabilityCheckData.value = relativeLevelListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_relative_level.value + listStabilityCheckData.value = relativeLevelListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_relative_level_check_data.value + break + } +}) onMounted(async () => { belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置 itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue index b9aa890..13a8e52 100644 --- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue @@ -314,7 +314,7 @@ const listRepeatabilityCheckDate = ref([]) // 重复性数据-- 查询历史日期 const listStability = ref([]) // 稳定性数据 const listStabilityCheckDate = ref([]) // 稳定性数据-- 查询历史日期 - +const repeatabilityColumnsCheckData = ref() const voltageListRepeatability = ref([]) // 直流电压重复性 const voltageListRepeatabilityCheckDate = ref([]) // 直流电压重复性 -- 查询历史日期 const voltageListStability = ref([]) // 直流电压稳定性 @@ -973,8 +973,10 @@ fetchHistoryIndication(currentDate.value) // 获取稳定性 } else { // 详情制作表头 + // if (props.pageType === 'detail') { return } // columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, voltageListStability.value, 3) columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, effectListStability.value, 3) + console.log(columns_stability_voltage, 'columns_stability_voltagecolumns_stability_voltage') columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) // columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) columns_stability_ripple_voltage.value = handleDetailTableTableHead(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) @@ -1012,22 +1014,83 @@ const num = props.pageType === 'edit' ? 5 : 4 // 直流电压 voltageListStability.value = voltageListStability.value.map((item) => { - // clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3) + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage.value, num, 3) columns_stability_voltage.value = columnsData return item = itemData }) voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3) + // 电源效应和负载效应 + effectListStability.value = effectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage.value, num, 3) + columns_stability_voltage.value = columnsData + return item = itemData + }) + effectListStability.value = handleSaveDateParams(columns_stability_voltage.value, effectListStability.value, 3) + // 直流电流（直接测量） + electricityDirectListStability.value = electricityDirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityDirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) + + // 直流电流（间接测量） + electricityIndirectListStability.value = electricityIndirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityIndirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) + // 纹波电压 + rippleVoltageListStability.value = rippleVoltageListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage.value, num, 4) + columns_stability_ripple_voltage.value = columnsData + return item = itemData + }) + rippleVoltageListStability.value = handleSaveDateParams(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) } else { // 直流电压 voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => { clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage_check_date.value, 5, 3) columns_stability_voltage_check_date.value = columnsData return item = itemData }) - voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // 电源效应和负载效应 + effectListStabilityCheckDate.value = effectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage_check_date.value, 5, 3) + columns_stability_voltage_check_date.value = columnsData + return item = itemData + }) + // 直流电流（直接测量） + electricityDirectListStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 直流电流（间接测量） + electricityIndirectListStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 纹波电压 + rippleVoltageListStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage_check_date.value, 5, 4) + columns_stability_ripple_voltage_check_date.value = columnsData + return item = itemData + }) } }) } @@ -1119,11 +1182,11 @@ } // -------------------------------------钩子----------------------------------------------------- // 统计日期 -const dateCount = (columns: TableColumn[]) => { +const dateCount = (columns: TableColumn[], index: number) => { let dateNum = 0 // 稳定性表格有几个日期 // 统计有几个日期 - columns[5].children?.forEach((item) => { + columns[index].children?.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -1132,45 +1195,46 @@ } // 监听稳定性表格--判断稳定性考核是否合格 watch([() => voltageListStability.value, () => effectListStability.value, () => electricityDirectListStability.value, () => electricityIndirectListStability.value, () => rippleVoltageListStability.value], (newValue: any) => { - console.log('监听稳定性表格') - - if (newValue[0] && newValue[0].length && newValue[0][0]?.averageValue) { // 直流电压 + console.log(newValue[0], 'newValue[0]') + if (newValue[0] && newValue[0].length) { // 直流电压 const result = newValue[0].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['1-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' + console.log(form.value, 'form.value') } - if (newValue[1] && newValue[1].length && newValue[1][0]?.averageValue) { // 电源效应和负载效应 + if (newValue[1] && newValue[1].length) { // 电源效应和负载效应 const result = newValue[1].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['2-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[2] && newValue[2].length && newValue[2][0]?.averageValue) { // 直流电流(直接测量) + if (newValue[2] && newValue[2].length) { // 直流电流(直接测量) const result = newValue[2].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['3-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[3] && newValue[3].length && newValue[3][0]?.averageValue) { // 直流电流(间接测量) + if (newValue[3] && newValue[3].length) { // 直流电流(间接测量) const result = newValue[3].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['4-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[4] && newValue[4].length && newValue[4][0]?.averageValue) { // 纹波电压 + if (newValue[4] && newValue[4].length) { // 纹波电压 const result = newValue[4].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_ripple_voltage.value) + const dateNum = dateCount(columns_stability_ripple_voltage.value, 4) form.value['5-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } }, { deep: true, immediate: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'voltage': // 直流电压 repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头 @@ -1204,6 +1268,41 @@ break } }, { immediate: true }) +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'voltage': // 直流电压 + listRepeatabilityCheckDate.value = voltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = voltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'effect': // 电源效应和负载效应 + listRepeatabilityCheckDate.value = effectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = effectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'electricity-direct': // 直接电流（直接测量） + listRepeatabilityCheckDate.value = electricityDirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'electricity-indirect': // 直接电流（间接测量） + listRepeatabilityCheckDate.value = electricityIndirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_electricity_indirect.value + listStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'ripple-voltage': // 纹波电压 + listRepeatabilityCheckDate.value = rippleVoltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_ripple_voltage.value + listStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_ripple_voltage_check_date.value + break + } +}) watch(() => props.pageType, (newVal) => { voltageListRepeatability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) effectListRepeatability.value = effectListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) @@ -1253,7 +1352,7 @@ datetimerange.value, (newVal) => { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' - if (Array.isArray(newVal)) { - if (newVal.length) { - listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` - listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` - } - } -}) +// const datetimerange = ref() +// watch(() => datetimerange.value, (newVal) => { +// listQuery.value.createTimeStart = '' +// listQuery.value.createTimeEnd = '' +// if (Array.isArray(newVal)) { +// if (newVal.length) { +// listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` +// listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` +// } +// } +// }) // 列表数据 const tableList = ref([]) const total = ref(0) @@ -73,7 +73,7 @@ // 重置查询条件 const clearList = () => { - datetimerange.value = [] + // datetimerange.value = [] listQuery.value = { approvalStatus: active.value === '10' ? '' : active.value, fileCode: '', @@ -342,11 +342,27 @@ + + + + + + + + { let result = [] if (type === '重复性') { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + averageValue: '', + standardDeviation: '', + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '重复性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - averageValue: '', - standardDeviation: '', + ...params, editable: true, })) } else { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + testValueOneDate: '', + testValueTwoDate: '', + testValueThreeDate: '', + testValueFourDate: '', + testValueFiveDate: '', + testValueSixDate: '', + averageValue: '', + stability: '', + lessThan: '', + urel: item.urel, + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '稳定性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - testValueOneDate: '', - testValueTwoDate: '', - testValueThreeDate: '', - testValueFourDate: '', - testValueFiveDate: '', - testValueSixDate: '', - averageValue: '', - stability: '', - lessThan: '', - urel: item.urel, + ...params, editable: true, })) } @@ -592,9 +602,9 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - console.log(responseList, 'responseList') + const dep = JSON.parse(JSON.stringify(responseList)) // 控制tab - const needShowTab = uniqueMultiArray(responseList, 'params').map((item: any) => item.params) + const needShowTab = uniqueMultiArray(dep, 'params').map((item: any) => item.params) radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params)) current.value = '' setTimeout(() => { @@ -608,17 +618,17 @@ })) } // 频率 重复性 - const frequencyListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) + const frequencyListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) // 频率 稳定性 - const frequencyListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) + const frequencyListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) // 功率 重复性 - const powerListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) + const powerListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) // 功率 稳定性 - const powerListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) + const powerListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) // 相对电平 重复性 - const relativeLevelListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) + const relativeLevelListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) // 相对电平 稳定性 - const relativeLevelListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) + const relativeLevelListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) return { frequencyListRepeatabilityList, frequencyListStabilityList, @@ -745,7 +755,7 @@ columns_stability_frequency_check_data.value = columnsData return item = itemData }) - frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) + // frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) // 功率 powerListStabilityCheckData.value = powerListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -753,7 +763,7 @@ columns_stability_power_check_data.value = columnsData return item = itemData }) - powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) + // powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) // 相对电平 relativeLevelListStabilityCheckData.value = relativeLevelListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -761,7 +771,7 @@ columns_stability_relative_level_check_data.value = columnsData return item = itemData }) - relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) + // relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) } }) } @@ -844,12 +854,28 @@ return true } // -------------------------------------钩子----------------------------------------------------- +// 统计日期 +const dateCount = (columns: TableColumn[], index: number) => { + let dateNum = 0 // 稳定性表格有几个日期 + + // 统计有几个日期 + columns[index].children?.forEach((item) => { + if (item.text !== '-' && item.text !== '') { + dateNum += 1 + } + }) + return dateNum +} watch(() => [frequencyListStability.value, powerListStability.value, relativeLevelListStability.value], (newVal) => { - form.value['1-flit'] = newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['2-flit'] = newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['3-flit'] = newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + const dateNum1 = dateCount(columns_stability_frequency.value, 2) + const dateNum2 = dateCount(columns_stability_power.value, 3) + const dateNum3 = dateCount(columns_stability_relative_level.value, 3) + form.value['1-flit'] = dateNum1 < 4 ? '合格' : newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['2-flit'] = dateNum2 < 4 ? '合格' : newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['3-flit'] = dateNum3 < 4 ? '合格' : newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' }, { deep: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'frequency': // 频率 repeatabilityColumns.value = columns_repeatability_frequency.value // 重复性表头 @@ -871,7 +897,29 @@ break } }, { immediate: true }) - +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'frequency': // 频率 + listRepeatabilityCheckData.value = frequencyListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_frequency.value + listStabilityCheckData.value = frequencyListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_frequency_check_data.value + break + case 'power': // 功率 + listRepeatabilityCheckData.value = powerListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_power.value + listStabilityCheckData.value = powerListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_power_check_data.value + break + case 'relative-level': // 相对电平 + listRepeatabilityCheckData.value = relativeLevelListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_relative_level.value + listStabilityCheckData.value = relativeLevelListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_relative_level_check_data.value + break + } +}) onMounted(async () => { belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置 itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue index b9aa890..13a8e52 100644 --- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue @@ -314,7 +314,7 @@ const listRepeatabilityCheckDate = ref([]) // 重复性数据-- 查询历史日期 const listStability = ref([]) // 稳定性数据 const listStabilityCheckDate = ref([]) // 稳定性数据-- 查询历史日期 - +const repeatabilityColumnsCheckData = ref() const voltageListRepeatability = ref([]) // 直流电压重复性 const voltageListRepeatabilityCheckDate = ref([]) // 直流电压重复性 -- 查询历史日期 const voltageListStability = ref([]) // 直流电压稳定性 @@ -973,8 +973,10 @@ fetchHistoryIndication(currentDate.value) // 获取稳定性 } else { // 详情制作表头 + // if (props.pageType === 'detail') { return } // columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, voltageListStability.value, 3) columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, effectListStability.value, 3) + console.log(columns_stability_voltage, 'columns_stability_voltagecolumns_stability_voltage') columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) // columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) columns_stability_ripple_voltage.value = handleDetailTableTableHead(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) @@ -1012,22 +1014,83 @@ const num = props.pageType === 'edit' ? 5 : 4 // 直流电压 voltageListStability.value = voltageListStability.value.map((item) => { - // clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3) + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage.value, num, 3) columns_stability_voltage.value = columnsData return item = itemData }) voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3) + // 电源效应和负载效应 + effectListStability.value = effectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage.value, num, 3) + columns_stability_voltage.value = columnsData + return item = itemData + }) + effectListStability.value = handleSaveDateParams(columns_stability_voltage.value, effectListStability.value, 3) + // 直流电流（直接测量） + electricityDirectListStability.value = electricityDirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityDirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) + + // 直流电流（间接测量） + electricityIndirectListStability.value = electricityIndirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityIndirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) + // 纹波电压 + rippleVoltageListStability.value = rippleVoltageListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage.value, num, 4) + columns_stability_ripple_voltage.value = columnsData + return item = itemData + }) + rippleVoltageListStability.value = handleSaveDateParams(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) } else { // 直流电压 voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => { clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage_check_date.value, 5, 3) columns_stability_voltage_check_date.value = columnsData return item = itemData }) - voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // 电源效应和负载效应 + effectListStabilityCheckDate.value = effectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage_check_date.value, 5, 3) + columns_stability_voltage_check_date.value = columnsData + return item = itemData + }) + // 直流电流（直接测量） + electricityDirectListStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 直流电流（间接测量） + electricityIndirectListStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 纹波电压 + rippleVoltageListStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage_check_date.value, 5, 4) + columns_stability_ripple_voltage_check_date.value = columnsData + return item = itemData + }) } }) } @@ -1119,11 +1182,11 @@ } // -------------------------------------钩子----------------------------------------------------- // 统计日期 -const dateCount = (columns: TableColumn[]) => { +const dateCount = (columns: TableColumn[], index: number) => { let dateNum = 0 // 稳定性表格有几个日期 // 统计有几个日期 - columns[5].children?.forEach((item) => { + columns[index].children?.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -1132,45 +1195,46 @@ } // 监听稳定性表格--判断稳定性考核是否合格 watch([() => voltageListStability.value, () => effectListStability.value, () => electricityDirectListStability.value, () => electricityIndirectListStability.value, () => rippleVoltageListStability.value], (newValue: any) => { - console.log('监听稳定性表格') - - if (newValue[0] && newValue[0].length && newValue[0][0]?.averageValue) { // 直流电压 + console.log(newValue[0], 'newValue[0]') + if (newValue[0] && newValue[0].length) { // 直流电压 const result = newValue[0].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['1-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' + console.log(form.value, 'form.value') } - if (newValue[1] && newValue[1].length && newValue[1][0]?.averageValue) { // 电源效应和负载效应 + if (newValue[1] && newValue[1].length) { // 电源效应和负载效应 const result = newValue[1].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['2-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[2] && newValue[2].length && newValue[2][0]?.averageValue) { // 直流电流(直接测量) + if (newValue[2] && newValue[2].length) { // 直流电流(直接测量) const result = newValue[2].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['3-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[3] && newValue[3].length && newValue[3][0]?.averageValue) { // 直流电流(间接测量) + if (newValue[3] && newValue[3].length) { // 直流电流(间接测量) const result = newValue[3].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['4-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[4] && newValue[4].length && newValue[4][0]?.averageValue) { // 纹波电压 + if (newValue[4] && newValue[4].length) { // 纹波电压 const result = newValue[4].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_ripple_voltage.value) + const dateNum = dateCount(columns_stability_ripple_voltage.value, 4) form.value['5-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } }, { deep: true, immediate: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'voltage': // 直流电压 repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头 @@ -1204,6 +1268,41 @@ break } }, { immediate: true }) +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'voltage': // 直流电压 + listRepeatabilityCheckDate.value = voltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = voltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'effect': // 电源效应和负载效应 + listRepeatabilityCheckDate.value = effectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = effectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'electricity-direct': // 直接电流（直接测量） + listRepeatabilityCheckDate.value = electricityDirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'electricity-indirect': // 直接电流（间接测量） + listRepeatabilityCheckDate.value = electricityIndirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_electricity_indirect.value + listStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'ripple-voltage': // 纹波电压 + listRepeatabilityCheckDate.value = rippleVoltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_ripple_voltage.value + listStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_ripple_voltage_check_date.value + break + } +}) watch(() => props.pageType, (newVal) => { voltageListRepeatability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) effectListRepeatability.value = effectListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) @@ -1253,7 +1352,7 @@ datetimerange.value, (newVal) => { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' - if (Array.isArray(newVal)) { - if (newVal.length) { - listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` - listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` - } - } -}) +// const datetimerange = ref() +// watch(() => datetimerange.value, (newVal) => { +// listQuery.value.createTimeStart = '' +// listQuery.value.createTimeEnd = '' +// if (Array.isArray(newVal)) { +// if (newVal.length) { +// listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` +// listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` +// } +// } +// }) // 列表数据 const tableList = ref([]) const total = ref(0) @@ -73,7 +73,7 @@ // 重置查询条件 const clearList = () => { - datetimerange.value = [] + // datetimerange.value = [] listQuery.value = { approvalStatus: active.value === '10' ? '' : active.value, fileCode: '', @@ -342,11 +342,27 @@ + + + + + + + + diff --git a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue index a133b1e..a3efb72 100644 --- a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue @@ -407,42 +407,52 @@ const handlerData = (type: string, params: string, paramsName: string, data: any) => { let result = [] if (type === '重复性') { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + averageValue: '', + standardDeviation: '', + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '重复性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - averageValue: '', - standardDeviation: '', + ...params, editable: true, })) } else { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + testValueOneDate: '', + testValueTwoDate: '', + testValueThreeDate: '', + testValueFourDate: '', + testValueFiveDate: '', + testValueSixDate: '', + averageValue: '', + stability: '', + lessThan: '', + urel: item.urel, + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '稳定性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - testValueOneDate: '', - testValueTwoDate: '', - testValueThreeDate: '', - testValueFourDate: '', - testValueFiveDate: '', - testValueSixDate: '', - averageValue: '', - stability: '', - lessThan: '', - urel: item.urel, + ...params, editable: true, })) } @@ -592,9 +602,9 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - console.log(responseList, 'responseList') + const dep = JSON.parse(JSON.stringify(responseList)) // 控制tab - const needShowTab = uniqueMultiArray(responseList, 'params').map((item: any) => item.params) + const needShowTab = uniqueMultiArray(dep, 'params').map((item: any) => item.params) radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params)) current.value = '' setTimeout(() => { @@ -608,17 +618,17 @@ })) } // 频率 重复性 - const frequencyListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) + const frequencyListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) // 频率 稳定性 - const frequencyListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) + const frequencyListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) // 功率 重复性 - const powerListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) + const powerListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) // 功率 稳定性 - const powerListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) + const powerListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) // 相对电平 重复性 - const relativeLevelListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) + const relativeLevelListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) // 相对电平 稳定性 - const relativeLevelListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) + const relativeLevelListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) return { frequencyListRepeatabilityList, frequencyListStabilityList, @@ -745,7 +755,7 @@ columns_stability_frequency_check_data.value = columnsData return item = itemData }) - frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) + // frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) // 功率 powerListStabilityCheckData.value = powerListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -753,7 +763,7 @@ columns_stability_power_check_data.value = columnsData return item = itemData }) - powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) + // powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) // 相对电平 relativeLevelListStabilityCheckData.value = relativeLevelListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -761,7 +771,7 @@ columns_stability_relative_level_check_data.value = columnsData return item = itemData }) - relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) + // relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) } }) } @@ -844,12 +854,28 @@ return true } // -------------------------------------钩子----------------------------------------------------- +// 统计日期 +const dateCount = (columns: TableColumn[], index: number) => { + let dateNum = 0 // 稳定性表格有几个日期 + + // 统计有几个日期 + columns[index].children?.forEach((item) => { + if (item.text !== '-' && item.text !== '') { + dateNum += 1 + } + }) + return dateNum +} watch(() => [frequencyListStability.value, powerListStability.value, relativeLevelListStability.value], (newVal) => { - form.value['1-flit'] = newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['2-flit'] = newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['3-flit'] = newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + const dateNum1 = dateCount(columns_stability_frequency.value, 2) + const dateNum2 = dateCount(columns_stability_power.value, 3) + const dateNum3 = dateCount(columns_stability_relative_level.value, 3) + form.value['1-flit'] = dateNum1 < 4 ? '合格' : newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['2-flit'] = dateNum2 < 4 ? '合格' : newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['3-flit'] = dateNum3 < 4 ? '合格' : newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' }, { deep: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'frequency': // 频率 repeatabilityColumns.value = columns_repeatability_frequency.value // 重复性表头 @@ -871,7 +897,29 @@ break } }, { immediate: true }) - +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'frequency': // 频率 + listRepeatabilityCheckData.value = frequencyListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_frequency.value + listStabilityCheckData.value = frequencyListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_frequency_check_data.value + break + case 'power': // 功率 + listRepeatabilityCheckData.value = powerListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_power.value + listStabilityCheckData.value = powerListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_power_check_data.value + break + case 'relative-level': // 相对电平 + listRepeatabilityCheckData.value = relativeLevelListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_relative_level.value + listStabilityCheckData.value = relativeLevelListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_relative_level_check_data.value + break + } +}) onMounted(async () => { belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置 itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue index b9aa890..13a8e52 100644 --- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue @@ -314,7 +314,7 @@ const listRepeatabilityCheckDate = ref([]) // 重复性数据-- 查询历史日期 const listStability = ref([]) // 稳定性数据 const listStabilityCheckDate = ref([]) // 稳定性数据-- 查询历史日期 - +const repeatabilityColumnsCheckData = ref() const voltageListRepeatability = ref([]) // 直流电压重复性 const voltageListRepeatabilityCheckDate = ref([]) // 直流电压重复性 -- 查询历史日期 const voltageListStability = ref([]) // 直流电压稳定性 @@ -973,8 +973,10 @@ fetchHistoryIndication(currentDate.value) // 获取稳定性 } else { // 详情制作表头 + // if (props.pageType === 'detail') { return } // columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, voltageListStability.value, 3) columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, effectListStability.value, 3) + console.log(columns_stability_voltage, 'columns_stability_voltagecolumns_stability_voltage') columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) // columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) columns_stability_ripple_voltage.value = handleDetailTableTableHead(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) @@ -1012,22 +1014,83 @@ const num = props.pageType === 'edit' ? 5 : 4 // 直流电压 voltageListStability.value = voltageListStability.value.map((item) => { - // clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3) + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage.value, num, 3) columns_stability_voltage.value = columnsData return item = itemData }) voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3) + // 电源效应和负载效应 + effectListStability.value = effectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage.value, num, 3) + columns_stability_voltage.value = columnsData + return item = itemData + }) + effectListStability.value = handleSaveDateParams(columns_stability_voltage.value, effectListStability.value, 3) + // 直流电流（直接测量） + electricityDirectListStability.value = electricityDirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityDirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) + + // 直流电流（间接测量） + electricityIndirectListStability.value = electricityIndirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityIndirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) + // 纹波电压 + rippleVoltageListStability.value = rippleVoltageListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage.value, num, 4) + columns_stability_ripple_voltage.value = columnsData + return item = itemData + }) + rippleVoltageListStability.value = handleSaveDateParams(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) } else { // 直流电压 voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => { clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage_check_date.value, 5, 3) columns_stability_voltage_check_date.value = columnsData return item = itemData }) - voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // 电源效应和负载效应 + effectListStabilityCheckDate.value = effectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage_check_date.value, 5, 3) + columns_stability_voltage_check_date.value = columnsData + return item = itemData + }) + // 直流电流（直接测量） + electricityDirectListStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 直流电流（间接测量） + electricityIndirectListStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 纹波电压 + rippleVoltageListStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage_check_date.value, 5, 4) + columns_stability_ripple_voltage_check_date.value = columnsData + return item = itemData + }) } }) } @@ -1119,11 +1182,11 @@ } // -------------------------------------钩子----------------------------------------------------- // 统计日期 -const dateCount = (columns: TableColumn[]) => { +const dateCount = (columns: TableColumn[], index: number) => { let dateNum = 0 // 稳定性表格有几个日期 // 统计有几个日期 - columns[5].children?.forEach((item) => { + columns[index].children?.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -1132,45 +1195,46 @@ } // 监听稳定性表格--判断稳定性考核是否合格 watch([() => voltageListStability.value, () => effectListStability.value, () => electricityDirectListStability.value, () => electricityIndirectListStability.value, () => rippleVoltageListStability.value], (newValue: any) => { - console.log('监听稳定性表格') - - if (newValue[0] && newValue[0].length && newValue[0][0]?.averageValue) { // 直流电压 + console.log(newValue[0], 'newValue[0]') + if (newValue[0] && newValue[0].length) { // 直流电压 const result = newValue[0].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['1-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' + console.log(form.value, 'form.value') } - if (newValue[1] && newValue[1].length && newValue[1][0]?.averageValue) { // 电源效应和负载效应 + if (newValue[1] && newValue[1].length) { // 电源效应和负载效应 const result = newValue[1].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['2-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[2] && newValue[2].length && newValue[2][0]?.averageValue) { // 直流电流(直接测量) + if (newValue[2] && newValue[2].length) { // 直流电流(直接测量) const result = newValue[2].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['3-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[3] && newValue[3].length && newValue[3][0]?.averageValue) { // 直流电流(间接测量) + if (newValue[3] && newValue[3].length) { // 直流电流(间接测量) const result = newValue[3].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['4-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[4] && newValue[4].length && newValue[4][0]?.averageValue) { // 纹波电压 + if (newValue[4] && newValue[4].length) { // 纹波电压 const result = newValue[4].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_ripple_voltage.value) + const dateNum = dateCount(columns_stability_ripple_voltage.value, 4) form.value['5-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } }, { deep: true, immediate: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'voltage': // 直流电压 repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头 @@ -1204,6 +1268,41 @@ break } }, { immediate: true }) +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'voltage': // 直流电压 + listRepeatabilityCheckDate.value = voltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = voltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'effect': // 电源效应和负载效应 + listRepeatabilityCheckDate.value = effectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = effectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'electricity-direct': // 直接电流（直接测量） + listRepeatabilityCheckDate.value = electricityDirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'electricity-indirect': // 直接电流（间接测量） + listRepeatabilityCheckDate.value = electricityIndirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_electricity_indirect.value + listStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'ripple-voltage': // 纹波电压 + listRepeatabilityCheckDate.value = rippleVoltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_ripple_voltage.value + listStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_ripple_voltage_check_date.value + break + } +}) watch(() => props.pageType, (newVal) => { voltageListRepeatability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) effectListRepeatability.value = effectListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) @@ -1253,7 +1352,7 @@ datetimerange.value, (newVal) => { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' - if (Array.isArray(newVal)) { - if (newVal.length) { - listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` - listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` - } - } -}) +// const datetimerange = ref() +// watch(() => datetimerange.value, (newVal) => { +// listQuery.value.createTimeStart = '' +// listQuery.value.createTimeEnd = '' +// if (Array.isArray(newVal)) { +// if (newVal.length) { +// listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` +// listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` +// } +// } +// }) // 列表数据 const tableList = ref([]) const total = ref(0) @@ -73,7 +73,7 @@ // 重置查询条件 const clearList = () => { - datetimerange.value = [] + // datetimerange.value = [] listQuery.value = { approvalStatus: active.value === '10' ? '' : active.value, fileCode: '', @@ -342,11 +342,27 @@ + + + + + + + + diff --git a/src/views/quality/internal/report/components/edit.vue b/src/views/quality/internal/report/components/edit.vue index 0f83423..ef235a3 100644 --- a/src/views/quality/internal/report/components/edit.vue +++ b/src/views/quality/internal/report/components/edit.vue @@ -132,7 +132,7 @@ const internalAuditRep = ref([]) const internalCheck = ref([]) watch( - [() => ruleForm.value.yearTime, () => ruleForm.value.yearNum], + [() => ruleForm.value.yearTime, () => ruleForm.value.yearNum, () => ruleForm.value.bizLabCode], (newVal, oldVal) => { if (newVal[0] && newVal[1]) { if (!$route.path.includes('create')) { @@ -154,7 +154,7 @@ // ruleForm.value.repDeptList = res.data.rows[0].deptId detailWork({ id: data[0].id }).then((res) => { ruleForm.value.repUserList = res.data.teamMembers.split(',') - ruleForm.value.groupLeaderId = userList.value.filter((item: any) => item.name === res.data.groupLeader)[0]?.id + ruleForm.value.groupLeaderId = userList1.value.filter((item: any) => item.name === res.data.groupLeader)[0]?.id }) } }) @@ -588,7 +588,7 @@ - + diff --git a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue index a133b1e..a3efb72 100644 --- a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue @@ -407,42 +407,52 @@ const handlerData = (type: string, params: string, paramsName: string, data: any) => { let result = [] if (type === '重复性') { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + averageValue: '', + standardDeviation: '', + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '重复性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - averageValue: '', - standardDeviation: '', + ...params, editable: true, })) } else { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + testValueOneDate: '', + testValueTwoDate: '', + testValueThreeDate: '', + testValueFourDate: '', + testValueFiveDate: '', + testValueSixDate: '', + averageValue: '', + stability: '', + lessThan: '', + urel: item.urel, + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '稳定性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - testValueOneDate: '', - testValueTwoDate: '', - testValueThreeDate: '', - testValueFourDate: '', - testValueFiveDate: '', - testValueSixDate: '', - averageValue: '', - stability: '', - lessThan: '', - urel: item.urel, + ...params, editable: true, })) } @@ -592,9 +602,9 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - console.log(responseList, 'responseList') + const dep = JSON.parse(JSON.stringify(responseList)) // 控制tab - const needShowTab = uniqueMultiArray(responseList, 'params').map((item: any) => item.params) + const needShowTab = uniqueMultiArray(dep, 'params').map((item: any) => item.params) radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params)) current.value = '' setTimeout(() => { @@ -608,17 +618,17 @@ })) } // 频率 重复性 - const frequencyListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) + const frequencyListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) // 频率 稳定性 - const frequencyListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) + const frequencyListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) // 功率 重复性 - const powerListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) + const powerListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) // 功率 稳定性 - const powerListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) + const powerListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) // 相对电平 重复性 - const relativeLevelListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) + const relativeLevelListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) // 相对电平 稳定性 - const relativeLevelListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) + const relativeLevelListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) return { frequencyListRepeatabilityList, frequencyListStabilityList, @@ -745,7 +755,7 @@ columns_stability_frequency_check_data.value = columnsData return item = itemData }) - frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) + // frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) // 功率 powerListStabilityCheckData.value = powerListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -753,7 +763,7 @@ columns_stability_power_check_data.value = columnsData return item = itemData }) - powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) + // powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) // 相对电平 relativeLevelListStabilityCheckData.value = relativeLevelListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -761,7 +771,7 @@ columns_stability_relative_level_check_data.value = columnsData return item = itemData }) - relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) + // relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) } }) } @@ -844,12 +854,28 @@ return true } // -------------------------------------钩子----------------------------------------------------- +// 统计日期 +const dateCount = (columns: TableColumn[], index: number) => { + let dateNum = 0 // 稳定性表格有几个日期 + + // 统计有几个日期 + columns[index].children?.forEach((item) => { + if (item.text !== '-' && item.text !== '') { + dateNum += 1 + } + }) + return dateNum +} watch(() => [frequencyListStability.value, powerListStability.value, relativeLevelListStability.value], (newVal) => { - form.value['1-flit'] = newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['2-flit'] = newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['3-flit'] = newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + const dateNum1 = dateCount(columns_stability_frequency.value, 2) + const dateNum2 = dateCount(columns_stability_power.value, 3) + const dateNum3 = dateCount(columns_stability_relative_level.value, 3) + form.value['1-flit'] = dateNum1 < 4 ? '合格' : newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['2-flit'] = dateNum2 < 4 ? '合格' : newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['3-flit'] = dateNum3 < 4 ? '合格' : newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' }, { deep: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'frequency': // 频率 repeatabilityColumns.value = columns_repeatability_frequency.value // 重复性表头 @@ -871,7 +897,29 @@ break } }, { immediate: true }) - +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'frequency': // 频率 + listRepeatabilityCheckData.value = frequencyListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_frequency.value + listStabilityCheckData.value = frequencyListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_frequency_check_data.value + break + case 'power': // 功率 + listRepeatabilityCheckData.value = powerListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_power.value + listStabilityCheckData.value = powerListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_power_check_data.value + break + case 'relative-level': // 相对电平 + listRepeatabilityCheckData.value = relativeLevelListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_relative_level.value + listStabilityCheckData.value = relativeLevelListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_relative_level_check_data.value + break + } +}) onMounted(async () => { belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置 itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue index b9aa890..13a8e52 100644 --- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue @@ -314,7 +314,7 @@ const listRepeatabilityCheckDate = ref([]) // 重复性数据-- 查询历史日期 const listStability = ref([]) // 稳定性数据 const listStabilityCheckDate = ref([]) // 稳定性数据-- 查询历史日期 - +const repeatabilityColumnsCheckData = ref() const voltageListRepeatability = ref([]) // 直流电压重复性 const voltageListRepeatabilityCheckDate = ref([]) // 直流电压重复性 -- 查询历史日期 const voltageListStability = ref([]) // 直流电压稳定性 @@ -973,8 +973,10 @@ fetchHistoryIndication(currentDate.value) // 获取稳定性 } else { // 详情制作表头 + // if (props.pageType === 'detail') { return } // columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, voltageListStability.value, 3) columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, effectListStability.value, 3) + console.log(columns_stability_voltage, 'columns_stability_voltagecolumns_stability_voltage') columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) // columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) columns_stability_ripple_voltage.value = handleDetailTableTableHead(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) @@ -1012,22 +1014,83 @@ const num = props.pageType === 'edit' ? 5 : 4 // 直流电压 voltageListStability.value = voltageListStability.value.map((item) => { - // clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3) + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage.value, num, 3) columns_stability_voltage.value = columnsData return item = itemData }) voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3) + // 电源效应和负载效应 + effectListStability.value = effectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage.value, num, 3) + columns_stability_voltage.value = columnsData + return item = itemData + }) + effectListStability.value = handleSaveDateParams(columns_stability_voltage.value, effectListStability.value, 3) + // 直流电流（直接测量） + electricityDirectListStability.value = electricityDirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityDirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) + + // 直流电流（间接测量） + electricityIndirectListStability.value = electricityIndirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityIndirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) + // 纹波电压 + rippleVoltageListStability.value = rippleVoltageListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage.value, num, 4) + columns_stability_ripple_voltage.value = columnsData + return item = itemData + }) + rippleVoltageListStability.value = handleSaveDateParams(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) } else { // 直流电压 voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => { clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage_check_date.value, 5, 3) columns_stability_voltage_check_date.value = columnsData return item = itemData }) - voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // 电源效应和负载效应 + effectListStabilityCheckDate.value = effectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage_check_date.value, 5, 3) + columns_stability_voltage_check_date.value = columnsData + return item = itemData + }) + // 直流电流（直接测量） + electricityDirectListStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 直流电流（间接测量） + electricityIndirectListStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 纹波电压 + rippleVoltageListStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage_check_date.value, 5, 4) + columns_stability_ripple_voltage_check_date.value = columnsData + return item = itemData + }) } }) } @@ -1119,11 +1182,11 @@ } // -------------------------------------钩子----------------------------------------------------- // 统计日期 -const dateCount = (columns: TableColumn[]) => { +const dateCount = (columns: TableColumn[], index: number) => { let dateNum = 0 // 稳定性表格有几个日期 // 统计有几个日期 - columns[5].children?.forEach((item) => { + columns[index].children?.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -1132,45 +1195,46 @@ } // 监听稳定性表格--判断稳定性考核是否合格 watch([() => voltageListStability.value, () => effectListStability.value, () => electricityDirectListStability.value, () => electricityIndirectListStability.value, () => rippleVoltageListStability.value], (newValue: any) => { - console.log('监听稳定性表格') - - if (newValue[0] && newValue[0].length && newValue[0][0]?.averageValue) { // 直流电压 + console.log(newValue[0], 'newValue[0]') + if (newValue[0] && newValue[0].length) { // 直流电压 const result = newValue[0].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['1-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' + console.log(form.value, 'form.value') } - if (newValue[1] && newValue[1].length && newValue[1][0]?.averageValue) { // 电源效应和负载效应 + if (newValue[1] && newValue[1].length) { // 电源效应和负载效应 const result = newValue[1].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['2-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[2] && newValue[2].length && newValue[2][0]?.averageValue) { // 直流电流(直接测量) + if (newValue[2] && newValue[2].length) { // 直流电流(直接测量) const result = newValue[2].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['3-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[3] && newValue[3].length && newValue[3][0]?.averageValue) { // 直流电流(间接测量) + if (newValue[3] && newValue[3].length) { // 直流电流(间接测量) const result = newValue[3].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['4-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[4] && newValue[4].length && newValue[4][0]?.averageValue) { // 纹波电压 + if (newValue[4] && newValue[4].length) { // 纹波电压 const result = newValue[4].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_ripple_voltage.value) + const dateNum = dateCount(columns_stability_ripple_voltage.value, 4) form.value['5-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } }, { deep: true, immediate: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'voltage': // 直流电压 repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头 @@ -1204,6 +1268,41 @@ break } }, { immediate: true }) +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'voltage': // 直流电压 + listRepeatabilityCheckDate.value = voltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = voltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'effect': // 电源效应和负载效应 + listRepeatabilityCheckDate.value = effectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = effectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'electricity-direct': // 直接电流（直接测量） + listRepeatabilityCheckDate.value = electricityDirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'electricity-indirect': // 直接电流（间接测量） + listRepeatabilityCheckDate.value = electricityIndirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_electricity_indirect.value + listStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'ripple-voltage': // 纹波电压 + listRepeatabilityCheckDate.value = rippleVoltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_ripple_voltage.value + listStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_ripple_voltage_check_date.value + break + } +}) watch(() => props.pageType, (newVal) => { voltageListRepeatability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) effectListRepeatability.value = effectListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) @@ -1253,7 +1352,7 @@ datetimerange.value, (newVal) => { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' - if (Array.isArray(newVal)) { - if (newVal.length) { - listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` - listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` - } - } -}) +// const datetimerange = ref() +// watch(() => datetimerange.value, (newVal) => { +// listQuery.value.createTimeStart = '' +// listQuery.value.createTimeEnd = '' +// if (Array.isArray(newVal)) { +// if (newVal.length) { +// listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` +// listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` +// } +// } +// }) // 列表数据 const tableList = ref([]) const total = ref(0) @@ -73,7 +73,7 @@ // 重置查询条件 const clearList = () => { - datetimerange.value = [] + // datetimerange.value = [] listQuery.value = { approvalStatus: active.value === '10' ? '' : active.value, fileCode: '', @@ -342,11 +342,27 @@ + + + + + + + + diff --git a/src/views/quality/internal/report/components/edit.vue b/src/views/quality/internal/report/components/edit.vue index 0f83423..ef235a3 100644 --- a/src/views/quality/internal/report/components/edit.vue +++ b/src/views/quality/internal/report/components/edit.vue @@ -132,7 +132,7 @@ const internalAuditRep = ref([]) const internalCheck = ref([]) watch( - [() => ruleForm.value.yearTime, () => ruleForm.value.yearNum], + [() => ruleForm.value.yearTime, () => ruleForm.value.yearNum, () => ruleForm.value.bizLabCode], (newVal, oldVal) => { if (newVal[0] && newVal[1]) { if (!$route.path.includes('create')) { @@ -154,7 +154,7 @@ // ruleForm.value.repDeptList = res.data.rows[0].deptId detailWork({ id: data[0].id }).then((res) => { ruleForm.value.repUserList = res.data.teamMembers.split(',') - ruleForm.value.groupLeaderId = userList.value.filter((item: any) => item.name === res.data.groupLeader)[0]?.id + ruleForm.value.groupLeaderId = userList1.value.filter((item: any) => item.name === res.data.groupLeader)[0]?.id }) } }) @@ -588,7 +588,7 @@ - + diff --git a/src/views/quality/internal/report/index.vue b/src/views/quality/internal/report/index.vue index f38030a..9e60f0e 100644 --- a/src/views/quality/internal/report/index.vue +++ b/src/views/quality/internal/report/index.vue @@ -24,17 +24,17 @@ limit: 20, }) // 开始结束时间 -const datetimerange = ref() -watch(() => datetimerange.value, (newVal) => { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' - if (Array.isArray(newVal)) { - if (newVal.length) { - listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` - listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` - } - } -}) +// const datetimerange = ref() +// watch(() => datetimerange.value, (newVal) => { +// listQuery.value.createTimeStart = '' +// listQuery.value.createTimeEnd = '' +// if (Array.isArray(newVal)) { +// if (newVal.length) { +// listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` +// listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` +// } +// } +// }) // 列表数据 const tableList = ref([]) const total = ref(0) @@ -69,7 +69,7 @@ // 重置查询条件 const clearList = () => { - datetimerange.value = [] + // datetimerange.value = [] listQuery.value = { approvalStatus: active.value === '10' ? '' : active.value, fileCode: '', @@ -290,11 +290,27 @@ + + + + + diff --git a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue index a133b1e..a3efb72 100644 --- a/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/ninth/checkDataCom.vue @@ -407,42 +407,52 @@ const handlerData = (type: string, params: string, paramsName: string, data: any) => { let result = [] if (type === '重复性') { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + averageValue: '', + standardDeviation: '', + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '重复性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - averageValue: '', - standardDeviation: '', + ...params, editable: true, })) } else { + const params = props.pageType === 'create' + ? {} + : { + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + testValueOneDate: '', + testValueTwoDate: '', + testValueThreeDate: '', + testValueFourDate: '', + testValueFiveDate: '', + testValueSixDate: '', + averageValue: '', + stability: '', + lessThan: '', + urel: item.urel, + } result = data.filter((item: any) => item.params === params).map((item: any) => ({ ...item, checkParam: paramsName, checkType: '稳定性', - testValueOne: '', - testValueTwo: '', - testValueThree: '', - testValueFour: '', - testValueFive: '', - testValueSix: '', - testValueOneDate: '', - testValueTwoDate: '', - testValueThreeDate: '', - testValueFourDate: '', - testValueFiveDate: '', - testValueSixDate: '', - averageValue: '', - stability: '', - lessThan: '', - urel: item.urel, + ...params, editable: true, })) } @@ -592,9 +602,9 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - console.log(responseList, 'responseList') + const dep = JSON.parse(JSON.stringify(responseList)) // 控制tab - const needShowTab = uniqueMultiArray(responseList, 'params').map((item: any) => item.params) + const needShowTab = uniqueMultiArray(dep, 'params').map((item: any) => item.params) radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params)) current.value = '' setTimeout(() => { @@ -608,17 +618,17 @@ })) } // 频率 重复性 - const frequencyListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) + const frequencyListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '重复性')) // 频率 稳定性 - const frequencyListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) + const frequencyListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '1' && item.checkType === '稳定性')) // 功率 重复性 - const powerListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) + const powerListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '重复性')) // 功率 稳定性 - const powerListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) + const powerListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '2' && item.checkType === '稳定性')) // 相对电平 重复性 - const relativeLevelListRepeatabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) + const relativeLevelListRepeatabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '重复性')) // 相对电平 稳定性 - const relativeLevelListStabilityList = handlerData(responseList.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) + const relativeLevelListStabilityList = handlerData(dep.filter((item: { params: string; checkType: string }) => item.params === '3' && item.checkType === '稳定性')) return { frequencyListRepeatabilityList, frequencyListStabilityList, @@ -745,7 +755,7 @@ columns_stability_frequency_check_data.value = columnsData return item = itemData }) - frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) + // frequencyListStabilityCheckData.value = handleSaveDateParams(columns_stability_frequency_check_data.value, frequencyListStabilityCheckData.value, 2) // 功率 powerListStabilityCheckData.value = powerListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -753,7 +763,7 @@ columns_stability_power_check_data.value = columnsData return item = itemData }) - powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) + // powerListStabilityCheckData.value = handleSaveDateParams(columns_stability_power_check_data.value, powerListStabilityCheckData.value, 3) // 相对电平 relativeLevelListStabilityCheckData.value = relativeLevelListStabilityCheckData.value.map((item) => { clearDateValue(item) @@ -761,7 +771,7 @@ columns_stability_relative_level_check_data.value = columnsData return item = itemData }) - relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) + // relativeLevelListStabilityCheckData.value = handleSaveDateParams(columns_stability_relative_level_check_data.value, relativeLevelListStabilityCheckData.value, 3) } }) } @@ -844,12 +854,28 @@ return true } // -------------------------------------钩子----------------------------------------------------- +// 统计日期 +const dateCount = (columns: TableColumn[], index: number) => { + let dateNum = 0 // 稳定性表格有几个日期 + + // 统计有几个日期 + columns[index].children?.forEach((item) => { + if (item.text !== '-' && item.text !== '') { + dateNum += 1 + } + }) + return dateNum +} watch(() => [frequencyListStability.value, powerListStability.value, relativeLevelListStability.value], (newVal) => { - form.value['1-flit'] = newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['2-flit'] = newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' - form.value['3-flit'] = newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + const dateNum1 = dateCount(columns_stability_frequency.value, 2) + const dateNum2 = dateCount(columns_stability_power.value, 3) + const dateNum3 = dateCount(columns_stability_relative_level.value, 3) + form.value['1-flit'] = dateNum1 < 4 ? '合格' : newVal[0]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['2-flit'] = dateNum2 < 4 ? '合格' : newVal[1]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' + form.value['3-flit'] = dateNum3 < 4 ? '合格' : newVal[2]?.every(item => item.lessThan === 1 || item.lessThan === '1') ? '合格' : '不合格' }, { deep: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'frequency': // 频率 repeatabilityColumns.value = columns_repeatability_frequency.value // 重复性表头 @@ -871,7 +897,29 @@ break } }, { immediate: true }) - +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'frequency': // 频率 + listRepeatabilityCheckData.value = frequencyListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_frequency.value + listStabilityCheckData.value = frequencyListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_frequency_check_data.value + break + case 'power': // 功率 + listRepeatabilityCheckData.value = powerListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_power.value + listStabilityCheckData.value = powerListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_power_check_data.value + break + case 'relative-level': // 相对电平 + listRepeatabilityCheckData.value = relativeLevelListRepeatabilityCheckData.value + repeatabilityColumnsCheckData.value = columns_repeatability_relative_level.value + listStabilityCheckData.value = relativeLevelListStabilityCheckData.value + stabilityColumnsCheckData.value = columns_stability_relative_level_check_data.value + break + } +}) onMounted(async () => { belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置 itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue index b9aa890..13a8e52 100644 --- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue @@ -314,7 +314,7 @@ const listRepeatabilityCheckDate = ref([]) // 重复性数据-- 查询历史日期 const listStability = ref([]) // 稳定性数据 const listStabilityCheckDate = ref([]) // 稳定性数据-- 查询历史日期 - +const repeatabilityColumnsCheckData = ref() const voltageListRepeatability = ref([]) // 直流电压重复性 const voltageListRepeatabilityCheckDate = ref([]) // 直流电压重复性 -- 查询历史日期 const voltageListStability = ref([]) // 直流电压稳定性 @@ -973,8 +973,10 @@ fetchHistoryIndication(currentDate.value) // 获取稳定性 } else { // 详情制作表头 + // if (props.pageType === 'detail') { return } // columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, voltageListStability.value, 3) columns_stability_voltage.value = handleDetailTableTableHead(columns_stability_voltage.value, effectListStability.value, 3) + console.log(columns_stability_voltage, 'columns_stability_voltagecolumns_stability_voltage') columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) // columns_stability_electricity_direct.value = handleDetailTableTableHead(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) columns_stability_ripple_voltage.value = handleDetailTableTableHead(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) @@ -1012,22 +1014,83 @@ const num = props.pageType === 'edit' ? 5 : 4 // 直流电压 voltageListStability.value = voltageListStability.value.map((item) => { - // clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3) + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage.value, num, 3) columns_stability_voltage.value = columnsData return item = itemData }) voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3) + // 电源效应和负载效应 + effectListStability.value = effectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage.value, num, 3) + columns_stability_voltage.value = columnsData + return item = itemData + }) + effectListStability.value = handleSaveDateParams(columns_stability_voltage.value, effectListStability.value, 3) + // 直流电流（直接测量） + electricityDirectListStability.value = electricityDirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityDirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityDirectListStability.value, 3) + + // 直流电流（间接测量） + electricityIndirectListStability.value = electricityIndirectListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct.value, num, 3) + columns_stability_electricity_direct.value = columnsData + return item = itemData + }) + electricityIndirectListStability.value = handleSaveDateParams(columns_stability_electricity_direct.value, electricityIndirectListStability.value, 3) + // 纹波电压 + rippleVoltageListStability.value = rippleVoltageListStability.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage.value, num, 4) + columns_stability_ripple_voltage.value = columnsData + return item = itemData + }) + rippleVoltageListStability.value = handleSaveDateParams(columns_stability_ripple_voltage.value, rippleVoltageListStability.value, 4) } else { // 直流电压 voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => { clearDateValue(item) - const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '1'), item, columns_stability_voltage_check_date.value, 5, 3) columns_stability_voltage_check_date.value = columnsData return item = itemData }) - voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3) + // 电源效应和负载效应 + effectListStabilityCheckDate.value = effectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '2'), item, columns_stability_voltage_check_date.value, 5, 3) + columns_stability_voltage_check_date.value = columnsData + return item = itemData + }) + // 直流电流（直接测量） + electricityDirectListStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '3'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 直流电流（间接测量） + electricityIndirectListStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '4'), item, columns_stability_electricity_direct_check_date.value, 5, 3) + columns_stability_electricity_direct_check_date.value = columnsData + return item = itemData + }) + // 纹波电压 + rippleVoltageListStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value.map((item) => { + clearDateValue(item) + const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: any) => item.params === '5'), item, columns_stability_ripple_voltage_check_date.value, 5, 4) + columns_stability_ripple_voltage_check_date.value = columnsData + return item = itemData + }) } }) } @@ -1119,11 +1182,11 @@ } // -------------------------------------钩子----------------------------------------------------- // 统计日期 -const dateCount = (columns: TableColumn[]) => { +const dateCount = (columns: TableColumn[], index: number) => { let dateNum = 0 // 稳定性表格有几个日期 // 统计有几个日期 - columns[5].children?.forEach((item) => { + columns[index].children?.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -1132,45 +1195,46 @@ } // 监听稳定性表格--判断稳定性考核是否合格 watch([() => voltageListStability.value, () => effectListStability.value, () => electricityDirectListStability.value, () => electricityIndirectListStability.value, () => rippleVoltageListStability.value], (newValue: any) => { - console.log('监听稳定性表格') - - if (newValue[0] && newValue[0].length && newValue[0][0]?.averageValue) { // 直流电压 + console.log(newValue[0], 'newValue[0]') + if (newValue[0] && newValue[0].length) { // 直流电压 const result = newValue[0].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['1-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' + console.log(form.value, 'form.value') } - if (newValue[1] && newValue[1].length && newValue[1][0]?.averageValue) { // 电源效应和负载效应 + if (newValue[1] && newValue[1].length) { // 电源效应和负载效应 const result = newValue[1].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_voltage.value) + const dateNum = dateCount(columns_stability_voltage.value, 3) form.value['2-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[2] && newValue[2].length && newValue[2][0]?.averageValue) { // 直流电流(直接测量) + if (newValue[2] && newValue[2].length) { // 直流电流(直接测量) const result = newValue[2].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['3-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[3] && newValue[3].length && newValue[3][0]?.averageValue) { // 直流电流(间接测量) + if (newValue[3] && newValue[3].length) { // 直流电流(间接测量) const result = newValue[3].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_electricity_direct.value) + const dateNum = dateCount(columns_stability_electricity_direct.value, 3) form.value['4-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } - if (newValue[4] && newValue[4].length && newValue[4][0]?.averageValue) { // 纹波电压 + if (newValue[4] && newValue[4].length) { // 纹波电压 const result = newValue[4].every((item: { lessThan: string }) => { return item.lessThan === '是' }) - const dateNum = dateCount(columns_stability_ripple_voltage.value) + const dateNum = dateCount(columns_stability_ripple_voltage.value, 4) form.value['5-flit'] = dateNum < 4 ? '合格' : result ? '合格' : '不合格' } }, { deep: true, immediate: true }) watch(() => current.value, (newValue) => { + if (currentDate.value.includes('-')) { return } switch (newValue) { case 'voltage': // 直流电压 repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头 @@ -1204,6 +1268,41 @@ break } }, { immediate: true }) +watch(() => [currentDate.value, current.value], (newValue) => { + if (newValue[0] === '核查数据') { return } + switch (newValue[1]) { + case 'voltage': // 直流电压 + listRepeatabilityCheckDate.value = voltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = voltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'effect': // 电源效应和负载效应 + listRepeatabilityCheckDate.value = effectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = effectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value + break + case 'electricity-direct': // 直接电流（直接测量） + listRepeatabilityCheckDate.value = electricityDirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_voltage.value + listStabilityCheckDate.value = electricityDirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'electricity-indirect': // 直接电流（间接测量） + listRepeatabilityCheckDate.value = electricityIndirectListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_electricity_indirect.value + listStabilityCheckDate.value = electricityIndirectListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_electricity_direct_check_date.value + break + case 'ripple-voltage': // 纹波电压 + listRepeatabilityCheckDate.value = rippleVoltageListRepeatabilityCheckDate.value + repeatabilityColumnsCheckData.value = columns_repeatability_ripple_voltage.value + listStabilityCheckDate.value = rippleVoltageListStabilityCheckDate.value + stabilityColumnsCheckData.value = columns_stability_ripple_voltage_check_date.value + break + } +}) watch(() => props.pageType, (newVal) => { voltageListRepeatability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) effectListRepeatability.value = effectListRepeatability.value.map((item: any) => ({ ...item, editable: props.pageType !== 'detail' })) @@ -1253,7 +1352,7 @@ datetimerange.value, (newVal) => { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' - if (Array.isArray(newVal)) { - if (newVal.length) { - listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` - listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` - } - } -}) +// const datetimerange = ref() +// watch(() => datetimerange.value, (newVal) => { +// listQuery.value.createTimeStart = '' +// listQuery.value.createTimeEnd = '' +// if (Array.isArray(newVal)) { +// if (newVal.length) { +// listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` +// listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` +// } +// } +// }) // 列表数据 const tableList = ref([]) const total = ref(0) @@ -73,7 +73,7 @@ // 重置查询条件 const clearList = () => { - datetimerange.value = [] + // datetimerange.value = [] listQuery.value = { approvalStatus: active.value === '10' ? '' : active.value, fileCode: '', @@ -342,11 +342,27 @@ + + + + + + + + diff --git a/src/views/quality/internal/report/components/edit.vue b/src/views/quality/internal/report/components/edit.vue index 0f83423..ef235a3 100644 --- a/src/views/quality/internal/report/components/edit.vue +++ b/src/views/quality/internal/report/components/edit.vue @@ -132,7 +132,7 @@ const internalAuditRep = ref([]) const internalCheck = ref([]) watch( - [() => ruleForm.value.yearTime, () => ruleForm.value.yearNum], + [() => ruleForm.value.yearTime, () => ruleForm.value.yearNum, () => ruleForm.value.bizLabCode], (newVal, oldVal) => { if (newVal[0] && newVal[1]) { if (!$route.path.includes('create')) { @@ -154,7 +154,7 @@ // ruleForm.value.repDeptList = res.data.rows[0].deptId detailWork({ id: data[0].id }).then((res) => { ruleForm.value.repUserList = res.data.teamMembers.split(',') - ruleForm.value.groupLeaderId = userList.value.filter((item: any) => item.name === res.data.groupLeader)[0]?.id + ruleForm.value.groupLeaderId = userList1.value.filter((item: any) => item.name === res.data.groupLeader)[0]?.id }) } }) @@ -588,7 +588,7 @@ - + diff --git a/src/views/quality/internal/report/index.vue b/src/views/quality/internal/report/index.vue index f38030a..9e60f0e 100644 --- a/src/views/quality/internal/report/index.vue +++ b/src/views/quality/internal/report/index.vue @@ -24,17 +24,17 @@ limit: 20, }) // 开始结束时间 -const datetimerange = ref() -watch(() => datetimerange.value, (newVal) => { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' - if (Array.isArray(newVal)) { - if (newVal.length) { - listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` - listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` - } - } -}) +// const datetimerange = ref() +// watch(() => datetimerange.value, (newVal) => { +// listQuery.value.createTimeStart = '' +// listQuery.value.createTimeEnd = '' +// if (Array.isArray(newVal)) { +// if (newVal.length) { +// listQuery.value.createTimeStart = `${newVal[0]} 00:00:00` +// listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59` +// } +// } +// }) // 列表数据 const tableList = ref([]) const total = ref(0) @@ -69,7 +69,7 @@ // 重置查询条件 const clearList = () => { - datetimerange.value = [] + // datetimerange.value = [] listQuery.value = { approvalStatus: active.value === '10' ? '' : active.value, fileCode: '', @@ -290,11 +290,27 @@ + + + + + diff --git a/src/views/quality/review/work/components/detail.vue b/src/views/quality/review/work/components/detail.vue index 0363ae1..b90096a 100644 --- a/src/views/quality/review/work/components/detail.vue +++ b/src/views/quality/review/work/components/detail.vue @@ -28,10 +28,12 @@ }) // 表单 const rules = ref({ }) // 表单验证规则 +const isShowHandler = ref(true) onMounted(() => { detailReviewWork({ id: $route.query.id }).then((res) => { console.log(res.data, '详情') ruleForm.value = res.data + isShowHandler.value = new Date(dayjs(ruleForm.value.endTime).format()).getTime() - new Date().getTime() > 0 }) }) // const currentStageList = ref<{ id: string; value: string; name: string }[]>()// 归档状态+ @@ -178,7 +180,7 @@ - +