From 87c46e84775496dca25cc03f579c87c272f54055 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 7 Jan 2025 20:24:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCheckSingleChannelSingleTestPopup.vue | 63 ++++++++++--------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index d7289fd..b55540c 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -292,7 +292,7 @@ const updateTableData = async () => { } let resCheckResult: CheckData.ResCheckResult = {} - let resRawData: CheckData.RawDataItem = {} + let resRawData: CheckData.RawDataItem[] = [] if (keys1.length === 1) { resCheckResult = resTableData.resultData.get(keys1[0]) @@ -300,40 +300,41 @@ const updateTableData = async () => { Object.assign(harmNumList, []) currentHarmNum.value = '-1' + resRawData = (resRawData == null || resRawData == undefined ? [] : resRawData) + resCheckResult = (resCheckResult == null || resCheckResult == undefined ? {} : resCheckResult) setCheckResultData(resCheckResult) setRawData(resRawData) - } else { - if (resTableData.resultData.get('电压幅值') || resTableData.resultData.get('持续时间')) { - let tempCheckList = [] - if (resTableData.resultData.get('电压幅值')) { - tempCheckList.push({value: 'Voltage', label: '电压幅值'}) - //resCheckResult = resTableData.resultData.get('电压幅值') - } - if (resTableData.resultData.get('持续时间')) { - tempCheckList.push({value: 'Duration', label: '持续时间'}) - //resCheckResult = resTableData.resultData.get('持续时间') - } - - Object.assign(checkList, tempCheckList) - currentCheckItem.value = checkList[0].value - - Object.assign(harmNumList, []) - currentHarmNum.value = '-1' - - //setCheckResultData(resCheckResult) - } else if (keys1.length != 0) { - let tempHarmNumList: { value: string, label: string }[] = [] - for (let [key, value] of resTableData.resultData) { - tempHarmNumList.push({value: key, label: key}) - } - - Object.assign(harmNumList, tempHarmNumList) - currentHarmNum.value = harmNumList.length > 0 ? harmNumList[0].value : '-1' + } else if (resTableData.resultData.get('电压幅值') || resTableData.resultData.get('持续时间')) { + let tempCheckList = [] + if (resTableData.resultData.get('电压幅值')) { + tempCheckList.push({value: 'Voltage', label: '电压幅值'}) + //resCheckResult = resTableData.resultData.get('电压幅值') + } + if (resTableData.resultData.get('持续时间')) { + tempCheckList.push({value: 'Duration', label: '持续时间'}) + //resCheckResult = resTableData.resultData.get('持续时间') } - } - // setCheckResultData(resCheckResult) - } else { + Object.assign(checkList, tempCheckList) + currentCheckItem.value = checkList[0].value + + Object.assign(harmNumList, []) + currentHarmNum.value = '-1' + + //setCheckResultData(resCheckResult) + } else if (keys1.length != 0) { + let tempHarmNumList: { value: string, label: string }[] = [] + for (let [key, value] of resTableData.resultData) { + tempHarmNumList.push({value: key, label: key}) + } + + Object.assign(harmNumList, tempHarmNumList) + currentHarmNum.value = harmNumList.length > 0 ? harmNumList[0].value : '-1' + } + } + + // setCheckResultData(resCheckResult) + else { checkResultData.length = 0 rawTableData.length = 0 }