From ef44ab25aefef97d134714bdcfa0ad34ca566b4f Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 16 Jul 2026 08:44:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E5=9B=9E?= =?UTF-8?q?=E6=98=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCheckSingleChannelSingleTestPopup.vue | 4 ++-- frontend/src/views/home/components/testPopup.vue | 2 +- .../plan/planList/components/planStatisticsPopup.vue | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index 9517877..8226f3e 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -396,7 +396,7 @@ const updateTableData = async () => { for (let key of keys1) { let children = [] let label = key - if ((key.includes('谐波') || key.includes('简谐波')) && key !== '谐波有功功率') { + if ((key.includes('谐波') || key.includes('简谐波')) && key.includes('谐波有功功率')) { for (let item of data.resultData[key]) { let num = formatHarmNum(item.harmNum + '') label = @@ -433,7 +433,7 @@ const updateTableData = async () => { let keys2 = Object.keys(data.rawData) let rawData = new Map() for (let key of keys2) { - if ((key.includes('谐波') || key.includes('简谐波')) && key !== '谐波有功功率') { + if ((key.includes('谐波') || key.includes('简谐波')) && key.includes('谐波有功功率')) { for (let item of data.rawData[key]) { let num = formatHarmNum(item.harmNum + '') let value = rawData.get(key + '_' + num) diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue index 9f14bcc..134f0d2 100644 --- a/frontend/src/views/home/components/testPopup.vue +++ b/frontend/src/views/home/components/testPopup.vue @@ -164,7 +164,7 @@ - 退出检测 + 退出检测 diff --git a/frontend/src/views/plan/planList/components/planStatisticsPopup.vue b/frontend/src/views/plan/planList/components/planStatisticsPopup.vue index 60728b8..4ba38c8 100644 --- a/frontend/src/views/plan/planList/components/planStatisticsPopup.vue +++ b/frontend/src/views/plan/planList/components/planStatisticsPopup.vue @@ -279,8 +279,8 @@ const renderRateChart = () => { { name: '合格率', type: 'pie', - radius: ['42%', '68%'], - center: ['50%', '43%'], + radius: ['38%', '62%'], + center: ['50%', '46%'], avoidLabelOverlap: true, data: rateData, label: { @@ -357,6 +357,8 @@ defineExpose({ open }) :deep(.plan-statistics-dialog .el-dialog__body) { padding: 14px; + max-height: calc(92vh - 96px); + overflow-y: auto; } .plan-statistics { @@ -454,7 +456,7 @@ defineExpose({ open }) .chart { width: 100%; - height: 250px; + height: 340px; } .empty-area { @@ -480,7 +482,7 @@ defineExpose({ open }) } .chart { - height: 260px; + height: 320px; } }