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)
+ }
}
}