diff --git a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
index e9d0e60..87d51fa 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
@@ -131,8 +131,8 @@
       { text: 'RA3', value: 'sixValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
       { text: 'RA4', value: 'eightValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
       { text: 'ROA4', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
-      { text: 'ROA均值', value: 'nineValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
-      { text: 'RA均值', value: 'tenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA均值', value: 'nineValue', align: 'center', required: true, type: 'text', precision: 4 },
+      { text: 'RA均值', value: 'tenValue', align: 'center', required: true, type: 'text', precision: 4 },
     ],
   },
   { text: '上水平面温差', value: 'upperTemperatureDifferent', align: 'center', required: true, type: 'text' },
@@ -176,8 +176,8 @@
     width: '180',
     required: false,
     children: [
-      { text: '正行程', value: 'indicatingErrorForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'indicatingErrorReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingErrorForwardStroke', align: 'center', required: true, type: 'text' },
+      { text: '反行程', value: 'indicatingErrorReverseStroke', align: 'center', required: true, type: 'text' },
     ],
   },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
@@ -519,6 +519,9 @@
     columns = type === 'top' ? columns_thermostatic_bath_wave.value : columns_thermostatic_bath_even.value
     title = type === 'top' ? '波动性测试' : '均匀性测试'
   }
+  else if (itemFormData.value.itemCategoryName === '双金属温度计') {
+    list = bimetalThermometerList.value
+  }
   if (!list.length) {
     ElMessage.warning('没有检定项数据，无法生成结果')
     return false
@@ -531,19 +534,34 @@
   const params = {
     belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
     itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-    measureDataResistanceThermometerLi: list,
+    measureDataResistanceThermometerList: list,
   }
   calculateHandle(params).then((res) => {
-    // if (res.data && res.data.length) {
-    //   resultList.value = res.data.map((item: IDetailMeasureList) => {
-    //     return {
-    //       ...item,
-    //     }
-    //   }) // 检定数据
-    // }
-    // else {
-    //   list.value = res.data
-    // }
+    if (res.data && res.data.length) {
+      res.data.map((item: { editable: boolean }) => { item.editable = pageType.value !== 'detail'; return item })
+      if (type === 'top') {
+        switch (itemFormData.value.itemCategoryName) {
+          case '恒温槽':
+            thermostaticBathWaveList.value = res.data
+            break
+          case '双金属温度计':
+            bimetalThermometerList.value = res.data.map((item: { params: string }) => { item.params = '示值误差'; return item })
+            break
+          default:
+            break
+        }
+      }
+      else {
+        switch (itemFormData.value.itemCategoryName) {
+          case '恒温槽':
+            thermostaticBathEvenList.value = res.data
+            break
+          default:
+            break
+        }
+      }
+    }
+
     tableTop.value = false
     tableBottom.value = false
   }).catch(() => { tableTop.value = false; tableBottom.value = false })
@@ -677,11 +695,12 @@
     <!-- 双金属温度计 -->
     <detail-block v-if="current === 'measure-data' && itemFormData.itemCategoryName === '双金属温度计'" title="示值误差" style="margin-top: 0;padding: 0;">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary">
+        <el-button type="primary" @click="createResult('top')">
           计算结果
         </el-button>
       </template>
       <multi-table
+        v-loading="tableTop"
         :table-data="bimetalThermometerList"
         :table-header="columns_bimetal_thermometer"
         :merge-rows="[]"