diff --git a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue index 30c28cf..4ae00fc 100644 --- a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue @@ -252,40 +252,40 @@ valueEquipmentName: e.valueEquipmentName, // 设备名称 // 第一次 - aOneValueOne: 0, // a - bOneValueOne: 0, // b - aTwoValueOne: 0, - bTwoValueOne: 0, + aOneValueOne: undefined, // a + bOneValueOne: undefined, // b + aTwoValueOne: undefined, + bTwoValueOne: undefined, // 第二次 - aOneValueTwo: 0, - aTwoValueTwo: 0, - bOneValueTwo: 0, - bTwoValueTwo: 0, + aOneValueTwo: undefined, + aTwoValueTwo: undefined, + bOneValueTwo: undefined, + bTwoValueTwo: undefined, // 第三次 - aOneValueThree: 0, - aTwoValueThree: 0, - bOneValueThree: 0, - bTwoValueThree: 0, + aOneValueThree: undefined, + aTwoValueThree: undefined, + bOneValueThree: undefined, + bTwoValueThree: undefined, // 第四次 - aOneValueFour: 0, - bOneValueFour: 0, - bTwoValueFour: 0, - aTwoValueFour: 0, + aOneValueFour: undefined, + bOneValueFour: undefined, + bTwoValueFour: undefined, + aTwoValueFour: undefined, // 第五次 - aOneValueFive: 0, - aTwoValueFive: 0, - bTwoValueFive: 0, - bOneValueFive: 0, + aOneValueFive: undefined, + aTwoValueFive: undefined, + bTwoValueFive: undefined, + bOneValueFive: undefined, // 第6次 - aOneValueSix: 0, - aTwoValueSix: 0, - bOneValueSix: 0, - bTwoValueSix: 0, + aOneValueSix: undefined, + aTwoValueSix: undefined, + bOneValueSix: undefined, + bTwoValueSix: undefined, averageValueOne: '', // 第1次平均值（重复性）/测量数据1（稳定性） averageValueTwo: '', // 第2次平均值（重复性）/测量数据2（稳定性） diff --git a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue index 30c28cf..4ae00fc 100644 --- a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue @@ -252,40 +252,40 @@ valueEquipmentName: e.valueEquipmentName, // 设备名称 // 第一次 - aOneValueOne: 0, // a - bOneValueOne: 0, // b - aTwoValueOne: 0, - bTwoValueOne: 0, + aOneValueOne: undefined, // a + bOneValueOne: undefined, // b + aTwoValueOne: undefined, + bTwoValueOne: undefined, // 第二次 - aOneValueTwo: 0, - aTwoValueTwo: 0, - bOneValueTwo: 0, - bTwoValueTwo: 0, + aOneValueTwo: undefined, + aTwoValueTwo: undefined, + bOneValueTwo: undefined, + bTwoValueTwo: undefined, // 第三次 - aOneValueThree: 0, - aTwoValueThree: 0, - bOneValueThree: 0, - bTwoValueThree: 0, + aOneValueThree: undefined, + aTwoValueThree: undefined, + bOneValueThree: undefined, + bTwoValueThree: undefined, // 第四次 - aOneValueFour: 0, - bOneValueFour: 0, - bTwoValueFour: 0, - aTwoValueFour: 0, + aOneValueFour: undefined, + bOneValueFour: undefined, + bTwoValueFour: undefined, + aTwoValueFour: undefined, // 第五次 - aOneValueFive: 0, - aTwoValueFive: 0, - bTwoValueFive: 0, - bOneValueFive: 0, + aOneValueFive: undefined, + aTwoValueFive: undefined, + bTwoValueFive: undefined, + bOneValueFive: undefined, // 第6次 - aOneValueSix: 0, - aTwoValueSix: 0, - bOneValueSix: 0, - bTwoValueSix: 0, + aOneValueSix: undefined, + aTwoValueSix: undefined, + bOneValueSix: undefined, + bTwoValueSix: undefined, averageValueOne: '', // 第1次平均值（重复性）/测量数据1（稳定性） averageValueTwo: '', // 第2次平均值（重复性）/测量数据2（稳定性） diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index c6afb63..5f974b3 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -481,7 +481,7 @@ } }) - if (props.pageType === 'edit') { + if (props.pageType === 'edit' || props.pageType === 'detail') { fetchHistoryIndication() // 重新拉取稳定性日期 } loading.close() @@ -510,7 +510,7 @@ } getHistoryIndication(params).then((res) => { if (date === '') { // 正常核查数据 - const num = props.pageType === 'edit' ? 5 : 4 + const num = (props.pageType === 'edit' || props.pageType === 'detail') ? 5 : 4 listStability.value = listStability.value.map((item) => { const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability.value, num, 2, '15') columns_stability.value = columnsData @@ -519,6 +519,7 @@ listStability.value = handleSaveDateParams(columns_stability.value, listStability.value, 2) } else { + initColumnsCheckDate() const num = 5 listStabilityCheckDate.value = listStabilityCheckDate.value.map((item) => { clearDateValue(item) @@ -596,6 +597,21 @@ columns_stability.value[2].children![5].text = props.checkDate! // 最后一列的表头日期 } +/** + * 初始化CheckDate表头 + */ +function initColumnsCheckDate() { + const tempColumn = [ + { width: '180', text: '-', value: 'kuValueOne', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueTwo', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueThree', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueFour', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueFive', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueSix', align: 'center', required: false, type: 'text', customHeader: true }, + ] as any + columns_stability_checkDate.value[2].children = [...tempColumn] +} + // 监听核查日期变化 watch(() => props.checkDate, (newValue) => { initColumns() diff --git a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue index 30c28cf..4ae00fc 100644 --- a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue @@ -252,40 +252,40 @@ valueEquipmentName: e.valueEquipmentName, // 设备名称 // 第一次 - aOneValueOne: 0, // a - bOneValueOne: 0, // b - aTwoValueOne: 0, - bTwoValueOne: 0, + aOneValueOne: undefined, // a + bOneValueOne: undefined, // b + aTwoValueOne: undefined, + bTwoValueOne: undefined, // 第二次 - aOneValueTwo: 0, - aTwoValueTwo: 0, - bOneValueTwo: 0, - bTwoValueTwo: 0, + aOneValueTwo: undefined, + aTwoValueTwo: undefined, + bOneValueTwo: undefined, + bTwoValueTwo: undefined, // 第三次 - aOneValueThree: 0, - aTwoValueThree: 0, - bOneValueThree: 0, - bTwoValueThree: 0, + aOneValueThree: undefined, + aTwoValueThree: undefined, + bOneValueThree: undefined, + bTwoValueThree: undefined, // 第四次 - aOneValueFour: 0, - bOneValueFour: 0, - bTwoValueFour: 0, - aTwoValueFour: 0, + aOneValueFour: undefined, + bOneValueFour: undefined, + bTwoValueFour: undefined, + aTwoValueFour: undefined, // 第五次 - aOneValueFive: 0, - aTwoValueFive: 0, - bTwoValueFive: 0, - bOneValueFive: 0, + aOneValueFive: undefined, + aTwoValueFive: undefined, + bTwoValueFive: undefined, + bOneValueFive: undefined, // 第6次 - aOneValueSix: 0, - aTwoValueSix: 0, - bOneValueSix: 0, - bTwoValueSix: 0, + aOneValueSix: undefined, + aTwoValueSix: undefined, + bOneValueSix: undefined, + bTwoValueSix: undefined, averageValueOne: '', // 第1次平均值（重复性）/测量数据1（稳定性） averageValueTwo: '', // 第2次平均值（重复性）/测量数据2（稳定性） diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index c6afb63..5f974b3 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -481,7 +481,7 @@ } }) - if (props.pageType === 'edit') { + if (props.pageType === 'edit' || props.pageType === 'detail') { fetchHistoryIndication() // 重新拉取稳定性日期 } loading.close() @@ -510,7 +510,7 @@ } getHistoryIndication(params).then((res) => { if (date === '') { // 正常核查数据 - const num = props.pageType === 'edit' ? 5 : 4 + const num = (props.pageType === 'edit' || props.pageType === 'detail') ? 5 : 4 listStability.value = listStability.value.map((item) => { const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability.value, num, 2, '15') columns_stability.value = columnsData @@ -519,6 +519,7 @@ listStability.value = handleSaveDateParams(columns_stability.value, listStability.value, 2) } else { + initColumnsCheckDate() const num = 5 listStabilityCheckDate.value = listStabilityCheckDate.value.map((item) => { clearDateValue(item) @@ -596,6 +597,21 @@ columns_stability.value[2].children![5].text = props.checkDate! // 最后一列的表头日期 } +/** + * 初始化CheckDate表头 + */ +function initColumnsCheckDate() { + const tempColumn = [ + { width: '180', text: '-', value: 'kuValueOne', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueTwo', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueThree', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueFour', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueFive', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'kuValueSix', align: 'center', required: false, type: 'text', customHeader: true }, + ] as any + columns_stability_checkDate.value[2].children = [...tempColumn] +} + // 监听核查日期变化 watch(() => props.checkDate, (newValue) => { initColumns() diff --git a/src/views/equipement/standard/checkData/components/fifth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifth/checkDataCom.vue index 29d0125..4d9df7e 100644 --- a/src/views/equipement/standard/checkData/components/fifth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifth/checkDataCom.vue @@ -741,7 +741,7 @@ columns_stability_RTP.value = handleDetailTableTableHead(columns_stability_RTP.value, RTPListStability.value, 3) } }) - if (props.pageType === 'edit') { + if (props.pageType === 'edit' || props.pageType === 'detail') { fetchHistoryIndication() // 重新拉取稳定性日期 } // 绝缘电阻表校准 @@ -785,7 +785,7 @@ stabilityTableLoading.value = true getHistoryIndication(params).then((res) => { if (date === '') { // 正常核查数据 - const num = props.pageType === 'edit' ? 5 : 4 + const num = (props.pageType === 'edit' || props.pageType === 'detail') ? 5 : 4 // 温度值 temperatureListStability.value = temperatureListStability.value.map((item) => { // clearDateValue(item) @@ -804,6 +804,7 @@ RTPListStability.value = handleSaveDateParams(columns_stability_RTP.value, RTPListStability.value, 3) } else { + initColumnsCheckDate() // 温度值 temperatureListStabilityCheckDate.value = temperatureListStabilityCheckDate.value.map((item) => { clearDateValue(item) @@ -1004,6 +1005,28 @@ columns_stability_RTP.value[indexWorst].children![5].text = props.checkDate! // 最后一列的表头日期 } } + +/** + * 初始化CheckDate表头 + */ +function initColumnsCheckDate() { + columns_stability_temperature_checkDate.value[3].children = [ + { width: '180', text: '-', value: 'differentValueOne', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'differentValueTwo', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'differentValueThree', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'differentValueFour', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'differentValueFive', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'differentValueSix', align: 'center', required: false, type: 'text', customHeader: true }, + ] + columns_stability_RTP_checkDate.value[3].children = [ + { width: '180', text: '-', value: 'testValueOne', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'testValueTwo', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'testValueThree', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'testValueFour', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'testValueFive', align: 'center', required: false, type: 'text', customHeader: true }, + { width: '180', text: '-', value: 'testValueSix', align: 'center', required: false, type: 'text', customHeader: true }, + ] +} // 监听核查日期变化 watch(() => props.checkDate, (newValue) => { initColumns()