From 171533cef0aa227139ec43ec9af593b6f6488b2c Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 14 Jan 2025 10:36:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCheckSingleChannelSingleTestPopup.vue | 2 +- frontend/src/views/home/components/test.vue | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index 0f4b154..89429e2 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -206,8 +206,8 @@ watch(() => formContent.chnNum, async (newVal, oldVal) => { scriptType, code: parseInt(checkStore.planCode) }) - updateTreeFly(resTreeDataTemp, 2) updateTreeFly(resTreeDataTemp, 4) + updateTreeFly(resTreeDataTemp, 2) Object.assign(treeDataAll, resTreeDataTemp) diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 6b7d3bb..94f30f4 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -247,12 +247,12 @@ const checkResultView: ComputedRef = computed(() } } else { let tempChnResult: CheckData.ChnCheckResultEnum = device.chnResult[0] - if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.FAIL)) { - tempChnResult = CheckData.ChnCheckResultEnum.FAIL - } if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.ERRORDATA)) { tempChnResult = CheckData.ChnCheckResultEnum.ERRORDATA } + if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.FAIL)) { + tempChnResult = CheckData.ChnCheckResultEnum.FAIL + } if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.TIMEOUT)) { tempChnResult = CheckData.ChnCheckResultEnum.TIMEOUT } @@ -832,6 +832,9 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes tempChnResult.push(...devices[i].chnResult) } + if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) { + type = CheckData.ChnCheckResultEnum.ERRORDATA + } if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) { type = CheckData.ChnCheckResultEnum.FAIL } @@ -846,9 +849,6 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes } } } - if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) { - type = CheckData.ChnCheckResultEnum.ERRORDATA - } errorCheckItem.push({scriptType, type: type}) }