From e791bd0402c18e2514d47c14ab1527eb988559e8 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Thu, 14 May 2026 10:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workRate/index.vue                         | 7 +++----
 src/views/zhgd-work/eleFilesEdit/tableProcessing.vue | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/workRate/index.vue b/src/views/workRate/index.vue
index e1ac2874..1a9318f8 100644
--- a/src/views/workRate/index.vue
+++ b/src/views/workRate/index.vue
@@ -288,7 +288,6 @@
           <el-table
             :ref="'myTable'"
             :sequence="false"
-            :span-method="objectSpanMethod"
             :no-page="false"
             :export-excel="false"
             border
@@ -304,7 +303,7 @@
               show-overflow-tooltip
             />
             <el-table-column label="测试值" align="center" width="120">
-              <!-- <template slot-scope="scope">
+              <template #default="scope">
                   <div>
                     <el-popover
                       v-if="scope.row.itemName&&scope.row.itemName === '厚度检测'"
@@ -352,7 +351,7 @@
                           width="80"
                         />
                       </el-table>
-                      <el-button slot="reference">测试值</el-button>
+                      <span>测试值</span>
                     </el-popover>
                     <el-popover
                       v-else-if="scope.row.itemDetailList.length > 0"
@@ -429,7 +428,7 @@
                     </el-popover>
                     <span v-else>{{ scope.row.checkValue }}</span>
                   </div>
-                </template> -->
+                </template>
             </el-table-column>
             <el-table-column label="试验数量" property="testQty" align="center" width="70" />
             <el-table-column label="消耗数量" property="lossQty" align="center" width="70" />
diff --git a/src/views/zhgd-work/eleFilesEdit/tableProcessing.vue b/src/views/zhgd-work/eleFilesEdit/tableProcessing.vue
index b7615bf7..c7b98898 100644
--- a/src/views/zhgd-work/eleFilesEdit/tableProcessing.vue
+++ b/src/views/zhgd-work/eleFilesEdit/tableProcessing.vue
@@ -48,6 +48,7 @@
               label-key="deviceCode"
               value-key="id"
               search-key="deviceCode"
+              labelPre="deviceName"
               :debounce-time="500"
             />
           </el-form-item>