From 4622eb36d9d742109fdd2f81ea164c1a0aa3707f Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 22 May 2025 08:45:55 +0800
Subject: [PATCH] =?UTF-8?q?ABC=E4=B8=89=E9=A1=B9=E5=8F=AF=E4=BB=A5?=
=?UTF-8?q?=E5=88=86=E5=BC=80=E5=8D=95=E7=8B=AC=E5=B1=95=E7=A4=BA=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E7=9B=B8=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../home/components/dataCheckRawDataTable.vue | 26 +--
.../home/components/dataCheckResultTable.vue | 163 +++++++++---------
.../dataCheckSingleChannelSingleTestPopup.vue | 5 +
3 files changed, 100 insertions(+), 94 deletions(-)
diff --git a/frontend/src/views/home/components/dataCheckRawDataTable.vue b/frontend/src/views/home/components/dataCheckRawDataTable.vue
index fb326f0..25ef318 100644
--- a/frontend/src/views/home/components/dataCheckRawDataTable.vue
+++ b/frontend/src/views/home/components/dataCheckRawDataTable.vue
@@ -6,17 +6,11 @@
style="width: 100%;">
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -37,6 +31,16 @@ const unit = computed(() => {
return tableData.length > 0 ? tableData[0].unit : '';
})
+const phaseA = computed(() => {
+ return tableData[0].dataA == '/' ? 0 : 1
+})
+const phaseB = computed(() => {
+ return tableData[0].dataB == '/' ? 0 : 1
+})
+const phaseC = computed(() => {
+ return tableData[0].dataC == '/' ? 0 : 1
+})
+
const phaseT = computed(() => {
return tableData[0].dataT == '/' ? 0 : 1
})
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index a84ab61..95bba6d 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -8,92 +8,79 @@
-
-
-
-
-
-
-
-
- 误差范围：{{ scope.row.maxErrorA }}
- 误差值：{{ scope.row.errorA }} {{ scope.row.errorA !== '/' ? innerUnitA : '' }}
-
- 符合
- 不符合
- /
- -
-
-
-
+
+
+
+
+
+
+
+ 误差范围：{{ scope.row.maxErrorA }}
+ 误差值：{{ scope.row.errorA }} {{ scope.row.errorA !== '/' ? innerUnitA : '' }}
+
+ 符合
+ 不符合
+ /
+ -
+
+
-
-
-
-
-
-
-
- 误差范围：{{ scope.row.maxErrorB }}
- 误差值：{{ scope.row.errorB }} {{ scope.row.errorB !== '/' ? innerUnitB : '' }}
-
- 符合
- 不符合
- /
- -
-
-
-
+
+
+
+
+
+
+
+
+ 误差范围：{{ scope.row.maxErrorB }}
+ 误差值：{{ scope.row.errorB }} {{ scope.row.errorB !== '/' ? innerUnitB : '' }}
+
+ 符合
+ 不符合
+ /
+ -
+
+
-
-
-
-
-
-
-
- 误差范围： {{ scope.row.maxErrorC }}
- 误差值：{{ scope.row.errorC }} {{ scope.row.errorC !== '/' ? innerUnitC : '' }}
-
- 符合
- 不符合
- /
- -
-
-
-
+
+
+
+
+
+
+
+
+ 误差范围： {{ scope.row.maxErrorC }}
+ 误差值：{{ scope.row.errorC }} {{ scope.row.errorC !== '/' ? innerUnitC : '' }}
+
+ 符合
+ 不符合
+ /
+ -
+
+
-
+
-
-
-
-
-
-
-
-
- 误差范围： {{ scope.row.maxErrorT }}
- 误差值：{{ scope.row.errorT }} {{ scope.row.errorT !== '/' ? innerUnitT : '' }}
-
- 符合
- 不符合
- /
- -
-
-
-
+
+
+
+
+
+
+
+ 误差范围： {{ scope.row.maxErrorT }}
+ 误差值：{{ scope.row.errorT }} {{ scope.row.errorT !== '/' ? innerUnitT : '' }}
+
+ 符合
+ 不符合
+ /
+ -
+
+
-
-
-
-
-
-
-
-
-
-
+
@@ -126,12 +113,22 @@ const innerUnitT = computed(() => {
return tableData.length > 0 ? tableData[0].unitT : '';
})
+const phaseA = computed(() => {
+ return tableData.length <= 0 || tableData[0].dataA == null || tableData[0].dataA == "/" ? 0 : 1
+})
+const phaseB = computed(() => {
+ return tableData.length <= 0 || tableData[0].dataB == null || tableData[0].dataB == "/" ? 0 : 1
+})
+const phaseC = computed(() => {
+ return tableData.length <= 0 || tableData[0].dataC == null || tableData[0].dataC == "/" ? 0 : 1
+})
+
const phaseT = computed(() => {
- return tableData[0].dataT == null || tableData[0].dataT == undefined ? 0 : 1
+ return tableData.length <= 0 || tableData[0].dataT == null || tableData[0].dataT == "/" ? 0 : 1
})
const tableHeader = computed(() => {
- if (phaseT.value === 1){
+ if (phaseT.value === 1) {
let index = currentScriptTypeName.indexOf('=');
return currentScriptTypeName.substring(0, index);
}
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index 7fc6856..5919af3 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -344,6 +344,11 @@ const updateTableData = async () => {
label = data.resultData[key][0].isData === 1 ? `${key}` : data.resultData[key][0].isData === 4 ? `${key}（/）` : data.resultData[key][0].isData === 5 ? `${key}（-）` : `${key}（不符合）`
resultData.set(key, data.resultData[key][0])
checkListLevel.push({label: label, value: key, children: []})
+ let temp = checkListLevel.find(item => item.label.includes('电压幅值'))
+ if (temp) {
+ checkListLevel.splice(checkListLevel.indexOf(temp), 1)
+ checkListLevel.unshift(temp)
+ }
}
}