From 68aa4c409b886c9cf98cb14c8b00576b4692c0d3 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Wed, 22 Jan 2025 14:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E9=A1=B9=E4=B8=8D=E5=B9=B3=E8=A1=A1?=
=?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=E8=A1=A8=E5=A4=B4=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../home/components/dataCheckRawDataTable.vue | 11 +++-
.../dataCheckSingleChannelSingleTestPopup.vue | 52 +++----------------
2 files changed, 16 insertions(+), 47 deletions(-)
diff --git a/frontend/src/views/home/components/dataCheckRawDataTable.vue b/frontend/src/views/home/components/dataCheckRawDataTable.vue
index b6d3095..3f349d8 100644
--- a/frontend/src/views/home/components/dataCheckRawDataTable.vue
+++ b/frontend/src/views/home/components/dataCheckRawDataTable.vue
@@ -6,14 +6,17 @@
style="width: 100%;">
-
+
-
+
+
+
+
@@ -46,6 +49,10 @@ const tableHeader = computed(() => {
return currentScriptTypeName
})
+const isThreePhase = computed(() => {
+ return currentScriptTypeName.includes('三相电压不平衡度') || currentScriptTypeName.includes('三相电流不平衡度')
+})
+
const exportData = () => {
emit('exportRawDataHandler')
}
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index 8d85886..53511f2 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -80,7 +80,7 @@
-
+
@@ -173,6 +173,7 @@ const popoverWidth: ComputedRef = computed(() => {
return `${940 - (currentScriptTypeName.value.length + 7) * 14 - (checkList.length ? 220 : 0)}px`
})
+
// 原始数据表格数据
const rawTableData = reactive([])
@@ -194,6 +195,7 @@ const handleNodeClick = async (data: any) => {
if (checkIndex.value) {
await updateTableData()
+ activeTab.value = 'resultTab'
}
}
};
@@ -241,20 +243,14 @@ watch(() => formContent.chnNum, async (newVal, oldVal) => {
watch(currentCheckItem, (newVal, oldVal) => {
- // console.log("当前检测项", newVal);
+ console.log("当前检测项", newVal);
if (newVal) {
doCurrentCheckItemUpdate(newVal)
+ } else {
+ activeTab.value = 'resultTab'
}
- activeTab.value = 'resultTab'
})
-// const handleSwitchChange = async (data: any) => {
-// console.log("切换不合格测试项、全部测试项", data);
-//
-// defaultOperate()
-// await updateTableData()
-// }
-
// 默认操作
const defaultOperate = () => {
let node = getDefaultNode(treeDataAll)
@@ -320,47 +316,13 @@ const updateTableData = async () => {
resCheckResult = resTableData.resultData.get(keys1[0])
resRawData = resTableData.rawData.get(keys2[0])
- // Object.assign(harmNumList, [])
- // currentHarmNum.value = '-1'
-
resRawData = (resRawData == null || resRawData == undefined ? [] : resRawData)
resCheckResult = (resCheckResult == null || resCheckResult == undefined ? {} : resCheckResult)
setCheckResultData(resCheckResult)
setRawData(resRawData)
checkList.length = 0
currentCheckItem.value = ''
- } else
- // if (resTableData.resultData.get('电压幅值') || resTableData.resultData.get('持续时间')) {
- // let tempCheckList = []
- // if (resTableData.resultData.get('电压幅值')) {
- // tempCheckList.push({value: 'Voltage', label: '电压幅值'})
- // //resCheckResult = resTableData.resultData.get('电压幅值')
- // }
- // if (resTableData.resultData.get('持续时间')) {
- // tempCheckList.push({value: 'Duration', label: '持续时间'})
- // //resCheckResult = resTableData.resultData.get('持续时间')
- // }
- //
- // Object.assign(checkList, tempCheckList)
- // currentCheckItem.value = checkList[0].value
- //
- // Object.assign(harmNumList, [])
- // currentHarmNum.value = '-1'
- //
- // //setCheckResultData(resCheckResult)
- // } else
- if (keys1.length != 0) {
- // let tempHarmNumList: { value: string, label: string }[] = []
- // for (let [key, value] of resTableData.resultData) {
- // tempHarmNumList.push({
- // value: key,
- // label: value.isData === 1 ? key : value.isData === 4 ? `${formatHarmNum(key)}（/）` : `${formatHarmNum(key)}（不符合）`
- // })
- // }
- //
- // Object.assign(harmNumList, tempHarmNumList)
- // currentHarmNum.value = harmNumList.length > 0 ? harmNumList[0].value : '-1'
-
+ } else if (keys1.length != 0) {
let tempCheckList = []
for (let [key, value] of resTableData.resultData) {
let hum = formatHarmNum(key)