From 40fe12cd96820b4c48aaed0ea739814e882d9bba Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Tue, 14 Jan 2025 15:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=88=AB=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/dataCheckRawDataTable.vue     |  8 ++++----
 .../home/components/dataCheckResultTable.vue      |  8 ++++----
 .../dataCheckSingleChannelSingleTestPopup.vue     | 15 +++++++++++++--
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/home/components/dataCheckRawDataTable.vue b/frontend/src/views/home/components/dataCheckRawDataTable.vue
index 9259149..2387c01 100644
--- a/frontend/src/views/home/components/dataCheckRawDataTable.vue
+++ b/frontend/src/views/home/components/dataCheckRawDataTable.vue
@@ -7,12 +7,12 @@
       <el-table-column type="index" label="序号" width="70" fixed="left"/>
       <el-table-column prop="time" label="数据时间"/>
       <template v-if="phaseT === 0">
-        <el-table-column prop="dataA" :label="'A'+(unit==''?'':'（'+unit+'）')"/>
-        <el-table-column prop="dataB" :label="'B'+(unit==''?'':'（'+unit+'）')"/>
-        <el-table-column prop="dataC" :label="'C'+(unit==''?'':'（'+unit+'）')"/>
+        <el-table-column prop="dataA" :label="'A相'+(unit==''?'':'（'+unit+'）')"/>
+        <el-table-column prop="dataB" :label="'B相'+(unit==''?'':'（'+unit+'）')"/>
+        <el-table-column prop="dataC" :label="'C相'+(unit==''?'':'（'+unit+'）')"/>
       </template>
       <template v-if="phaseT === 1">
-        <el-table-column prop="dataT" :label="'T'+(unit==''?'':'（'+unit+'）')"/>
+        <el-table-column prop="dataT" :label="'T相'+(unit==''?'':'（'+unit+'）')"/>
       </template>
     </el-table>
   </div>
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index 3a0ee3e..ef23c7b 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -9,7 +9,7 @@
       <!--        </template>-->
       <!--      </el-table-column>-->
       <template v-if="phaseT === 0">
-        <el-table-column :label="'A'+(unit==''?'':'（'+unit+'）')">
+        <el-table-column :label="'A相'+(unit==''?'':'（'+unit+'）')">
           <el-table-column prop="stdA" width="100" label="标准值"/>
           <el-table-column prop="dataA" width="100" label="被检值"/>
           <el-table-column prop="isDataA" label="检测结果">
@@ -26,7 +26,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column :label="'B'+(unit==''?'':'（'+unit+'）')">
+        <el-table-column :label="'B相'+(unit==''?'':'（'+unit+'）')">
           <el-table-column prop="stdB" width="100" label="标准值"/>
           <el-table-column prop="dataB" width="100" label="被检值"/>
           <el-table-column prop="isDataB" label="检测结果">
@@ -43,7 +43,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column :label="'C'+(unit==''?'':'（'+unit+'）')">
+        <el-table-column :label="'C相'+(unit==''?'':'（'+unit+'）')">
           <el-table-column prop="stdC" width="100" label="标准值"/>
           <el-table-column prop="dataC" width="100" label="被检值"/>
           <el-table-column prop="isDataC" label="检测结果">
@@ -63,7 +63,7 @@
       </template>
 
       <template v-if="phaseT === 1">
-        <el-table-column :label="'T'+(unit==''?'':'（'+unit+'）')">
+        <el-table-column :label="'T相'+(unit==''?'':'（'+unit+'）')">
           <el-table-column prop="stdT" label="标准值"/>
           <el-table-column prop="dataT" label="被检值"/>
           <el-table-column prop="isDataT" label="检测结果">
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index 89429e2..8990b6e 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -312,6 +312,13 @@ const updateTableData = async () => {
     let resCheckResult: CheckData.ResCheckResult = {}
     let resRawData: CheckData.RawDataItem[] = []
 
+    if (keys1.length === 0) {
+      checkList.length = 0
+      checkResultData.length = 0
+      rawTableData.length = 0
+      currentCheckItem.value = ''
+    }
+
     if (keys1.length === 1) {
       resCheckResult = resTableData.resultData.get(keys1[0])
       resRawData = resTableData.rawData.get(keys2[0])
@@ -364,7 +371,7 @@ const updateTableData = async () => {
         })
       }
 
-      // debugger
+
       Object.assign(checkList, tempCheckList)
 
       currentCheckItem.value = checkList[0].value
@@ -433,9 +440,13 @@ const close = () => {
   visible.value = false;
 };
 
-const setCheckResultData = (data: CheckData.ResCheckResult) => {
+const setCheckResultData = (data: CheckData.ResCheckResult|null) => {
  // console.log("检测结果", data);
   let result: CheckData.CheckResult[] = []
+  if (data == null || data == undefined) {
+    Object.assign(checkResultData, [])
+    return
+  }
   if (data.dataA != null && data.dataB != null && data.dataC != null) {
     result.push({
       stdA: numberToFixed(data.dataA.resultData),