From 9ed47ac5bc881bc854cb38bec035723dd2866f00 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Tue, 22 Apr 2025 14:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataCheckSingleChannelSingleTestPopup.vue | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index e910bc3..5d4d79b 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -187,7 +187,7 @@ const resTableData = reactive<{ resultData: Map<string, any>, rawData: Map<strin
 const checkResultData = reactive<CheckData.CheckResult[]>([])
 
 const popoverWidth: ComputedRef<string> = computed(() => {
-  return `${1140 - (currentScriptTypeName.value.length + 7+3) * 14 - (checkListLevel.length ? 280 : 0)}px`
+  return `${1140 - (currentScriptTypeName.value.length + 7 + 3) * 14 - (checkListLevel.length ? 280 : 0)}px`
 })
 
 
@@ -331,17 +331,17 @@ const updateTableData = async () => {
     let resultData = new Map()
     for (let key of keys1) {
       let children = []
-      let label=key
+      let label = key
       if ((key.includes('谐波') || key.includes('简谐波')) && key !== '谐波有功功率') {
         for (let item of data.resultData[key]) {
           let num = formatHarmNum(item.harmNum + '')
-          label=item.isData === 1 ? `${num}` : item.isData === 4 ? `${num}（/）` : item.isData === 5 ? `${num}（-）` : `${num}（不符合）`
+          label = item.isData === 1 ? `${num}` : item.isData === 4 ? `${num}（/）` : item.isData === 5 ? `${num}（-）` : `${num}（不符合）`
           children.push({label: label, value: num})
           resultData.set(key + "_" + num, item)
         }
         checkListLevel.push({label: key, value: key, children: children})
       } else {
-        label=data.resultData[key][0].isData === 1 ? `${key}` : data.resultData[key][0].isData === 4 ? `${key}（/）` : data.resultData[key][0].isData === 5 ? `${key}（-）` : `${key}（不符合）`
+        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: []})
       }
@@ -504,24 +504,24 @@ const setCheckResultData = (data: CheckData.ResCheckResult | null) => {
     result.push({
       // stdA: numberToFixed(data.dataA.resultData),
       // dataA: numberToFixed(data.dataA.data),
-      stdA: data.dataA.resultData + '',
-      dataA: data.dataA.data + '',
+      stdA: dataToShow(data.dataA.resultData),
+      dataA: dataToShow(data.dataA.data),
       errorA: data.dataA.errorData == null ? '/' : data.dataA.errorData + '',
       maxErrorA: toMaxErrorStr(data.dataA.radius, data.dataA.unit),
       unitA: data.dataA.unit,
       isDataA: data.dataA.isData,
       // stdB: numberToFixed(data.dataB.resultData),
       // dataB: numberToFixed(data.dataB.data),
-      stdB: data.dataB.resultData + '',
-      dataB: data.dataB.data + '',
+      stdB: dataToShow(data.dataB.resultData),
+      dataB: dataToShow(data.dataB.data),
       errorB: data.dataB.errorData == null ? '/' : data.dataB.errorData + '',
       maxErrorB: toMaxErrorStr(data.dataB.radius, data.dataB.unit),
       isDataB: data.dataB.isData,
       unitB: data.dataB.unit,
       // stdC: numberToFixed(data.dataC.resultData),
       // dataC: numberToFixed(data.dataC.data),
-      stdC: data.dataC.resultData + '',
-      dataC: data.dataC.data + '',
+      stdC: dataToShow(data.dataC.resultData),
+      dataC: dataToShow(data.dataC.data),
       errorC: data.dataC.errorData == null ? '/' : data.dataC.errorData + '',
       maxErrorC: toMaxErrorStr(data.dataC.radius, data.dataC.unit),
       isDataC: data.dataC.isData,
@@ -537,8 +537,8 @@ const setCheckResultData = (data: CheckData.ResCheckResult | null) => {
     result.push({
       // stdT: numberToFixed(data.dataT.resultData),
       // dataT: numberToFixed(data.dataT.data),
-      stdT: data.dataT.resultData + '',
-      dataT: data.dataT.data + '',
+      stdT: dataToShow(data.dataT.resultData),
+      dataT: dataToShow(data.dataT.data),
       errorT: data.dataT.errorData == null ? '/' : data.dataT.errorData + '',
       maxErrorT: toMaxErrorStr(data.dataT.radius, data.dataT.unit),
       isDataT: data.dataT?.isData,
@@ -576,15 +576,26 @@ const formatHarmNum = (num: string) => {
 
 const setRawData = (data: CheckData.RawDataItem[]) => {
   data.forEach((item: CheckData.RawDataItem) => {
-    item.dataA = stringToFixed(item.dataA)
-    item.dataB = stringToFixed(item.dataB)
-    item.dataC = stringToFixed(item.dataC)
-    item.dataT = stringToFixed(item.dataT)
+    // item.dataA = stringToFixed(item.dataA)
+    // item.dataB = stringToFixed(item.dataB)
+    // item.dataC = stringToFixed(item.dataC)
+    // item.dataT = stringToFixed(item.dataT)
+    item.dataA = dataToShow(item.dataA)
+    item.dataB = dataToShow(item.dataB)
+    item.dataC = dataToShow(item.dataC)
+    item.dataT = dataToShow(item.dataT)
   })
   rawTableData.length = 0
   Object.assign(rawTableData, data)
   console.log("原始数据", rawTableData)
 }
+const dataToShow = (num: number): string => {
+  if (num == null || num == undefined) {
+    return '/'
+  }
+  return num+''
+}
+
 
 const numberToFixed = (num: number): string => {
   if (num == null || num == undefined) {