测试问题修改

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" />

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>