From f0ce2e0ac88c48c13b3b5f73bf810baa562110ce Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Thu, 27 Nov 2025 14:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E4=B8=BA-?=
 =?UTF-8?q?=E6=88=96=E8=80=85/=E7=9A=84=E9=BC=A0=E6=A0=87=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A0=E9=9C=80=E9=BB=91=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compareDataCheckResultTable.vue           | 34 ++++++++++++-------
 .../home/components/dataCheckResultTable.vue  | 34 ++++++++++++-------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/frontend/src/views/home/components/compareDataCheckResultTable.vue b/frontend/src/views/home/components/compareDataCheckResultTable.vue
index a085689..b12aafd 100644
--- a/frontend/src/views/home/components/compareDataCheckResultTable.vue
+++ b/frontend/src/views/home/components/compareDataCheckResultTable.vue
@@ -21,7 +21,11 @@
         </el-table-column>
         <el-table-column prop="isDataA" label="检测结果">
           <template #default="{ row }">
-            <el-tooltip effect="dark" placement="bottom">
+             <template v-if="row.dataA.isData === 4 || row.dataA.isData === 5">
+              <el-tag type="warning" v-if="row.dataA.isData === 4">/</el-tag>
+              <el-tag type="info" v-if="row.dataA.isData === 5">-</el-tag>
+            </template>
+            <el-tooltip v-else effect="dark" placement="bottom">
               <template #content>
                 误差范围：{{ addPercentSigns(row.dataA.radius, row.dataA.unit) }}
                 <br/>
@@ -29,8 +33,7 @@
               </template>
               <el-tag type="success" v-if="row.dataA.isData === 1">符合</el-tag>
               <el-tag type="danger" v-if="row.dataA.isData === 2">不符合</el-tag>
-              <el-tag type="warning" v-if="row.dataA.isData === 4">/</el-tag>
-              <el-tag type="info" v-if="row.dataA.isData === 5">-</el-tag>
+           
             </el-tooltip>
           </template>
         </el-table-column>
@@ -49,7 +52,11 @@
         </el-table-column>
         <el-table-column prop="isDataB" label="检测结果">
           <template #default="{ row }">
-            <el-tooltip effect="dark" placement="bottom">
+            <template v-if="row.dataB.isData === 4 || row.dataB.isData === 5">
+              <el-tag type="warning" v-if="row.dataB.isData === 4">/</el-tag>
+              <el-tag type="info" v-if="row.dataB.isData === 5">-</el-tag>
+            </template>
+            <el-tooltip  v-else effect="dark" placement="bottom">
               <template #content>
                 误差范围：{{ addPercentSigns(row.dataB.radius, row.dataB.unit) }}
                 <br/>
@@ -57,8 +64,6 @@
               </template>
               <el-tag type="success" v-if="row.dataB.isData === 1">符合</el-tag>
               <el-tag type="danger" v-if="row.dataB.isData === 2">不符合</el-tag>
-              <el-tag type="warning" v-if="row.dataB.isData === 4">/</el-tag>
-              <el-tag type="info" v-if="row.dataB.isData === 5">-</el-tag>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -77,7 +82,11 @@
         </el-table-column>
         <el-table-column prop="isDataC" label="检测结果">
           <template #default="{ row }">
-            <el-tooltip effect="dark" placement="bottom">
+            <template v-if="row.dataC.isData === 4 || row.dataC.isData === 5">
+              <el-tag type="warning" v-if="row.dataC.isData === 4">/</el-tag>
+              <el-tag type="info" v-if="row.dataC.isData === 5">-</el-tag>
+            </template>
+            <el-tooltip v-else effect="dark" placement="bottom">
               <template #content>
                 误差范围：{{ addPercentSigns(row.dataC.radius, row.dataC.unit) }}
                 <br/>
@@ -85,8 +94,6 @@
               </template>
               <el-tag type="success" v-if="row.dataC.isData === 1">符合</el-tag>
               <el-tag type="danger" v-if="row.dataC.isData === 2">不符合</el-tag>
-              <el-tag type="warning" v-if="row.dataC.isData === 4">/</el-tag>
-              <el-tag type="info" v-if="row.dataC.isData === 5">-</el-tag>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -105,7 +112,11 @@
         </el-table-column>
         <el-table-column prop="isDataT" label="检测结果">
           <template #default="{ row }">
-            <el-tooltip effect="dark" placement="bottom">
+            <template v-if="row.dataT.isData === 4 || row.dataT.isData === 5">
+              <el-tag type="warning" v-if="row.dataT.isData === 4">/</el-tag>
+              <el-tag type="info" v-if="row.dataT.isData === 5">-</el-tag>
+            </template>
+            <el-tooltip v-else effect="dark" placement="bottom">
               <template #content>
                 误差范围：{{ addPercentSigns(row.dataT.radius, row.dataT.unit) }}
                 <br/>
@@ -113,8 +124,7 @@
               </template>
               <el-tag type="success" v-if="row.dataT.isData === 1">符合</el-tag>
               <el-tag type="danger" v-if="row.dataT.isData === 2">不符合</el-tag>
-              <el-tag type="warning" v-if="row.dataT.isData === 4">/</el-tag>
-              <el-tag type="info" v-if="row.dataT.isData === 5">-</el-tag>
+    
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index 3cc1309..d80b87e 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -17,7 +17,11 @@
                 <el-table-column prop="dataA" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
                 <el-table-column prop="isDataA" label="检测结果">
                     <template #default="scope">
-                        <el-tooltip effect="dark" placement="bottom">
+                         <template v-if="scope.row.isDataA === 4 || scope.row.isDataA === 5">
+                            <el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
+                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                        </template>
+                        <el-tooltip v-else effect="dark" placement="bottom">
                             <template #content>
                                 误差范围：{{ scope.row.maxErrorA }}
                                 <br />
@@ -25,8 +29,6 @@
                             </template>
                             <el-tag type="success" v-if="scope.row.isDataA === 1">符合</el-tag>
                             <el-tag type="danger" v-if="scope.row.isDataA === 2">不符合</el-tag>
-                            <el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
-                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
                         </el-tooltip>
                     </template>
                 </el-table-column>
@@ -36,7 +38,11 @@
                 <el-table-column prop="dataB" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
                 <el-table-column prop="isDataB" label="检测结果">
                     <template #default="scope">
-                        <el-tooltip effect="dark" placement="bottom">
+                        <template v-if="scope.row.isDataB === 4 || scope.row.isDataB === 5"> 
+                             <el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
+                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                        </template>
+                        <el-tooltip v-else effect="dark" placement="bottom">
                             <template #content>
                                 误差范围：{{ scope.row.maxErrorB }}
                                 <br />
@@ -44,8 +50,7 @@
                             </template>
                             <el-tag type="success" v-if="scope.row.isDataB === 1">符合</el-tag>
                             <el-tag type="danger" v-if="scope.row.isDataB === 2">不符合</el-tag>
-                            <el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
-                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                           
                         </el-tooltip>
                     </template>
                 </el-table-column>
@@ -55,7 +60,11 @@
                 <el-table-column prop="dataC" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
                 <el-table-column prop="isDataC" label="检测结果">
                     <template #default="scope">
-                        <el-tooltip effect="dark" placement="bottom">
+                        <template v-if="scope.row.isDataC === 4 || scope.row.isDataC === 5"> 
+                             <el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
+                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                        </template>
+                        <el-tooltip v-else effect="dark" placement="bottom">
                             <template #content>
                                 误差范围： {{ scope.row.maxErrorC }}
                                 <br />
@@ -63,8 +72,7 @@
                             </template>
                             <el-tag type="success" v-if="scope.row.isDataC === 1">符合</el-tag>
                             <el-tag type="danger" v-if="scope.row.isDataC === 2">不符合</el-tag>
-                            <el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
-                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+         
                         </el-tooltip>
                     </template>
                 </el-table-column>
@@ -75,7 +83,11 @@
                 <el-table-column prop="dataT" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
                 <el-table-column prop="isDataT" label="检测结果">
                     <template #default="scope">
-                        <el-tooltip effect="dark" placement="bottom">
+                        <template v-if="scope.row.isDataT === 4 || scope.row.isDataT === 5"> 
+                             <el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
+                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+                        </template>
+                        <el-tooltip v-else effect="dark" placement="bottom">
                             <template #content>
                                 误差范围： {{ scope.row.maxErrorT }}
                                 <br />
@@ -83,8 +95,6 @@
                             </template>
                             <el-tag type="success" v-if="scope.row.isDataT === 1">符合</el-tag>
                             <el-tag type="danger" v-if="scope.row.isDataT === 2">不符合</el-tag>
-                            <el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
-                            <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
                         </el-tooltip>
                     </template>
                 </el-table-column>