From fcd8c1a0dd2f0ee72f523bf2e7c4adc68fd10e3f Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 14 Jan 2025 16:16:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=B7=A6=E4=BE=A7=E5=88=87?= =?UTF-8?q?=E6=8D=A2=EF=BC=8C=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=9B=AE=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCheckSingleChannelSingleTestPopup.vue | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index 8990b6e..28c7d29 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -237,16 +237,7 @@ watch(() => formContent.chnNum, async (newVal, oldVal) => { watch(currentCheckItem, (newVal, oldVal) => { // console.log("当前检测项", newVal); if (newVal) { - // let key = newVal.toString() === 'Voltage' ? '电压幅值' : '持续时间' - let resCheckResult: CheckData.ResCheckResult = resTableData.resultData.get(newVal) - setCheckResultData(resCheckResult) - - let tempRawData = resTableData.rawData.get(newVal) - if (tempRawData) { - setRawData(tempRawData) - } else { - setRawData([]) - } + doCurrentCheckItemUpdate(newVal) } activeTab.value = 'resultTab' }) @@ -371,10 +362,12 @@ const updateTableData = async () => { }) } - Object.assign(checkList, tempCheckList) - - currentCheckItem.value = checkList[0].value + if (currentCheckItem.value == tempCheckList[0].value) { + doCurrentCheckItemUpdate(tempCheckList[0].value) + } else { + currentCheckItem.value = tempCheckList[0].value + } } } @@ -385,6 +378,20 @@ const updateTableData = async () => { } } +const doCurrentCheckItemUpdate = (newVal: string)=>{ + let resCheckResult: CheckData.ResCheckResult = resTableData.resultData.get(newVal) + setCheckResultData(resCheckResult) + + let tempRawData = resTableData.rawData.get(newVal) + if (tempRawData) { + setRawData(tempRawData) + } else { + setRawData([]) + } + + activeTab.value = 'resultTab' +} + const open = async (_deviceId: string, chnNum: string, _scriptType: string | null) => { deviceId = _deviceId scriptType = _scriptType