diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index ef9b0f0..806e280 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -57,10 +57,11 @@
         :align="item.align"
         :show-overflow-tooltip="showOverflowTooltip"
       >
-        <template v-if="item.customHeader && item.text !== '-'" #header="scope">
-          <el-link :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
-            {{ item.text }}
+        <template #header="scope">
+          <el-link v-if="item.customHeader && item.text !== '-'" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </el-link>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <el-select
@@ -96,7 +97,6 @@
             v-model="scope.row[item.value]"
             :precision="item.precision"
             :min="min"
-            size="small"
             @change="handleInputNumberChange(scope)"
           />
           <template v-else-if="item.type === 'text'">

diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index ef9b0f0..806e280 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -57,10 +57,11 @@
         :align="item.align"
         :show-overflow-tooltip="showOverflowTooltip"
       >
-        <template v-if="item.customHeader && item.text !== '-'" #header="scope">
-          <el-link :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
-            {{ item.text }}
+        <template #header="scope">
+          <el-link v-if="item.customHeader && item.text !== '-'" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </el-link>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <el-select
@@ -96,7 +97,6 @@
             v-model="scope.row[item.value]"
             :precision="item.precision"
             :min="min"
-            size="small"
             @change="handleInputNumberChange(scope)"
           />
           <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/measure/item/components/fifth/templateDetail.vue b/src/views/business/measure/item/components/fifth/templateDetail.vue
index ac9cd11..eb14d8e 100644
--- a/src/views/business/measure/item/components/fifth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifth/templateDetail.vue
@@ -78,8 +78,8 @@
   { text: 'dWst/dt', value: 'dwstDt', align: 'center', required: true, width: '200' },
   { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
   { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
-  { text: 'α允差上限/10(-6) ℃(-1)', value: 'aallowErrorUpper', align: 'center', required: true },
-  { text: 'α允差下限/10(-6) ℃(-1)', value: 'aallowErrorLower', align: 'center', required: true },
+  { text: 'α允差上限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorUpper', align: 'center', required: true, width: '160' },
+  { text: 'α允差下限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorLower', align: 'center', required: true, width: '160' },
 ])
 
 // ------------------------------------------字典----------------------------------------------
@@ -505,7 +505,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <!-- 校准点、扩展不确定度u -->
@@ -540,7 +541,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <el-input-number

diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index ef9b0f0..806e280 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -57,10 +57,11 @@
         :align="item.align"
         :show-overflow-tooltip="showOverflowTooltip"
       >
-        <template v-if="item.customHeader && item.text !== '-'" #header="scope">
-          <el-link :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
-            {{ item.text }}
+        <template #header="scope">
+          <el-link v-if="item.customHeader && item.text !== '-'" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </el-link>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <el-select
@@ -96,7 +97,6 @@
             v-model="scope.row[item.value]"
             :precision="item.precision"
             :min="min"
-            size="small"
             @change="handleInputNumberChange(scope)"
           />
           <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/measure/item/components/fifth/templateDetail.vue b/src/views/business/measure/item/components/fifth/templateDetail.vue
index ac9cd11..eb14d8e 100644
--- a/src/views/business/measure/item/components/fifth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifth/templateDetail.vue
@@ -78,8 +78,8 @@
   { text: 'dWst/dt', value: 'dwstDt', align: 'center', required: true, width: '200' },
   { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
   { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
-  { text: 'α允差上限/10(-6) ℃(-1)', value: 'aallowErrorUpper', align: 'center', required: true },
-  { text: 'α允差下限/10(-6) ℃(-1)', value: 'aallowErrorLower', align: 'center', required: true },
+  { text: 'α允差上限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorUpper', align: 'center', required: true, width: '160' },
+  { text: 'α允差下限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorLower', align: 'center', required: true, width: '160' },
 ])
 
 // ------------------------------------------字典----------------------------------------------
@@ -505,7 +505,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <!-- 校准点、扩展不确定度u -->
@@ -540,7 +541,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <el-input-number
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
index 9311317..f8945fc 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
@@ -1,5 +1,60 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
   id: string
+  dataId?: string //	检定数据管理基础信息表id
+  dataType: string //	检定数据类型(一个检定数据中区分两个表格)(字典code)
 
+  calibratedPoint?: string //	校准点
+  dataCategory?: string //	检定数据类别(1检定数据，2计算结果数据)
+  drDt?: string //	dR/dt，该参数在结果处理表中每行都要传
+  dwstDt?: string //	dWst/dt，该参数在结果处理表中每行都要传
+  location?: string //	位置
+  lowerTemperatureDifferent?: string //	下水平面温差
+  maxHorizontalTemperatureDifferent?: string // 水平最大温差
+  maxValue?: string //	最大值
+  maxWorkTemperatureDifferent?: string // 工作区域最大温差
+  maximumError?: string //	最大允许误差
+  minValue?: string //		最小值
+  nominalTemperature?: string //		标称温度
+  nominalValue?: string //		α标称值(字典value)，该参数在结果处理表中每行都要传
+  rank?: string //	级别(字典value)，该参数在结果处理表中每行都要传
+  rtp?: string //
+  rvalue?: string //
+  unit?: string //		单位
+  upperLowerPoint?: string //		上/下限点
+  upperTemperatureDifferent?: string //		上水平面温差
+  urel?: string //		扩展不确定度
+  volatility?: string //		波动性
+  ws?: string //	ws
+
+  indicatingErrorForwardStroke?: string //	示值误差正行程
+  indicatingErrorReverseStroke?: string //	示值误差反行程
+  indicatingValueForwardStroke?: string //	标准器示值正行程
+  indicatingValueReverseStroke?: string //	标准器示值反行程
+  measureIndicationValueForwardStroke?: string //		被检示值正行程
+  measureIndicationValueReverseStroke?: string //		被检示值反行程
+
+  item?: string //	项目(结果表)
+  allowErrorLower?: string //	允差下限(结果表)
+  allowErrorUpper?: string //	允差上限(结果表)
+  measureValue?: string //		测量值(结果表)
+
+  oneValue?: string | number //		示值1(波动性测试)/ROA1(均匀性测试)/标准器示值1(工业铂铜热电阻)
+  twoValue?: string | number//		示值2(波动性测试)/RA1(均匀性测试)/被检示值1(工业铂铜热电阻)
+  threeValue?: string | number//		示值3(波动性测试)/ROA2(均匀性测试)/标准器示值2(工业铂铜热电阻)
+  fourValue?: string | number//	示值4(波动性测试)/RA2(均匀性测试)/被检示值2(工业铂铜热电阻)
+  fiveValue?: string | number//	示值5(波动性测试)/ROA3(均匀性测试)/标准器示值3(工业铂铜热电阻)
+  sixValue?: string | number//		示值6(波动性测试)/RA3(均匀性测试)/被检示值3(工业铂铜热电阻)
+  sevenValue?: string | number//		示值7(波动性测试)/ROA4(均匀性测试)/标准器示值4(工业铂铜热电阻)
+  eightValue?: string | number//	示值8(波动性测试)/RA4(均匀性测试)/被检示值4(工业铂铜热电阻)
+  nineValue?: string | number//		示值9(波动性测试)/ROA均值(均匀性测试)/标准器示值5(工业铂铜热电阻)
+  tenValue?: string | number//		示值10(波动性测试)/RA均值(均匀性测试)/被检示值5(工业铂铜热电阻)
+  elevenValue?: string | number//	示值11(波动性测试)/标准器示值6(工业铂铜热电阻)
+  twelveValue?: string | number//		示值12(波动性测试)/被检示值6(工业铂铜热电阻)
+  thirteenValue?: string | number//		示值13(波动性测试)/标准器示值均值(工业铂铜热电阻)
+  fourteenValue?: string | number//	示值14(波动性测试)/被检示值均值(工业铂铜热电阻)
+  fifteenValue?: string | number//	示值15(波动性测试)
+
+  editable?: boolean // 表格是否可编辑
+  params?: string // 检定项目
 }

diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index ef9b0f0..806e280 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -57,10 +57,11 @@
         :align="item.align"
         :show-overflow-tooltip="showOverflowTooltip"
       >
-        <template v-if="item.customHeader && item.text !== '-'" #header="scope">
-          <el-link :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
-            {{ item.text }}
+        <template #header="scope">
+          <el-link v-if="item.customHeader && item.text !== '-'" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </el-link>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <el-select
@@ -96,7 +97,6 @@
             v-model="scope.row[item.value]"
             :precision="item.precision"
             :min="min"
-            size="small"
             @change="handleInputNumberChange(scope)"
           />
           <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/measure/item/components/fifth/templateDetail.vue b/src/views/business/measure/item/components/fifth/templateDetail.vue
index ac9cd11..eb14d8e 100644
--- a/src/views/business/measure/item/components/fifth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifth/templateDetail.vue
@@ -78,8 +78,8 @@
   { text: 'dWst/dt', value: 'dwstDt', align: 'center', required: true, width: '200' },
   { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
   { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
-  { text: 'α允差上限/10(-6) ℃(-1)', value: 'aallowErrorUpper', align: 'center', required: true },
-  { text: 'α允差下限/10(-6) ℃(-1)', value: 'aallowErrorLower', align: 'center', required: true },
+  { text: 'α允差上限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorUpper', align: 'center', required: true, width: '160' },
+  { text: 'α允差下限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorLower', align: 'center', required: true, width: '160' },
 ])
 
 // ------------------------------------------字典----------------------------------------------
@@ -505,7 +505,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <!-- 校准点、扩展不确定度u -->
@@ -540,7 +541,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <el-input-number
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
index 9311317..f8945fc 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
@@ -1,5 +1,60 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
   id: string
+  dataId?: string //	检定数据管理基础信息表id
+  dataType: string //	检定数据类型(一个检定数据中区分两个表格)(字典code)
 
+  calibratedPoint?: string //	校准点
+  dataCategory?: string //	检定数据类别(1检定数据，2计算结果数据)
+  drDt?: string //	dR/dt，该参数在结果处理表中每行都要传
+  dwstDt?: string //	dWst/dt，该参数在结果处理表中每行都要传
+  location?: string //	位置
+  lowerTemperatureDifferent?: string //	下水平面温差
+  maxHorizontalTemperatureDifferent?: string // 水平最大温差
+  maxValue?: string //	最大值
+  maxWorkTemperatureDifferent?: string // 工作区域最大温差
+  maximumError?: string //	最大允许误差
+  minValue?: string //		最小值
+  nominalTemperature?: string //		标称温度
+  nominalValue?: string //		α标称值(字典value)，该参数在结果处理表中每行都要传
+  rank?: string //	级别(字典value)，该参数在结果处理表中每行都要传
+  rtp?: string //
+  rvalue?: string //
+  unit?: string //		单位
+  upperLowerPoint?: string //		上/下限点
+  upperTemperatureDifferent?: string //		上水平面温差
+  urel?: string //		扩展不确定度
+  volatility?: string //		波动性
+  ws?: string //	ws
+
+  indicatingErrorForwardStroke?: string //	示值误差正行程
+  indicatingErrorReverseStroke?: string //	示值误差反行程
+  indicatingValueForwardStroke?: string //	标准器示值正行程
+  indicatingValueReverseStroke?: string //	标准器示值反行程
+  measureIndicationValueForwardStroke?: string //		被检示值正行程
+  measureIndicationValueReverseStroke?: string //		被检示值反行程
+
+  item?: string //	项目(结果表)
+  allowErrorLower?: string //	允差下限(结果表)
+  allowErrorUpper?: string //	允差上限(结果表)
+  measureValue?: string //		测量值(结果表)
+
+  oneValue?: string | number //		示值1(波动性测试)/ROA1(均匀性测试)/标准器示值1(工业铂铜热电阻)
+  twoValue?: string | number//		示值2(波动性测试)/RA1(均匀性测试)/被检示值1(工业铂铜热电阻)
+  threeValue?: string | number//		示值3(波动性测试)/ROA2(均匀性测试)/标准器示值2(工业铂铜热电阻)
+  fourValue?: string | number//	示值4(波动性测试)/RA2(均匀性测试)/被检示值2(工业铂铜热电阻)
+  fiveValue?: string | number//	示值5(波动性测试)/ROA3(均匀性测试)/标准器示值3(工业铂铜热电阻)
+  sixValue?: string | number//		示值6(波动性测试)/RA3(均匀性测试)/被检示值3(工业铂铜热电阻)
+  sevenValue?: string | number//		示值7(波动性测试)/ROA4(均匀性测试)/标准器示值4(工业铂铜热电阻)
+  eightValue?: string | number//	示值8(波动性测试)/RA4(均匀性测试)/被检示值4(工业铂铜热电阻)
+  nineValue?: string | number//		示值9(波动性测试)/ROA均值(均匀性测试)/标准器示值5(工业铂铜热电阻)
+  tenValue?: string | number//		示值10(波动性测试)/RA均值(均匀性测试)/被检示值5(工业铂铜热电阻)
+  elevenValue?: string | number//	示值11(波动性测试)/标准器示值6(工业铂铜热电阻)
+  twelveValue?: string | number//		示值12(波动性测试)/被检示值6(工业铂铜热电阻)
+  thirteenValue?: string | number//		示值13(波动性测试)/标准器示值均值(工业铂铜热电阻)
+  fourteenValue?: string | number//	示值14(波动性测试)/被检示值均值(工业铂铜热电阻)
+  fifteenValue?: string | number//	示值15(波动性测试)
+
+  editable?: boolean // 表格是否可编辑
+  params?: string // 检定项目
 }
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
index 6f785bf..e9d0e60 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
@@ -1,4 +1,4 @@
-<!-- 第6套：安全阀标准装置 -->
+<!-- 第5套：二等铂 -->
 <!-- 检定数据管理详情模板 -->
 <script lang="ts" setup name="MeasureDataTemplateDetail">
 import { ref } from 'vue'
@@ -34,12 +34,19 @@
   itemCategoryId: '', // 设备检定项分类名称id
   belongStandardEquipment: '', // 标准装置code
   belongStandardEquipmentName: '', // 标准装置名称
+
   appearance: '1', // 外观检查
-  insulationResistance: '', // 绝缘电阻
-  jdtzwc: '1', //  角度调整误差（可调整角度仪表）
+  isShowAppearance: false, // 外观检查输入数据--用来判断外观是否展示
+  isShowInsulationResistance: false, // 绝缘电阻输入数据--判断是否展示
+  insulationResistanceValue: '', // 绝缘电阻值
+  angleAdjustError: '1', //  角度调整误差（可调整角度仪表）
+  isShowAngleAdjustErrort: false, //  角度调整误差（可调整角度仪表）输入数据--判断是否展示
+
   conclusion: '', // 检验结论
   remark: '', // 备注
 })
+const tableTop = ref(false) // 上面表格loading
+const tableBottom = ref(false) // 下面表格loading
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -73,104 +80,108 @@
 const thermostaticBathWaveList = ref<IDetailMeasureList[]>([]) // 恒温槽-波动性测试表格数据
 const thermostaticBathEvenList = ref<IDetailMeasureList[]>([]) // 恒温槽-均匀性测试表格数据
 const columns_thermostatic_bath_wave = ref([ // 恒温槽--波动性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  // 下/上限点：指标上限、指标下限
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, type: 'text' },
-      { text: '2', value: '2', align: 'center', required: true, type: 'text' },
-      { text: '3', value: '3', align: 'center', required: true, type: 'text' },
-      { text: '4', value: '4', align: 'center', required: true, type: 'text' },
-      { text: '5', value: '5', align: 'center', required: true, type: 'text' },
-      { text: '6', value: '6', align: 'center', required: true, type: 'text' },
-      { text: '7', value: '7', align: 'center', required: true, type: 'text' },
-      { text: '8', value: '8', align: 'center', required: true, type: 'text' },
-      { text: '9', value: '9', align: 'center', required: true, type: 'text' },
-      { text: '10', value: '10', align: 'center', required: true, type: 'text' },
-      { text: '11', value: '11', align: 'center', required: true, type: 'text' },
-      { text: '12', value: '12', align: 'center', required: true, type: 'text' },
-      { text: '13', value: '13', align: 'center', required: true, type: 'text' },
-      { text: '14', value: '14', align: 'center', required: true, type: 'text' },
-      { text: '15', value: '15', align: 'center', required: true, type: 'text' },
+      { text: '1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '2', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '3', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '4', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '5', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '6', value: 'sixValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '7', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '8', value: 'eightValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '9', value: 'nineValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '10', value: 'tenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '11', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '12', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '13', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '14', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '15', value: 'fifteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
     ],
   },
-  { text: '最大值', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '最小值', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '波动性', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '最大值', value: 'maxValue', align: 'center', required: true, type: 'text' },
+  { text: '最小值', value: 'minValue', align: 'center', required: true, type: 'text' },
+  { text: '波动性', value: 'volatility', align: 'center', type: 'text' },
 ])
 
 const columns_thermostatic_bath_even = ref([ // 恒温槽--均匀性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
-  { text: '位置', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  { text: '位置', value: 'location', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: 'ROA1', value: 'ROA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA1', value: 'RA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA2', value: 'RA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA2', value: 'ROA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA3', value: 'ROA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA3', value: 'RA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA4', value: 'RA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA4', value: 'ROA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA均值', value: 'ROA均值', align: 'center', required: true, type: 'text' },
-      { text: 'RA均值', value: 'RA均值', align: 'center', required: true, type: 'text' },
+      { text: 'ROA1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA1', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA2', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA2', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA3', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { 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: '上水平面温差', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '下水平面温差', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '水平最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
-  { text: '工作区域最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '上水平面温差', value: 'upperTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '下水平面温差', value: 'lowerTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '水平最大温差', value: 'maxHorizontalTemperatureDifferent', align: 'center', type: 'text' },
+  { text: '工作区域最大温差', value: 'maxWorkTemperatureDifferent', align: 'center', type: 'text' },
 ])
 
 // ===============================双金属温度计========================
 const bimetalThermometerList = ref<IDetailMeasureList[]>([]) // 双金属温度计表格数据
 
 const columns_bimetal_thermometer = ref([ // 双金属温度计表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '校准点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text', width: '90' },
+  { text: '校准点', value: 'calibratedPoint', align: 'center', required: true, type: 'text' },
   {
     text: '标准器示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    required: false,
+    width: '180',
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '被检示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'measureIndicationValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'measureIndicationValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '示值误差',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingErrorForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingErrorReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
-  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '扩展不确定度U', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
+  { text: '扩展不确定度U', value: 'urel', align: 'center', required: true, type: 'text' },
 ])
 
 // ==============================工业铂铜热电阻=======================
@@ -178,86 +189,93 @@
 const resistanceResultList = ref<IDetailMeasureList[]>([]) // 结果处理表格数据
 
 const columns_resistance_franchise = ref([ // 允差表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '标称温度', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '标称温度', value: 'nominalTemperature', align: 'center', required: true, type: 'text' },
   {
     text: '1',
     value: 'beforeFrictionStroke',
     align: 'center',
     required: true,
+    width: '180',
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'oneValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twoValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '2',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'threeValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '3',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'sixValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '4',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'eightValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '5',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'nineValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'tenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '6',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '均值',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
 ])
 
 // 结果处理表格
 const columns_resistance_result = ref([ // 结果处理表头
-  { text: '项目', value: 'params', align: 'center', required: true },
-  { text: '允差下限', value: 'terminalVoltage', align: 'center', required: true },
-  { text: '允差上限', value: 'rangeRange', align: 'center', required: true },
-  { text: '测量值', value: 'nominalValue', align: 'center', required: true },
+  { text: '项目', value: 'item', align: 'center', required: true },
+  { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
+  { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
+  { text: '测量值', value: 'measureValue', align: 'center', required: true },
 ])
 
 // -------------------------------------------获取详情信息--------------------------------------------------
@@ -279,8 +297,9 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
-
+    // itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0）
+    // itemFormData.value.insulationResistance = `${res.data.insulationResistance}` // 绝缘电阻输入数据
+    // itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` // 角度调整误差（可调整角度仪表）
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
@@ -297,10 +316,169 @@
     loading.close()
   })
 }
+// 恒温槽均匀性初始化数据使用
+const thermostaticBathEvenMap = {
+  1: 'A',
+  2: 'B',
+  3: 'C',
+  4: 'D',
+  5: 'E',
+  6: 'F',
+  7: 'G',
+  0: 'H',
+} as any
 
 // 初始化输入数据
 const initInputData = (data: any) => {
-
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    for (let i = 1; i <= 16; i++) {
+      // 恒温槽波动性
+      thermostaticBathWaveList.value.push({
+        id: '',
+        dataType: '1', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        oneValue: 0,
+        twoValue: 0,
+        threeValue: 0,
+        fourValue: 0,
+        fiveValue: 0,
+        sixValue: 0,
+        sevenValue: 0,
+        eightValue: 0,
+        nineValue: 0,
+        tenValue: 0,
+        elevenValue: 0,
+        twelveValue: 0,
+        thirteenValue: 0,
+        fourteenValue: 0,
+        fifteenValue: 0,
+        maxValue: '', // 最大值
+        minValue: '', // 最小值
+        volatility: '', // 波动性
+        editable: pageType.value !== 'detail',
+      })
+      // 恒温槽均匀性
+      thermostaticBathEvenList.value.push({
+        id: '',
+        dataType: '2', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        location: thermostaticBathEvenMap[i % 8], // 位置
+        oneValue: 0, // ROA1
+        twoValue: 0, // RA1
+        threeValue: 0, // ROA2
+        fourValue: 0, // RA2
+        fiveValue: 0, // ROA3
+        sixValue: 0, // RA3
+        sevenValue: 0, // ROA4
+        eightValue: 0, // RA4
+        nineValue: 0, // ROA均值
+        tenValue: 0, // RA均值
+        upperTemperatureDifferent: '', // 上水平面温差
+        lowerTemperatureDifferent: '', // 下水平面温差
+        maxHorizontalTemperatureDifferent: '', // 水平最大温差
+        maxWorkTemperatureDifferent: '', // 工作区域最大温差
+        editable: pageType.value !== 'detail',
+      })
+    }
+  }
+  else if (itemFormData.value.itemCategoryName === '双金属温度计') {
+    bimetalThermometerList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '示值误差', // 检定项目
+        dataType: '1', // 用于区分两个表格
+        calibratedPoint: item.calibratedPoint! + item.unit, // 校准点+单位
+        indicatingValueForwardStroke: 0, // 标准器示值正行程
+        indicatingValueReverseStroke: 0, // 标准器示值反行程
+        measureIndicationValueForwardStroke: 0, // 被检示值正行程
+        measureIndicationValueReverseStroke: 0, // 被检示值反行程
+        indicatingErrorForwardStroke: 0, // 示值误差正行程
+        indicatingErrorReverseStroke: 0, // 示值误差反行程
+        maximumError: item.maximumError, // 最大允许误差
+        urel: item.urel, // 扩展不确定度U
+        editable: pageType.value !== 'detail',
+      }
+    })
+  }
+  else { // 工业铂铜热电阻
+    // 允差
+    resistanceFranchiseList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '允差',
+        dataType: '1', // 用于区分两个表格
+        nominalTemperature: item.nominalTemperature, // 标称温度
+        oneValue: 0, // 1 标准器示值
+        twoValue: 0, // 1 被检示值
+        threeValue: 0, //	标准器示值2
+        fourValue: 0, //	被检示值2
+        fiveValue: 0, // 标准器示值3
+        sixValue: 0, //	被检示值3
+        sevenValue: 0, //	标准器示值4
+        eightValue: 0, //	被检示值4
+        nineValue: 0, //	标准器示值5
+        tenValue: 0, //	被检示值5
+        elevenValue: 0, //	标准器示值6
+        twelveValue: 0, //	被检示值6
+        thirteenValue: 0, // 标准器示值均值
+        fourteenValue: 0, // 被检示值均值
+        editable: pageType.value !== 'detail',
+      }
+    })
+    // 结果表格
+    resistanceResultList.value = [
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(0℃)/Ω', // 项目
+        allowErrorLower: data[0].allowErrorLower, // 允差下限 data[0] 是 0℃
+        allowErrorUpper: data[0].allowErrorUpper, // 允差上限 data[0] 是 0℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(100℃)/Ω', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'α', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(0℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(100℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△α/10<sup>-6</sup>℃<sup>-1</sup>', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+    ]
+  }
 }
 
 /**
@@ -316,8 +494,10 @@
     belongStandardEquipment, // 检校标准装置字典code
   }
   getItemInfo(params).then((res) => {
-    itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
-    initInputData(res.data.measureItemDataPistonGaugeList)
+    itemFormData.value.isShowAppearance = `${res.data.appearanceFunctionCheck}` === '1' // 外观（1/0）
+    itemFormData.value.isShowInsulationResistance = `${res.data.insulateResistance}` === '1' // 绝缘电阻输入数据
+    itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` === '1' // 角度调整误差（可调整角度仪表）
+    initInputData(res.data.measureItemDataResistanceThermometerList)
   })
 }
 
@@ -326,34 +506,47 @@
 const checkout = () => {
 }
 // -----------------------------------------生成结果处理----------------------------------------
-// 点击生成结果处理
-const createResult = () => {
-  // ElMessage.info('敬请期待')
-  return false
-  // if (!list.value.length) {
-  //   ElMessage.warning('没有检定项数据，无法生成结果')
-  //   return false
-  // }
-  // if (!useCheckList(list.value, measureColumns.value, '检定数据')) {
-  //   return false
-  // }
-  // const params = {
-  //   belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
-  //   itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-  //   measureDataCalibratorList: list.value,
-  // }
-  // calculateHandle(params).then((res) => {
-  //   if (res.data && res.data.length) {
-  //     resultList.value = res.data.map((item: IDetailMeasureList) => {
-  //       return {
-  //         ...item,
-  //       }
-  //     }) // 检定数据
-  //   }
-  //   else {
-  //     list.value = res.data
-  //   }
-  // })
+/**
+ * 点击生成结果处理
+ * @param type top上面表格 bottom下面表格
+ */
+const createResult = (type: 'top' | 'bottom') => {
+  let list = [] as IDetailMeasureList[]
+  let columns = [] as any
+  let title = '' // 提醒标题
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    list = type === 'top' ? thermostaticBathWaveList.value : thermostaticBathEvenList.value
+    columns = type === 'top' ? columns_thermostatic_bath_wave.value : columns_thermostatic_bath_even.value
+    title = type === 'top' ? '波动性测试' : '均匀性测试'
+  }
+  if (!list.length) {
+    ElMessage.warning('没有检定项数据，无法生成结果')
+    return false
+  }
+  if (!useCheckList(list, columns, title)) {
+    return false
+  }
+  tableTop.value = type === 'top'
+  tableBottom.value = type === 'bottom'
+  const params = {
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
+    itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
+    measureDataResistanceThermometerLi: 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
+    // }
+    tableTop.value = false
+    tableBottom.value = false
+  }).catch(() => { tableTop.value = false; tableBottom.value = false })
 }
 
 // -------------------------------------------处理表格函数---------------------------------------
@@ -378,7 +571,7 @@
     itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
     itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
     // 查输入值(查检定项管理的详情)
-    // fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
+    fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
   }
   else {
     itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称
@@ -412,7 +605,7 @@
     >
       <el-row>
         <!-- 外观  -->
-        <el-col :span="8">
+        <el-col v-if="itemFormData.isShowAppearance" :span="8">
           <el-form-item label="外观检查:" prop="appearance">
             <el-select v-model="itemFormData.appearance" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
@@ -424,18 +617,18 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽'" :span="8">
-          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistance">
+        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽' && itemFormData.isShowInsulationResistance" :span="8">
+          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistanceValue">
             <el-input
-              v-model="itemFormData.insulationResistance"
+              v-model="itemFormData.insulationResistanceValue"
               :disabled="pageType === 'detail'"
               :placeholder="pageType === 'detail' ? ' ' : '请输入绝缘电阻'"
             />
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计'" :span="8">
-          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="jdtzwc">
-            <el-select v-model="itemFormData.jdtzwc" :disabled="pageType === 'detail'" class="full-width-input">
+        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计' && itemFormData.isShowAngleAdjustErrort" :span="8">
+          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="angleAdjustError">
+            <el-select v-model="itemFormData.angleAdjustError" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
                 v-for="i in [{ value: '1', name: '不可用' }]"
                 :key="i.value"
@@ -450,29 +643,33 @@
     <!-- 恒温槽  -->
     <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="thermostaticBathWaveList"
         :table-header="columns_thermostatic_bath_wave"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
     <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('bottom')">
           计算结果
         </el-button>
       </template>
       <multi-table
+        v-loading="tableBottom"
         :table-data="thermostaticBathEvenList"
         :table-header="columns_thermostatic_bath_even"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
@@ -532,71 +729,8 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-        </el-table-column>
-      </el-table>
-      <el-form
-        v-if="current === 'measure-data'"
-        ref="formRef"
-        :model="itemFormData"
-        label-width="120"
-        label-position="right"
-        style="margin-top: 20px;"
-      >
-        <el-row>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="α:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : 'α'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- △t(0℃)/℃ -->
-          <el-col :span="8">
-            <el-form-item label="△t(0℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(0℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="△t(100℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(100℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-table
-        ref="tableRef"
-        :data="resistanceResultList"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns_resistance_result"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <template #default="scope">
+            <div v-html="scope.row[item.value]" />
           </template>
         </el-table-column>
       </el-table>

diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index ef9b0f0..806e280 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -57,10 +57,11 @@
         :align="item.align"
         :show-overflow-tooltip="showOverflowTooltip"
       >
-        <template v-if="item.customHeader && item.text !== '-'" #header="scope">
-          <el-link :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
-            {{ item.text }}
+        <template #header="scope">
+          <el-link v-if="item.customHeader && item.text !== '-'" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </el-link>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <el-select
@@ -96,7 +97,6 @@
             v-model="scope.row[item.value]"
             :precision="item.precision"
             :min="min"
-            size="small"
             @change="handleInputNumberChange(scope)"
           />
           <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/measure/item/components/fifth/templateDetail.vue b/src/views/business/measure/item/components/fifth/templateDetail.vue
index ac9cd11..eb14d8e 100644
--- a/src/views/business/measure/item/components/fifth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifth/templateDetail.vue
@@ -78,8 +78,8 @@
   { text: 'dWst/dt', value: 'dwstDt', align: 'center', required: true, width: '200' },
   { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
   { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
-  { text: 'α允差上限/10(-6) ℃(-1)', value: 'aallowErrorUpper', align: 'center', required: true },
-  { text: 'α允差下限/10(-6) ℃(-1)', value: 'aallowErrorLower', align: 'center', required: true },
+  { text: 'α允差上限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorUpper', align: 'center', required: true, width: '160' },
+  { text: 'α允差下限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorLower', align: 'center', required: true, width: '160' },
 ])
 
 // ------------------------------------------字典----------------------------------------------
@@ -505,7 +505,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <!-- 校准点、扩展不确定度u -->
@@ -540,7 +541,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <el-input-number
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
index 9311317..f8945fc 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
@@ -1,5 +1,60 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
   id: string
+  dataId?: string //	检定数据管理基础信息表id
+  dataType: string //	检定数据类型(一个检定数据中区分两个表格)(字典code)
 
+  calibratedPoint?: string //	校准点
+  dataCategory?: string //	检定数据类别(1检定数据，2计算结果数据)
+  drDt?: string //	dR/dt，该参数在结果处理表中每行都要传
+  dwstDt?: string //	dWst/dt，该参数在结果处理表中每行都要传
+  location?: string //	位置
+  lowerTemperatureDifferent?: string //	下水平面温差
+  maxHorizontalTemperatureDifferent?: string // 水平最大温差
+  maxValue?: string //	最大值
+  maxWorkTemperatureDifferent?: string // 工作区域最大温差
+  maximumError?: string //	最大允许误差
+  minValue?: string //		最小值
+  nominalTemperature?: string //		标称温度
+  nominalValue?: string //		α标称值(字典value)，该参数在结果处理表中每行都要传
+  rank?: string //	级别(字典value)，该参数在结果处理表中每行都要传
+  rtp?: string //
+  rvalue?: string //
+  unit?: string //		单位
+  upperLowerPoint?: string //		上/下限点
+  upperTemperatureDifferent?: string //		上水平面温差
+  urel?: string //		扩展不确定度
+  volatility?: string //		波动性
+  ws?: string //	ws
+
+  indicatingErrorForwardStroke?: string //	示值误差正行程
+  indicatingErrorReverseStroke?: string //	示值误差反行程
+  indicatingValueForwardStroke?: string //	标准器示值正行程
+  indicatingValueReverseStroke?: string //	标准器示值反行程
+  measureIndicationValueForwardStroke?: string //		被检示值正行程
+  measureIndicationValueReverseStroke?: string //		被检示值反行程
+
+  item?: string //	项目(结果表)
+  allowErrorLower?: string //	允差下限(结果表)
+  allowErrorUpper?: string //	允差上限(结果表)
+  measureValue?: string //		测量值(结果表)
+
+  oneValue?: string | number //		示值1(波动性测试)/ROA1(均匀性测试)/标准器示值1(工业铂铜热电阻)
+  twoValue?: string | number//		示值2(波动性测试)/RA1(均匀性测试)/被检示值1(工业铂铜热电阻)
+  threeValue?: string | number//		示值3(波动性测试)/ROA2(均匀性测试)/标准器示值2(工业铂铜热电阻)
+  fourValue?: string | number//	示值4(波动性测试)/RA2(均匀性测试)/被检示值2(工业铂铜热电阻)
+  fiveValue?: string | number//	示值5(波动性测试)/ROA3(均匀性测试)/标准器示值3(工业铂铜热电阻)
+  sixValue?: string | number//		示值6(波动性测试)/RA3(均匀性测试)/被检示值3(工业铂铜热电阻)
+  sevenValue?: string | number//		示值7(波动性测试)/ROA4(均匀性测试)/标准器示值4(工业铂铜热电阻)
+  eightValue?: string | number//	示值8(波动性测试)/RA4(均匀性测试)/被检示值4(工业铂铜热电阻)
+  nineValue?: string | number//		示值9(波动性测试)/ROA均值(均匀性测试)/标准器示值5(工业铂铜热电阻)
+  tenValue?: string | number//		示值10(波动性测试)/RA均值(均匀性测试)/被检示值5(工业铂铜热电阻)
+  elevenValue?: string | number//	示值11(波动性测试)/标准器示值6(工业铂铜热电阻)
+  twelveValue?: string | number//		示值12(波动性测试)/被检示值6(工业铂铜热电阻)
+  thirteenValue?: string | number//		示值13(波动性测试)/标准器示值均值(工业铂铜热电阻)
+  fourteenValue?: string | number//	示值14(波动性测试)/被检示值均值(工业铂铜热电阻)
+  fifteenValue?: string | number//	示值15(波动性测试)
+
+  editable?: boolean // 表格是否可编辑
+  params?: string // 检定项目
 }
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
index 6f785bf..e9d0e60 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
@@ -1,4 +1,4 @@
-<!-- 第6套：安全阀标准装置 -->
+<!-- 第5套：二等铂 -->
 <!-- 检定数据管理详情模板 -->
 <script lang="ts" setup name="MeasureDataTemplateDetail">
 import { ref } from 'vue'
@@ -34,12 +34,19 @@
   itemCategoryId: '', // 设备检定项分类名称id
   belongStandardEquipment: '', // 标准装置code
   belongStandardEquipmentName: '', // 标准装置名称
+
   appearance: '1', // 外观检查
-  insulationResistance: '', // 绝缘电阻
-  jdtzwc: '1', //  角度调整误差（可调整角度仪表）
+  isShowAppearance: false, // 外观检查输入数据--用来判断外观是否展示
+  isShowInsulationResistance: false, // 绝缘电阻输入数据--判断是否展示
+  insulationResistanceValue: '', // 绝缘电阻值
+  angleAdjustError: '1', //  角度调整误差（可调整角度仪表）
+  isShowAngleAdjustErrort: false, //  角度调整误差（可调整角度仪表）输入数据--判断是否展示
+
   conclusion: '', // 检验结论
   remark: '', // 备注
 })
+const tableTop = ref(false) // 上面表格loading
+const tableBottom = ref(false) // 下面表格loading
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -73,104 +80,108 @@
 const thermostaticBathWaveList = ref<IDetailMeasureList[]>([]) // 恒温槽-波动性测试表格数据
 const thermostaticBathEvenList = ref<IDetailMeasureList[]>([]) // 恒温槽-均匀性测试表格数据
 const columns_thermostatic_bath_wave = ref([ // 恒温槽--波动性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  // 下/上限点：指标上限、指标下限
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, type: 'text' },
-      { text: '2', value: '2', align: 'center', required: true, type: 'text' },
-      { text: '3', value: '3', align: 'center', required: true, type: 'text' },
-      { text: '4', value: '4', align: 'center', required: true, type: 'text' },
-      { text: '5', value: '5', align: 'center', required: true, type: 'text' },
-      { text: '6', value: '6', align: 'center', required: true, type: 'text' },
-      { text: '7', value: '7', align: 'center', required: true, type: 'text' },
-      { text: '8', value: '8', align: 'center', required: true, type: 'text' },
-      { text: '9', value: '9', align: 'center', required: true, type: 'text' },
-      { text: '10', value: '10', align: 'center', required: true, type: 'text' },
-      { text: '11', value: '11', align: 'center', required: true, type: 'text' },
-      { text: '12', value: '12', align: 'center', required: true, type: 'text' },
-      { text: '13', value: '13', align: 'center', required: true, type: 'text' },
-      { text: '14', value: '14', align: 'center', required: true, type: 'text' },
-      { text: '15', value: '15', align: 'center', required: true, type: 'text' },
+      { text: '1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '2', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '3', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '4', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '5', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '6', value: 'sixValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '7', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '8', value: 'eightValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '9', value: 'nineValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '10', value: 'tenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '11', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '12', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '13', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '14', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '15', value: 'fifteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
     ],
   },
-  { text: '最大值', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '最小值', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '波动性', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '最大值', value: 'maxValue', align: 'center', required: true, type: 'text' },
+  { text: '最小值', value: 'minValue', align: 'center', required: true, type: 'text' },
+  { text: '波动性', value: 'volatility', align: 'center', type: 'text' },
 ])
 
 const columns_thermostatic_bath_even = ref([ // 恒温槽--均匀性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
-  { text: '位置', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  { text: '位置', value: 'location', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: 'ROA1', value: 'ROA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA1', value: 'RA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA2', value: 'RA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA2', value: 'ROA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA3', value: 'ROA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA3', value: 'RA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA4', value: 'RA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA4', value: 'ROA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA均值', value: 'ROA均值', align: 'center', required: true, type: 'text' },
-      { text: 'RA均值', value: 'RA均值', align: 'center', required: true, type: 'text' },
+      { text: 'ROA1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA1', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA2', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA2', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA3', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { 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: '上水平面温差', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '下水平面温差', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '水平最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
-  { text: '工作区域最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '上水平面温差', value: 'upperTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '下水平面温差', value: 'lowerTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '水平最大温差', value: 'maxHorizontalTemperatureDifferent', align: 'center', type: 'text' },
+  { text: '工作区域最大温差', value: 'maxWorkTemperatureDifferent', align: 'center', type: 'text' },
 ])
 
 // ===============================双金属温度计========================
 const bimetalThermometerList = ref<IDetailMeasureList[]>([]) // 双金属温度计表格数据
 
 const columns_bimetal_thermometer = ref([ // 双金属温度计表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '校准点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text', width: '90' },
+  { text: '校准点', value: 'calibratedPoint', align: 'center', required: true, type: 'text' },
   {
     text: '标准器示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    required: false,
+    width: '180',
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '被检示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'measureIndicationValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'measureIndicationValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '示值误差',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingErrorForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingErrorReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
-  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '扩展不确定度U', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
+  { text: '扩展不确定度U', value: 'urel', align: 'center', required: true, type: 'text' },
 ])
 
 // ==============================工业铂铜热电阻=======================
@@ -178,86 +189,93 @@
 const resistanceResultList = ref<IDetailMeasureList[]>([]) // 结果处理表格数据
 
 const columns_resistance_franchise = ref([ // 允差表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '标称温度', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '标称温度', value: 'nominalTemperature', align: 'center', required: true, type: 'text' },
   {
     text: '1',
     value: 'beforeFrictionStroke',
     align: 'center',
     required: true,
+    width: '180',
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'oneValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twoValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '2',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'threeValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '3',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'sixValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '4',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'eightValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '5',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'nineValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'tenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '6',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '均值',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
 ])
 
 // 结果处理表格
 const columns_resistance_result = ref([ // 结果处理表头
-  { text: '项目', value: 'params', align: 'center', required: true },
-  { text: '允差下限', value: 'terminalVoltage', align: 'center', required: true },
-  { text: '允差上限', value: 'rangeRange', align: 'center', required: true },
-  { text: '测量值', value: 'nominalValue', align: 'center', required: true },
+  { text: '项目', value: 'item', align: 'center', required: true },
+  { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
+  { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
+  { text: '测量值', value: 'measureValue', align: 'center', required: true },
 ])
 
 // -------------------------------------------获取详情信息--------------------------------------------------
@@ -279,8 +297,9 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
-
+    // itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0）
+    // itemFormData.value.insulationResistance = `${res.data.insulationResistance}` // 绝缘电阻输入数据
+    // itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` // 角度调整误差（可调整角度仪表）
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
@@ -297,10 +316,169 @@
     loading.close()
   })
 }
+// 恒温槽均匀性初始化数据使用
+const thermostaticBathEvenMap = {
+  1: 'A',
+  2: 'B',
+  3: 'C',
+  4: 'D',
+  5: 'E',
+  6: 'F',
+  7: 'G',
+  0: 'H',
+} as any
 
 // 初始化输入数据
 const initInputData = (data: any) => {
-
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    for (let i = 1; i <= 16; i++) {
+      // 恒温槽波动性
+      thermostaticBathWaveList.value.push({
+        id: '',
+        dataType: '1', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        oneValue: 0,
+        twoValue: 0,
+        threeValue: 0,
+        fourValue: 0,
+        fiveValue: 0,
+        sixValue: 0,
+        sevenValue: 0,
+        eightValue: 0,
+        nineValue: 0,
+        tenValue: 0,
+        elevenValue: 0,
+        twelveValue: 0,
+        thirteenValue: 0,
+        fourteenValue: 0,
+        fifteenValue: 0,
+        maxValue: '', // 最大值
+        minValue: '', // 最小值
+        volatility: '', // 波动性
+        editable: pageType.value !== 'detail',
+      })
+      // 恒温槽均匀性
+      thermostaticBathEvenList.value.push({
+        id: '',
+        dataType: '2', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        location: thermostaticBathEvenMap[i % 8], // 位置
+        oneValue: 0, // ROA1
+        twoValue: 0, // RA1
+        threeValue: 0, // ROA2
+        fourValue: 0, // RA2
+        fiveValue: 0, // ROA3
+        sixValue: 0, // RA3
+        sevenValue: 0, // ROA4
+        eightValue: 0, // RA4
+        nineValue: 0, // ROA均值
+        tenValue: 0, // RA均值
+        upperTemperatureDifferent: '', // 上水平面温差
+        lowerTemperatureDifferent: '', // 下水平面温差
+        maxHorizontalTemperatureDifferent: '', // 水平最大温差
+        maxWorkTemperatureDifferent: '', // 工作区域最大温差
+        editable: pageType.value !== 'detail',
+      })
+    }
+  }
+  else if (itemFormData.value.itemCategoryName === '双金属温度计') {
+    bimetalThermometerList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '示值误差', // 检定项目
+        dataType: '1', // 用于区分两个表格
+        calibratedPoint: item.calibratedPoint! + item.unit, // 校准点+单位
+        indicatingValueForwardStroke: 0, // 标准器示值正行程
+        indicatingValueReverseStroke: 0, // 标准器示值反行程
+        measureIndicationValueForwardStroke: 0, // 被检示值正行程
+        measureIndicationValueReverseStroke: 0, // 被检示值反行程
+        indicatingErrorForwardStroke: 0, // 示值误差正行程
+        indicatingErrorReverseStroke: 0, // 示值误差反行程
+        maximumError: item.maximumError, // 最大允许误差
+        urel: item.urel, // 扩展不确定度U
+        editable: pageType.value !== 'detail',
+      }
+    })
+  }
+  else { // 工业铂铜热电阻
+    // 允差
+    resistanceFranchiseList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '允差',
+        dataType: '1', // 用于区分两个表格
+        nominalTemperature: item.nominalTemperature, // 标称温度
+        oneValue: 0, // 1 标准器示值
+        twoValue: 0, // 1 被检示值
+        threeValue: 0, //	标准器示值2
+        fourValue: 0, //	被检示值2
+        fiveValue: 0, // 标准器示值3
+        sixValue: 0, //	被检示值3
+        sevenValue: 0, //	标准器示值4
+        eightValue: 0, //	被检示值4
+        nineValue: 0, //	标准器示值5
+        tenValue: 0, //	被检示值5
+        elevenValue: 0, //	标准器示值6
+        twelveValue: 0, //	被检示值6
+        thirteenValue: 0, // 标准器示值均值
+        fourteenValue: 0, // 被检示值均值
+        editable: pageType.value !== 'detail',
+      }
+    })
+    // 结果表格
+    resistanceResultList.value = [
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(0℃)/Ω', // 项目
+        allowErrorLower: data[0].allowErrorLower, // 允差下限 data[0] 是 0℃
+        allowErrorUpper: data[0].allowErrorUpper, // 允差上限 data[0] 是 0℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(100℃)/Ω', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'α', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(0℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(100℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△α/10<sup>-6</sup>℃<sup>-1</sup>', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+    ]
+  }
 }
 
 /**
@@ -316,8 +494,10 @@
     belongStandardEquipment, // 检校标准装置字典code
   }
   getItemInfo(params).then((res) => {
-    itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
-    initInputData(res.data.measureItemDataPistonGaugeList)
+    itemFormData.value.isShowAppearance = `${res.data.appearanceFunctionCheck}` === '1' // 外观（1/0）
+    itemFormData.value.isShowInsulationResistance = `${res.data.insulateResistance}` === '1' // 绝缘电阻输入数据
+    itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` === '1' // 角度调整误差（可调整角度仪表）
+    initInputData(res.data.measureItemDataResistanceThermometerList)
   })
 }
 
@@ -326,34 +506,47 @@
 const checkout = () => {
 }
 // -----------------------------------------生成结果处理----------------------------------------
-// 点击生成结果处理
-const createResult = () => {
-  // ElMessage.info('敬请期待')
-  return false
-  // if (!list.value.length) {
-  //   ElMessage.warning('没有检定项数据，无法生成结果')
-  //   return false
-  // }
-  // if (!useCheckList(list.value, measureColumns.value, '检定数据')) {
-  //   return false
-  // }
-  // const params = {
-  //   belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
-  //   itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-  //   measureDataCalibratorList: list.value,
-  // }
-  // calculateHandle(params).then((res) => {
-  //   if (res.data && res.data.length) {
-  //     resultList.value = res.data.map((item: IDetailMeasureList) => {
-  //       return {
-  //         ...item,
-  //       }
-  //     }) // 检定数据
-  //   }
-  //   else {
-  //     list.value = res.data
-  //   }
-  // })
+/**
+ * 点击生成结果处理
+ * @param type top上面表格 bottom下面表格
+ */
+const createResult = (type: 'top' | 'bottom') => {
+  let list = [] as IDetailMeasureList[]
+  let columns = [] as any
+  let title = '' // 提醒标题
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    list = type === 'top' ? thermostaticBathWaveList.value : thermostaticBathEvenList.value
+    columns = type === 'top' ? columns_thermostatic_bath_wave.value : columns_thermostatic_bath_even.value
+    title = type === 'top' ? '波动性测试' : '均匀性测试'
+  }
+  if (!list.length) {
+    ElMessage.warning('没有检定项数据，无法生成结果')
+    return false
+  }
+  if (!useCheckList(list, columns, title)) {
+    return false
+  }
+  tableTop.value = type === 'top'
+  tableBottom.value = type === 'bottom'
+  const params = {
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
+    itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
+    measureDataResistanceThermometerLi: 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
+    // }
+    tableTop.value = false
+    tableBottom.value = false
+  }).catch(() => { tableTop.value = false; tableBottom.value = false })
 }
 
 // -------------------------------------------处理表格函数---------------------------------------
@@ -378,7 +571,7 @@
     itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
     itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
     // 查输入值(查检定项管理的详情)
-    // fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
+    fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
   }
   else {
     itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称
@@ -412,7 +605,7 @@
     >
       <el-row>
         <!-- 外观  -->
-        <el-col :span="8">
+        <el-col v-if="itemFormData.isShowAppearance" :span="8">
           <el-form-item label="外观检查:" prop="appearance">
             <el-select v-model="itemFormData.appearance" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
@@ -424,18 +617,18 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽'" :span="8">
-          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistance">
+        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽' && itemFormData.isShowInsulationResistance" :span="8">
+          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistanceValue">
             <el-input
-              v-model="itemFormData.insulationResistance"
+              v-model="itemFormData.insulationResistanceValue"
               :disabled="pageType === 'detail'"
               :placeholder="pageType === 'detail' ? ' ' : '请输入绝缘电阻'"
             />
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计'" :span="8">
-          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="jdtzwc">
-            <el-select v-model="itemFormData.jdtzwc" :disabled="pageType === 'detail'" class="full-width-input">
+        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计' && itemFormData.isShowAngleAdjustErrort" :span="8">
+          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="angleAdjustError">
+            <el-select v-model="itemFormData.angleAdjustError" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
                 v-for="i in [{ value: '1', name: '不可用' }]"
                 :key="i.value"
@@ -450,29 +643,33 @@
     <!-- 恒温槽  -->
     <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="thermostaticBathWaveList"
         :table-header="columns_thermostatic_bath_wave"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
     <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('bottom')">
           计算结果
         </el-button>
       </template>
       <multi-table
+        v-loading="tableBottom"
         :table-data="thermostaticBathEvenList"
         :table-header="columns_thermostatic_bath_even"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
@@ -532,71 +729,8 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-        </el-table-column>
-      </el-table>
-      <el-form
-        v-if="current === 'measure-data'"
-        ref="formRef"
-        :model="itemFormData"
-        label-width="120"
-        label-position="right"
-        style="margin-top: 20px;"
-      >
-        <el-row>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="α:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : 'α'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- △t(0℃)/℃ -->
-          <el-col :span="8">
-            <el-form-item label="△t(0℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(0℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="△t(100℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(100℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-table
-        ref="tableRef"
-        :data="resistanceResultList"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns_resistance_result"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <template #default="scope">
+            <div v-html="scope.row[item.value]" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/equipement/standard/book/components/config/first/config.vue b/src/views/equipement/standard/book/components/config/first/config.vue
index ebf707d..b3c100c 100644
--- a/src/views/equipement/standard/book/components/config/first/config.vue
+++ b/src/views/equipement/standard/book/components/config/first/config.vue
@@ -237,6 +237,7 @@
           checkType: item.checkType.join(','), // 核查类型
           thoroughfare: item.thoroughfare.join(','), // 通道
           remark: form.value.remark,
+          equipmentId: equipmentId.value, // 配套设备id
         }
       }),
     ], // 多功能校准源检定项数据(一个核查项分类对应一个核查项数据表)

diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index ef9b0f0..806e280 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -57,10 +57,11 @@
         :align="item.align"
         :show-overflow-tooltip="showOverflowTooltip"
       >
-        <template v-if="item.customHeader && item.text !== '-'" #header="scope">
-          <el-link :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
-            {{ item.text }}
+        <template #header="scope">
+          <el-link v-if="item.customHeader && item.text !== '-'" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </el-link>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <el-select
@@ -96,7 +97,6 @@
             v-model="scope.row[item.value]"
             :precision="item.precision"
             :min="min"
-            size="small"
             @change="handleInputNumberChange(scope)"
           />
           <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/measure/item/components/fifth/templateDetail.vue b/src/views/business/measure/item/components/fifth/templateDetail.vue
index ac9cd11..eb14d8e 100644
--- a/src/views/business/measure/item/components/fifth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifth/templateDetail.vue
@@ -78,8 +78,8 @@
   { text: 'dWst/dt', value: 'dwstDt', align: 'center', required: true, width: '200' },
   { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
   { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
-  { text: 'α允差上限/10(-6) ℃(-1)', value: 'aallowErrorUpper', align: 'center', required: true },
-  { text: 'α允差下限/10(-6) ℃(-1)', value: 'aallowErrorLower', align: 'center', required: true },
+  { text: 'α允差上限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorUpper', align: 'center', required: true, width: '160' },
+  { text: 'α允差下限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorLower', align: 'center', required: true, width: '160' },
 ])
 
 // ------------------------------------------字典----------------------------------------------
@@ -505,7 +505,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <!-- 校准点、扩展不确定度u -->
@@ -540,7 +541,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <el-input-number
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
index 9311317..f8945fc 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
@@ -1,5 +1,60 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
   id: string
+  dataId?: string //	检定数据管理基础信息表id
+  dataType: string //	检定数据类型(一个检定数据中区分两个表格)(字典code)
 
+  calibratedPoint?: string //	校准点
+  dataCategory?: string //	检定数据类别(1检定数据，2计算结果数据)
+  drDt?: string //	dR/dt，该参数在结果处理表中每行都要传
+  dwstDt?: string //	dWst/dt，该参数在结果处理表中每行都要传
+  location?: string //	位置
+  lowerTemperatureDifferent?: string //	下水平面温差
+  maxHorizontalTemperatureDifferent?: string // 水平最大温差
+  maxValue?: string //	最大值
+  maxWorkTemperatureDifferent?: string // 工作区域最大温差
+  maximumError?: string //	最大允许误差
+  minValue?: string //		最小值
+  nominalTemperature?: string //		标称温度
+  nominalValue?: string //		α标称值(字典value)，该参数在结果处理表中每行都要传
+  rank?: string //	级别(字典value)，该参数在结果处理表中每行都要传
+  rtp?: string //
+  rvalue?: string //
+  unit?: string //		单位
+  upperLowerPoint?: string //		上/下限点
+  upperTemperatureDifferent?: string //		上水平面温差
+  urel?: string //		扩展不确定度
+  volatility?: string //		波动性
+  ws?: string //	ws
+
+  indicatingErrorForwardStroke?: string //	示值误差正行程
+  indicatingErrorReverseStroke?: string //	示值误差反行程
+  indicatingValueForwardStroke?: string //	标准器示值正行程
+  indicatingValueReverseStroke?: string //	标准器示值反行程
+  measureIndicationValueForwardStroke?: string //		被检示值正行程
+  measureIndicationValueReverseStroke?: string //		被检示值反行程
+
+  item?: string //	项目(结果表)
+  allowErrorLower?: string //	允差下限(结果表)
+  allowErrorUpper?: string //	允差上限(结果表)
+  measureValue?: string //		测量值(结果表)
+
+  oneValue?: string | number //		示值1(波动性测试)/ROA1(均匀性测试)/标准器示值1(工业铂铜热电阻)
+  twoValue?: string | number//		示值2(波动性测试)/RA1(均匀性测试)/被检示值1(工业铂铜热电阻)
+  threeValue?: string | number//		示值3(波动性测试)/ROA2(均匀性测试)/标准器示值2(工业铂铜热电阻)
+  fourValue?: string | number//	示值4(波动性测试)/RA2(均匀性测试)/被检示值2(工业铂铜热电阻)
+  fiveValue?: string | number//	示值5(波动性测试)/ROA3(均匀性测试)/标准器示值3(工业铂铜热电阻)
+  sixValue?: string | number//		示值6(波动性测试)/RA3(均匀性测试)/被检示值3(工业铂铜热电阻)
+  sevenValue?: string | number//		示值7(波动性测试)/ROA4(均匀性测试)/标准器示值4(工业铂铜热电阻)
+  eightValue?: string | number//	示值8(波动性测试)/RA4(均匀性测试)/被检示值4(工业铂铜热电阻)
+  nineValue?: string | number//		示值9(波动性测试)/ROA均值(均匀性测试)/标准器示值5(工业铂铜热电阻)
+  tenValue?: string | number//		示值10(波动性测试)/RA均值(均匀性测试)/被检示值5(工业铂铜热电阻)
+  elevenValue?: string | number//	示值11(波动性测试)/标准器示值6(工业铂铜热电阻)
+  twelveValue?: string | number//		示值12(波动性测试)/被检示值6(工业铂铜热电阻)
+  thirteenValue?: string | number//		示值13(波动性测试)/标准器示值均值(工业铂铜热电阻)
+  fourteenValue?: string | number//	示值14(波动性测试)/被检示值均值(工业铂铜热电阻)
+  fifteenValue?: string | number//	示值15(波动性测试)
+
+  editable?: boolean // 表格是否可编辑
+  params?: string // 检定项目
 }
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
index 6f785bf..e9d0e60 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
@@ -1,4 +1,4 @@
-<!-- 第6套：安全阀标准装置 -->
+<!-- 第5套：二等铂 -->
 <!-- 检定数据管理详情模板 -->
 <script lang="ts" setup name="MeasureDataTemplateDetail">
 import { ref } from 'vue'
@@ -34,12 +34,19 @@
   itemCategoryId: '', // 设备检定项分类名称id
   belongStandardEquipment: '', // 标准装置code
   belongStandardEquipmentName: '', // 标准装置名称
+
   appearance: '1', // 外观检查
-  insulationResistance: '', // 绝缘电阻
-  jdtzwc: '1', //  角度调整误差（可调整角度仪表）
+  isShowAppearance: false, // 外观检查输入数据--用来判断外观是否展示
+  isShowInsulationResistance: false, // 绝缘电阻输入数据--判断是否展示
+  insulationResistanceValue: '', // 绝缘电阻值
+  angleAdjustError: '1', //  角度调整误差（可调整角度仪表）
+  isShowAngleAdjustErrort: false, //  角度调整误差（可调整角度仪表）输入数据--判断是否展示
+
   conclusion: '', // 检验结论
   remark: '', // 备注
 })
+const tableTop = ref(false) // 上面表格loading
+const tableBottom = ref(false) // 下面表格loading
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -73,104 +80,108 @@
 const thermostaticBathWaveList = ref<IDetailMeasureList[]>([]) // 恒温槽-波动性测试表格数据
 const thermostaticBathEvenList = ref<IDetailMeasureList[]>([]) // 恒温槽-均匀性测试表格数据
 const columns_thermostatic_bath_wave = ref([ // 恒温槽--波动性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  // 下/上限点：指标上限、指标下限
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, type: 'text' },
-      { text: '2', value: '2', align: 'center', required: true, type: 'text' },
-      { text: '3', value: '3', align: 'center', required: true, type: 'text' },
-      { text: '4', value: '4', align: 'center', required: true, type: 'text' },
-      { text: '5', value: '5', align: 'center', required: true, type: 'text' },
-      { text: '6', value: '6', align: 'center', required: true, type: 'text' },
-      { text: '7', value: '7', align: 'center', required: true, type: 'text' },
-      { text: '8', value: '8', align: 'center', required: true, type: 'text' },
-      { text: '9', value: '9', align: 'center', required: true, type: 'text' },
-      { text: '10', value: '10', align: 'center', required: true, type: 'text' },
-      { text: '11', value: '11', align: 'center', required: true, type: 'text' },
-      { text: '12', value: '12', align: 'center', required: true, type: 'text' },
-      { text: '13', value: '13', align: 'center', required: true, type: 'text' },
-      { text: '14', value: '14', align: 'center', required: true, type: 'text' },
-      { text: '15', value: '15', align: 'center', required: true, type: 'text' },
+      { text: '1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '2', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '3', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '4', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '5', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '6', value: 'sixValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '7', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '8', value: 'eightValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '9', value: 'nineValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '10', value: 'tenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '11', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '12', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '13', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '14', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '15', value: 'fifteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
     ],
   },
-  { text: '最大值', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '最小值', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '波动性', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '最大值', value: 'maxValue', align: 'center', required: true, type: 'text' },
+  { text: '最小值', value: 'minValue', align: 'center', required: true, type: 'text' },
+  { text: '波动性', value: 'volatility', align: 'center', type: 'text' },
 ])
 
 const columns_thermostatic_bath_even = ref([ // 恒温槽--均匀性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
-  { text: '位置', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  { text: '位置', value: 'location', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: 'ROA1', value: 'ROA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA1', value: 'RA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA2', value: 'RA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA2', value: 'ROA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA3', value: 'ROA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA3', value: 'RA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA4', value: 'RA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA4', value: 'ROA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA均值', value: 'ROA均值', align: 'center', required: true, type: 'text' },
-      { text: 'RA均值', value: 'RA均值', align: 'center', required: true, type: 'text' },
+      { text: 'ROA1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA1', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA2', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA2', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA3', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { 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: '上水平面温差', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '下水平面温差', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '水平最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
-  { text: '工作区域最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '上水平面温差', value: 'upperTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '下水平面温差', value: 'lowerTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '水平最大温差', value: 'maxHorizontalTemperatureDifferent', align: 'center', type: 'text' },
+  { text: '工作区域最大温差', value: 'maxWorkTemperatureDifferent', align: 'center', type: 'text' },
 ])
 
 // ===============================双金属温度计========================
 const bimetalThermometerList = ref<IDetailMeasureList[]>([]) // 双金属温度计表格数据
 
 const columns_bimetal_thermometer = ref([ // 双金属温度计表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '校准点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text', width: '90' },
+  { text: '校准点', value: 'calibratedPoint', align: 'center', required: true, type: 'text' },
   {
     text: '标准器示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    required: false,
+    width: '180',
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '被检示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'measureIndicationValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'measureIndicationValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '示值误差',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingErrorForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingErrorReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
-  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '扩展不确定度U', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
+  { text: '扩展不确定度U', value: 'urel', align: 'center', required: true, type: 'text' },
 ])
 
 // ==============================工业铂铜热电阻=======================
@@ -178,86 +189,93 @@
 const resistanceResultList = ref<IDetailMeasureList[]>([]) // 结果处理表格数据
 
 const columns_resistance_franchise = ref([ // 允差表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '标称温度', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '标称温度', value: 'nominalTemperature', align: 'center', required: true, type: 'text' },
   {
     text: '1',
     value: 'beforeFrictionStroke',
     align: 'center',
     required: true,
+    width: '180',
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'oneValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twoValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '2',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'threeValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '3',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'sixValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '4',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'eightValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '5',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'nineValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'tenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '6',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '均值',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
 ])
 
 // 结果处理表格
 const columns_resistance_result = ref([ // 结果处理表头
-  { text: '项目', value: 'params', align: 'center', required: true },
-  { text: '允差下限', value: 'terminalVoltage', align: 'center', required: true },
-  { text: '允差上限', value: 'rangeRange', align: 'center', required: true },
-  { text: '测量值', value: 'nominalValue', align: 'center', required: true },
+  { text: '项目', value: 'item', align: 'center', required: true },
+  { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
+  { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
+  { text: '测量值', value: 'measureValue', align: 'center', required: true },
 ])
 
 // -------------------------------------------获取详情信息--------------------------------------------------
@@ -279,8 +297,9 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
-
+    // itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0）
+    // itemFormData.value.insulationResistance = `${res.data.insulationResistance}` // 绝缘电阻输入数据
+    // itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` // 角度调整误差（可调整角度仪表）
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
@@ -297,10 +316,169 @@
     loading.close()
   })
 }
+// 恒温槽均匀性初始化数据使用
+const thermostaticBathEvenMap = {
+  1: 'A',
+  2: 'B',
+  3: 'C',
+  4: 'D',
+  5: 'E',
+  6: 'F',
+  7: 'G',
+  0: 'H',
+} as any
 
 // 初始化输入数据
 const initInputData = (data: any) => {
-
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    for (let i = 1; i <= 16; i++) {
+      // 恒温槽波动性
+      thermostaticBathWaveList.value.push({
+        id: '',
+        dataType: '1', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        oneValue: 0,
+        twoValue: 0,
+        threeValue: 0,
+        fourValue: 0,
+        fiveValue: 0,
+        sixValue: 0,
+        sevenValue: 0,
+        eightValue: 0,
+        nineValue: 0,
+        tenValue: 0,
+        elevenValue: 0,
+        twelveValue: 0,
+        thirteenValue: 0,
+        fourteenValue: 0,
+        fifteenValue: 0,
+        maxValue: '', // 最大值
+        minValue: '', // 最小值
+        volatility: '', // 波动性
+        editable: pageType.value !== 'detail',
+      })
+      // 恒温槽均匀性
+      thermostaticBathEvenList.value.push({
+        id: '',
+        dataType: '2', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        location: thermostaticBathEvenMap[i % 8], // 位置
+        oneValue: 0, // ROA1
+        twoValue: 0, // RA1
+        threeValue: 0, // ROA2
+        fourValue: 0, // RA2
+        fiveValue: 0, // ROA3
+        sixValue: 0, // RA3
+        sevenValue: 0, // ROA4
+        eightValue: 0, // RA4
+        nineValue: 0, // ROA均值
+        tenValue: 0, // RA均值
+        upperTemperatureDifferent: '', // 上水平面温差
+        lowerTemperatureDifferent: '', // 下水平面温差
+        maxHorizontalTemperatureDifferent: '', // 水平最大温差
+        maxWorkTemperatureDifferent: '', // 工作区域最大温差
+        editable: pageType.value !== 'detail',
+      })
+    }
+  }
+  else if (itemFormData.value.itemCategoryName === '双金属温度计') {
+    bimetalThermometerList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '示值误差', // 检定项目
+        dataType: '1', // 用于区分两个表格
+        calibratedPoint: item.calibratedPoint! + item.unit, // 校准点+单位
+        indicatingValueForwardStroke: 0, // 标准器示值正行程
+        indicatingValueReverseStroke: 0, // 标准器示值反行程
+        measureIndicationValueForwardStroke: 0, // 被检示值正行程
+        measureIndicationValueReverseStroke: 0, // 被检示值反行程
+        indicatingErrorForwardStroke: 0, // 示值误差正行程
+        indicatingErrorReverseStroke: 0, // 示值误差反行程
+        maximumError: item.maximumError, // 最大允许误差
+        urel: item.urel, // 扩展不确定度U
+        editable: pageType.value !== 'detail',
+      }
+    })
+  }
+  else { // 工业铂铜热电阻
+    // 允差
+    resistanceFranchiseList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '允差',
+        dataType: '1', // 用于区分两个表格
+        nominalTemperature: item.nominalTemperature, // 标称温度
+        oneValue: 0, // 1 标准器示值
+        twoValue: 0, // 1 被检示值
+        threeValue: 0, //	标准器示值2
+        fourValue: 0, //	被检示值2
+        fiveValue: 0, // 标准器示值3
+        sixValue: 0, //	被检示值3
+        sevenValue: 0, //	标准器示值4
+        eightValue: 0, //	被检示值4
+        nineValue: 0, //	标准器示值5
+        tenValue: 0, //	被检示值5
+        elevenValue: 0, //	标准器示值6
+        twelveValue: 0, //	被检示值6
+        thirteenValue: 0, // 标准器示值均值
+        fourteenValue: 0, // 被检示值均值
+        editable: pageType.value !== 'detail',
+      }
+    })
+    // 结果表格
+    resistanceResultList.value = [
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(0℃)/Ω', // 项目
+        allowErrorLower: data[0].allowErrorLower, // 允差下限 data[0] 是 0℃
+        allowErrorUpper: data[0].allowErrorUpper, // 允差上限 data[0] 是 0℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(100℃)/Ω', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'α', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(0℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(100℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△α/10<sup>-6</sup>℃<sup>-1</sup>', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+    ]
+  }
 }
 
 /**
@@ -316,8 +494,10 @@
     belongStandardEquipment, // 检校标准装置字典code
   }
   getItemInfo(params).then((res) => {
-    itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
-    initInputData(res.data.measureItemDataPistonGaugeList)
+    itemFormData.value.isShowAppearance = `${res.data.appearanceFunctionCheck}` === '1' // 外观（1/0）
+    itemFormData.value.isShowInsulationResistance = `${res.data.insulateResistance}` === '1' // 绝缘电阻输入数据
+    itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` === '1' // 角度调整误差（可调整角度仪表）
+    initInputData(res.data.measureItemDataResistanceThermometerList)
   })
 }
 
@@ -326,34 +506,47 @@
 const checkout = () => {
 }
 // -----------------------------------------生成结果处理----------------------------------------
-// 点击生成结果处理
-const createResult = () => {
-  // ElMessage.info('敬请期待')
-  return false
-  // if (!list.value.length) {
-  //   ElMessage.warning('没有检定项数据，无法生成结果')
-  //   return false
-  // }
-  // if (!useCheckList(list.value, measureColumns.value, '检定数据')) {
-  //   return false
-  // }
-  // const params = {
-  //   belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
-  //   itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-  //   measureDataCalibratorList: list.value,
-  // }
-  // calculateHandle(params).then((res) => {
-  //   if (res.data && res.data.length) {
-  //     resultList.value = res.data.map((item: IDetailMeasureList) => {
-  //       return {
-  //         ...item,
-  //       }
-  //     }) // 检定数据
-  //   }
-  //   else {
-  //     list.value = res.data
-  //   }
-  // })
+/**
+ * 点击生成结果处理
+ * @param type top上面表格 bottom下面表格
+ */
+const createResult = (type: 'top' | 'bottom') => {
+  let list = [] as IDetailMeasureList[]
+  let columns = [] as any
+  let title = '' // 提醒标题
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    list = type === 'top' ? thermostaticBathWaveList.value : thermostaticBathEvenList.value
+    columns = type === 'top' ? columns_thermostatic_bath_wave.value : columns_thermostatic_bath_even.value
+    title = type === 'top' ? '波动性测试' : '均匀性测试'
+  }
+  if (!list.length) {
+    ElMessage.warning('没有检定项数据，无法生成结果')
+    return false
+  }
+  if (!useCheckList(list, columns, title)) {
+    return false
+  }
+  tableTop.value = type === 'top'
+  tableBottom.value = type === 'bottom'
+  const params = {
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
+    itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
+    measureDataResistanceThermometerLi: 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
+    // }
+    tableTop.value = false
+    tableBottom.value = false
+  }).catch(() => { tableTop.value = false; tableBottom.value = false })
 }
 
 // -------------------------------------------处理表格函数---------------------------------------
@@ -378,7 +571,7 @@
     itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
     itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
     // 查输入值(查检定项管理的详情)
-    // fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
+    fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
   }
   else {
     itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称
@@ -412,7 +605,7 @@
     >
       <el-row>
         <!-- 外观  -->
-        <el-col :span="8">
+        <el-col v-if="itemFormData.isShowAppearance" :span="8">
           <el-form-item label="外观检查:" prop="appearance">
             <el-select v-model="itemFormData.appearance" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
@@ -424,18 +617,18 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽'" :span="8">
-          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistance">
+        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽' && itemFormData.isShowInsulationResistance" :span="8">
+          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistanceValue">
             <el-input
-              v-model="itemFormData.insulationResistance"
+              v-model="itemFormData.insulationResistanceValue"
               :disabled="pageType === 'detail'"
               :placeholder="pageType === 'detail' ? ' ' : '请输入绝缘电阻'"
             />
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计'" :span="8">
-          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="jdtzwc">
-            <el-select v-model="itemFormData.jdtzwc" :disabled="pageType === 'detail'" class="full-width-input">
+        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计' && itemFormData.isShowAngleAdjustErrort" :span="8">
+          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="angleAdjustError">
+            <el-select v-model="itemFormData.angleAdjustError" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
                 v-for="i in [{ value: '1', name: '不可用' }]"
                 :key="i.value"
@@ -450,29 +643,33 @@
     <!-- 恒温槽  -->
     <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="thermostaticBathWaveList"
         :table-header="columns_thermostatic_bath_wave"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
     <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('bottom')">
           计算结果
         </el-button>
       </template>
       <multi-table
+        v-loading="tableBottom"
         :table-data="thermostaticBathEvenList"
         :table-header="columns_thermostatic_bath_even"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
@@ -532,71 +729,8 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-        </el-table-column>
-      </el-table>
-      <el-form
-        v-if="current === 'measure-data'"
-        ref="formRef"
-        :model="itemFormData"
-        label-width="120"
-        label-position="right"
-        style="margin-top: 20px;"
-      >
-        <el-row>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="α:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : 'α'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- △t(0℃)/℃ -->
-          <el-col :span="8">
-            <el-form-item label="△t(0℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(0℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="△t(100℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(100℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-table
-        ref="tableRef"
-        :data="resistanceResultList"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns_resistance_result"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <template #default="scope">
+            <div v-html="scope.row[item.value]" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/equipement/standard/book/components/config/first/config.vue b/src/views/equipement/standard/book/components/config/first/config.vue
index ebf707d..b3c100c 100644
--- a/src/views/equipement/standard/book/components/config/first/config.vue
+++ b/src/views/equipement/standard/book/components/config/first/config.vue
@@ -237,6 +237,7 @@
           checkType: item.checkType.join(','), // 核查类型
           thoroughfare: item.thoroughfare.join(','), // 通道
           remark: form.value.remark,
+          equipmentId: equipmentId.value, // 配套设备id
         }
       }),
     ], // 多功能校准源检定项数据(一个核查项分类对应一个核查项数据表)
diff --git a/src/views/equipement/standard/book/components/config/fourth/config.vue b/src/views/equipement/standard/book/components/config/fourth/config.vue
index b2161e1..cbe874c 100644
--- a/src/views/equipement/standard/book/components/config/fourth/config.vue
+++ b/src/views/equipement/standard/book/components/config/fourth/config.vue
@@ -199,6 +199,7 @@
   if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
   if (!checkList(list.value, '核查项表格')) { return false }
   const params = {
+    equipmentId: equipmentId.value, // 配套设备id
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     checkItemDataPistonGaugeList: list.value.map((item) => {
       return {

diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index ef9b0f0..806e280 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -57,10 +57,11 @@
         :align="item.align"
         :show-overflow-tooltip="showOverflowTooltip"
       >
-        <template v-if="item.customHeader && item.text !== '-'" #header="scope">
-          <el-link :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
-            {{ item.text }}
+        <template #header="scope">
+          <el-link v-if="item.customHeader && item.text !== '-'" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </el-link>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <el-select
@@ -96,7 +97,6 @@
             v-model="scope.row[item.value]"
             :precision="item.precision"
             :min="min"
-            size="small"
             @change="handleInputNumberChange(scope)"
           />
           <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/measure/item/components/fifth/templateDetail.vue b/src/views/business/measure/item/components/fifth/templateDetail.vue
index ac9cd11..eb14d8e 100644
--- a/src/views/business/measure/item/components/fifth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifth/templateDetail.vue
@@ -78,8 +78,8 @@
   { text: 'dWst/dt', value: 'dwstDt', align: 'center', required: true, width: '200' },
   { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
   { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
-  { text: 'α允差上限/10(-6) ℃(-1)', value: 'aallowErrorUpper', align: 'center', required: true },
-  { text: 'α允差下限/10(-6) ℃(-1)', value: 'aallowErrorLower', align: 'center', required: true },
+  { text: 'α允差上限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorUpper', align: 'center', required: true, width: '160' },
+  { text: 'α允差下限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorLower', align: 'center', required: true, width: '160' },
 ])
 
 // ------------------------------------------字典----------------------------------------------
@@ -505,7 +505,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <!-- 校准点、扩展不确定度u -->
@@ -540,7 +541,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <el-input-number
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
index 9311317..f8945fc 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
@@ -1,5 +1,60 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
   id: string
+  dataId?: string //	检定数据管理基础信息表id
+  dataType: string //	检定数据类型(一个检定数据中区分两个表格)(字典code)
 
+  calibratedPoint?: string //	校准点
+  dataCategory?: string //	检定数据类别(1检定数据，2计算结果数据)
+  drDt?: string //	dR/dt，该参数在结果处理表中每行都要传
+  dwstDt?: string //	dWst/dt，该参数在结果处理表中每行都要传
+  location?: string //	位置
+  lowerTemperatureDifferent?: string //	下水平面温差
+  maxHorizontalTemperatureDifferent?: string // 水平最大温差
+  maxValue?: string //	最大值
+  maxWorkTemperatureDifferent?: string // 工作区域最大温差
+  maximumError?: string //	最大允许误差
+  minValue?: string //		最小值
+  nominalTemperature?: string //		标称温度
+  nominalValue?: string //		α标称值(字典value)，该参数在结果处理表中每行都要传
+  rank?: string //	级别(字典value)，该参数在结果处理表中每行都要传
+  rtp?: string //
+  rvalue?: string //
+  unit?: string //		单位
+  upperLowerPoint?: string //		上/下限点
+  upperTemperatureDifferent?: string //		上水平面温差
+  urel?: string //		扩展不确定度
+  volatility?: string //		波动性
+  ws?: string //	ws
+
+  indicatingErrorForwardStroke?: string //	示值误差正行程
+  indicatingErrorReverseStroke?: string //	示值误差反行程
+  indicatingValueForwardStroke?: string //	标准器示值正行程
+  indicatingValueReverseStroke?: string //	标准器示值反行程
+  measureIndicationValueForwardStroke?: string //		被检示值正行程
+  measureIndicationValueReverseStroke?: string //		被检示值反行程
+
+  item?: string //	项目(结果表)
+  allowErrorLower?: string //	允差下限(结果表)
+  allowErrorUpper?: string //	允差上限(结果表)
+  measureValue?: string //		测量值(结果表)
+
+  oneValue?: string | number //		示值1(波动性测试)/ROA1(均匀性测试)/标准器示值1(工业铂铜热电阻)
+  twoValue?: string | number//		示值2(波动性测试)/RA1(均匀性测试)/被检示值1(工业铂铜热电阻)
+  threeValue?: string | number//		示值3(波动性测试)/ROA2(均匀性测试)/标准器示值2(工业铂铜热电阻)
+  fourValue?: string | number//	示值4(波动性测试)/RA2(均匀性测试)/被检示值2(工业铂铜热电阻)
+  fiveValue?: string | number//	示值5(波动性测试)/ROA3(均匀性测试)/标准器示值3(工业铂铜热电阻)
+  sixValue?: string | number//		示值6(波动性测试)/RA3(均匀性测试)/被检示值3(工业铂铜热电阻)
+  sevenValue?: string | number//		示值7(波动性测试)/ROA4(均匀性测试)/标准器示值4(工业铂铜热电阻)
+  eightValue?: string | number//	示值8(波动性测试)/RA4(均匀性测试)/被检示值4(工业铂铜热电阻)
+  nineValue?: string | number//		示值9(波动性测试)/ROA均值(均匀性测试)/标准器示值5(工业铂铜热电阻)
+  tenValue?: string | number//		示值10(波动性测试)/RA均值(均匀性测试)/被检示值5(工业铂铜热电阻)
+  elevenValue?: string | number//	示值11(波动性测试)/标准器示值6(工业铂铜热电阻)
+  twelveValue?: string | number//		示值12(波动性测试)/被检示值6(工业铂铜热电阻)
+  thirteenValue?: string | number//		示值13(波动性测试)/标准器示值均值(工业铂铜热电阻)
+  fourteenValue?: string | number//	示值14(波动性测试)/被检示值均值(工业铂铜热电阻)
+  fifteenValue?: string | number//	示值15(波动性测试)
+
+  editable?: boolean // 表格是否可编辑
+  params?: string // 检定项目
 }
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
index 6f785bf..e9d0e60 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
@@ -1,4 +1,4 @@
-<!-- 第6套：安全阀标准装置 -->
+<!-- 第5套：二等铂 -->
 <!-- 检定数据管理详情模板 -->
 <script lang="ts" setup name="MeasureDataTemplateDetail">
 import { ref } from 'vue'
@@ -34,12 +34,19 @@
   itemCategoryId: '', // 设备检定项分类名称id
   belongStandardEquipment: '', // 标准装置code
   belongStandardEquipmentName: '', // 标准装置名称
+
   appearance: '1', // 外观检查
-  insulationResistance: '', // 绝缘电阻
-  jdtzwc: '1', //  角度调整误差（可调整角度仪表）
+  isShowAppearance: false, // 外观检查输入数据--用来判断外观是否展示
+  isShowInsulationResistance: false, // 绝缘电阻输入数据--判断是否展示
+  insulationResistanceValue: '', // 绝缘电阻值
+  angleAdjustError: '1', //  角度调整误差（可调整角度仪表）
+  isShowAngleAdjustErrort: false, //  角度调整误差（可调整角度仪表）输入数据--判断是否展示
+
   conclusion: '', // 检验结论
   remark: '', // 备注
 })
+const tableTop = ref(false) // 上面表格loading
+const tableBottom = ref(false) // 下面表格loading
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -73,104 +80,108 @@
 const thermostaticBathWaveList = ref<IDetailMeasureList[]>([]) // 恒温槽-波动性测试表格数据
 const thermostaticBathEvenList = ref<IDetailMeasureList[]>([]) // 恒温槽-均匀性测试表格数据
 const columns_thermostatic_bath_wave = ref([ // 恒温槽--波动性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  // 下/上限点：指标上限、指标下限
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, type: 'text' },
-      { text: '2', value: '2', align: 'center', required: true, type: 'text' },
-      { text: '3', value: '3', align: 'center', required: true, type: 'text' },
-      { text: '4', value: '4', align: 'center', required: true, type: 'text' },
-      { text: '5', value: '5', align: 'center', required: true, type: 'text' },
-      { text: '6', value: '6', align: 'center', required: true, type: 'text' },
-      { text: '7', value: '7', align: 'center', required: true, type: 'text' },
-      { text: '8', value: '8', align: 'center', required: true, type: 'text' },
-      { text: '9', value: '9', align: 'center', required: true, type: 'text' },
-      { text: '10', value: '10', align: 'center', required: true, type: 'text' },
-      { text: '11', value: '11', align: 'center', required: true, type: 'text' },
-      { text: '12', value: '12', align: 'center', required: true, type: 'text' },
-      { text: '13', value: '13', align: 'center', required: true, type: 'text' },
-      { text: '14', value: '14', align: 'center', required: true, type: 'text' },
-      { text: '15', value: '15', align: 'center', required: true, type: 'text' },
+      { text: '1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '2', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '3', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '4', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '5', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '6', value: 'sixValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '7', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '8', value: 'eightValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '9', value: 'nineValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '10', value: 'tenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '11', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '12', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '13', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '14', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '15', value: 'fifteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
     ],
   },
-  { text: '最大值', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '最小值', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '波动性', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '最大值', value: 'maxValue', align: 'center', required: true, type: 'text' },
+  { text: '最小值', value: 'minValue', align: 'center', required: true, type: 'text' },
+  { text: '波动性', value: 'volatility', align: 'center', type: 'text' },
 ])
 
 const columns_thermostatic_bath_even = ref([ // 恒温槽--均匀性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
-  { text: '位置', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  { text: '位置', value: 'location', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: 'ROA1', value: 'ROA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA1', value: 'RA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA2', value: 'RA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA2', value: 'ROA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA3', value: 'ROA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA3', value: 'RA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA4', value: 'RA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA4', value: 'ROA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA均值', value: 'ROA均值', align: 'center', required: true, type: 'text' },
-      { text: 'RA均值', value: 'RA均值', align: 'center', required: true, type: 'text' },
+      { text: 'ROA1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA1', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA2', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA2', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA3', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { 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: '上水平面温差', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '下水平面温差', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '水平最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
-  { text: '工作区域最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '上水平面温差', value: 'upperTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '下水平面温差', value: 'lowerTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '水平最大温差', value: 'maxHorizontalTemperatureDifferent', align: 'center', type: 'text' },
+  { text: '工作区域最大温差', value: 'maxWorkTemperatureDifferent', align: 'center', type: 'text' },
 ])
 
 // ===============================双金属温度计========================
 const bimetalThermometerList = ref<IDetailMeasureList[]>([]) // 双金属温度计表格数据
 
 const columns_bimetal_thermometer = ref([ // 双金属温度计表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '校准点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text', width: '90' },
+  { text: '校准点', value: 'calibratedPoint', align: 'center', required: true, type: 'text' },
   {
     text: '标准器示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    required: false,
+    width: '180',
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '被检示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'measureIndicationValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'measureIndicationValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '示值误差',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingErrorForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingErrorReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
-  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '扩展不确定度U', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
+  { text: '扩展不确定度U', value: 'urel', align: 'center', required: true, type: 'text' },
 ])
 
 // ==============================工业铂铜热电阻=======================
@@ -178,86 +189,93 @@
 const resistanceResultList = ref<IDetailMeasureList[]>([]) // 结果处理表格数据
 
 const columns_resistance_franchise = ref([ // 允差表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '标称温度', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '标称温度', value: 'nominalTemperature', align: 'center', required: true, type: 'text' },
   {
     text: '1',
     value: 'beforeFrictionStroke',
     align: 'center',
     required: true,
+    width: '180',
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'oneValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twoValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '2',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'threeValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '3',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'sixValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '4',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'eightValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '5',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'nineValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'tenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '6',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '均值',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
 ])
 
 // 结果处理表格
 const columns_resistance_result = ref([ // 结果处理表头
-  { text: '项目', value: 'params', align: 'center', required: true },
-  { text: '允差下限', value: 'terminalVoltage', align: 'center', required: true },
-  { text: '允差上限', value: 'rangeRange', align: 'center', required: true },
-  { text: '测量值', value: 'nominalValue', align: 'center', required: true },
+  { text: '项目', value: 'item', align: 'center', required: true },
+  { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
+  { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
+  { text: '测量值', value: 'measureValue', align: 'center', required: true },
 ])
 
 // -------------------------------------------获取详情信息--------------------------------------------------
@@ -279,8 +297,9 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
-
+    // itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0）
+    // itemFormData.value.insulationResistance = `${res.data.insulationResistance}` // 绝缘电阻输入数据
+    // itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` // 角度调整误差（可调整角度仪表）
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
@@ -297,10 +316,169 @@
     loading.close()
   })
 }
+// 恒温槽均匀性初始化数据使用
+const thermostaticBathEvenMap = {
+  1: 'A',
+  2: 'B',
+  3: 'C',
+  4: 'D',
+  5: 'E',
+  6: 'F',
+  7: 'G',
+  0: 'H',
+} as any
 
 // 初始化输入数据
 const initInputData = (data: any) => {
-
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    for (let i = 1; i <= 16; i++) {
+      // 恒温槽波动性
+      thermostaticBathWaveList.value.push({
+        id: '',
+        dataType: '1', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        oneValue: 0,
+        twoValue: 0,
+        threeValue: 0,
+        fourValue: 0,
+        fiveValue: 0,
+        sixValue: 0,
+        sevenValue: 0,
+        eightValue: 0,
+        nineValue: 0,
+        tenValue: 0,
+        elevenValue: 0,
+        twelveValue: 0,
+        thirteenValue: 0,
+        fourteenValue: 0,
+        fifteenValue: 0,
+        maxValue: '', // 最大值
+        minValue: '', // 最小值
+        volatility: '', // 波动性
+        editable: pageType.value !== 'detail',
+      })
+      // 恒温槽均匀性
+      thermostaticBathEvenList.value.push({
+        id: '',
+        dataType: '2', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        location: thermostaticBathEvenMap[i % 8], // 位置
+        oneValue: 0, // ROA1
+        twoValue: 0, // RA1
+        threeValue: 0, // ROA2
+        fourValue: 0, // RA2
+        fiveValue: 0, // ROA3
+        sixValue: 0, // RA3
+        sevenValue: 0, // ROA4
+        eightValue: 0, // RA4
+        nineValue: 0, // ROA均值
+        tenValue: 0, // RA均值
+        upperTemperatureDifferent: '', // 上水平面温差
+        lowerTemperatureDifferent: '', // 下水平面温差
+        maxHorizontalTemperatureDifferent: '', // 水平最大温差
+        maxWorkTemperatureDifferent: '', // 工作区域最大温差
+        editable: pageType.value !== 'detail',
+      })
+    }
+  }
+  else if (itemFormData.value.itemCategoryName === '双金属温度计') {
+    bimetalThermometerList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '示值误差', // 检定项目
+        dataType: '1', // 用于区分两个表格
+        calibratedPoint: item.calibratedPoint! + item.unit, // 校准点+单位
+        indicatingValueForwardStroke: 0, // 标准器示值正行程
+        indicatingValueReverseStroke: 0, // 标准器示值反行程
+        measureIndicationValueForwardStroke: 0, // 被检示值正行程
+        measureIndicationValueReverseStroke: 0, // 被检示值反行程
+        indicatingErrorForwardStroke: 0, // 示值误差正行程
+        indicatingErrorReverseStroke: 0, // 示值误差反行程
+        maximumError: item.maximumError, // 最大允许误差
+        urel: item.urel, // 扩展不确定度U
+        editable: pageType.value !== 'detail',
+      }
+    })
+  }
+  else { // 工业铂铜热电阻
+    // 允差
+    resistanceFranchiseList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '允差',
+        dataType: '1', // 用于区分两个表格
+        nominalTemperature: item.nominalTemperature, // 标称温度
+        oneValue: 0, // 1 标准器示值
+        twoValue: 0, // 1 被检示值
+        threeValue: 0, //	标准器示值2
+        fourValue: 0, //	被检示值2
+        fiveValue: 0, // 标准器示值3
+        sixValue: 0, //	被检示值3
+        sevenValue: 0, //	标准器示值4
+        eightValue: 0, //	被检示值4
+        nineValue: 0, //	标准器示值5
+        tenValue: 0, //	被检示值5
+        elevenValue: 0, //	标准器示值6
+        twelveValue: 0, //	被检示值6
+        thirteenValue: 0, // 标准器示值均值
+        fourteenValue: 0, // 被检示值均值
+        editable: pageType.value !== 'detail',
+      }
+    })
+    // 结果表格
+    resistanceResultList.value = [
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(0℃)/Ω', // 项目
+        allowErrorLower: data[0].allowErrorLower, // 允差下限 data[0] 是 0℃
+        allowErrorUpper: data[0].allowErrorUpper, // 允差上限 data[0] 是 0℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(100℃)/Ω', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'α', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(0℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(100℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△α/10<sup>-6</sup>℃<sup>-1</sup>', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+    ]
+  }
 }
 
 /**
@@ -316,8 +494,10 @@
     belongStandardEquipment, // 检校标准装置字典code
   }
   getItemInfo(params).then((res) => {
-    itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
-    initInputData(res.data.measureItemDataPistonGaugeList)
+    itemFormData.value.isShowAppearance = `${res.data.appearanceFunctionCheck}` === '1' // 外观（1/0）
+    itemFormData.value.isShowInsulationResistance = `${res.data.insulateResistance}` === '1' // 绝缘电阻输入数据
+    itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` === '1' // 角度调整误差（可调整角度仪表）
+    initInputData(res.data.measureItemDataResistanceThermometerList)
   })
 }
 
@@ -326,34 +506,47 @@
 const checkout = () => {
 }
 // -----------------------------------------生成结果处理----------------------------------------
-// 点击生成结果处理
-const createResult = () => {
-  // ElMessage.info('敬请期待')
-  return false
-  // if (!list.value.length) {
-  //   ElMessage.warning('没有检定项数据，无法生成结果')
-  //   return false
-  // }
-  // if (!useCheckList(list.value, measureColumns.value, '检定数据')) {
-  //   return false
-  // }
-  // const params = {
-  //   belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
-  //   itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-  //   measureDataCalibratorList: list.value,
-  // }
-  // calculateHandle(params).then((res) => {
-  //   if (res.data && res.data.length) {
-  //     resultList.value = res.data.map((item: IDetailMeasureList) => {
-  //       return {
-  //         ...item,
-  //       }
-  //     }) // 检定数据
-  //   }
-  //   else {
-  //     list.value = res.data
-  //   }
-  // })
+/**
+ * 点击生成结果处理
+ * @param type top上面表格 bottom下面表格
+ */
+const createResult = (type: 'top' | 'bottom') => {
+  let list = [] as IDetailMeasureList[]
+  let columns = [] as any
+  let title = '' // 提醒标题
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    list = type === 'top' ? thermostaticBathWaveList.value : thermostaticBathEvenList.value
+    columns = type === 'top' ? columns_thermostatic_bath_wave.value : columns_thermostatic_bath_even.value
+    title = type === 'top' ? '波动性测试' : '均匀性测试'
+  }
+  if (!list.length) {
+    ElMessage.warning('没有检定项数据，无法生成结果')
+    return false
+  }
+  if (!useCheckList(list, columns, title)) {
+    return false
+  }
+  tableTop.value = type === 'top'
+  tableBottom.value = type === 'bottom'
+  const params = {
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
+    itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
+    measureDataResistanceThermometerLi: 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
+    // }
+    tableTop.value = false
+    tableBottom.value = false
+  }).catch(() => { tableTop.value = false; tableBottom.value = false })
 }
 
 // -------------------------------------------处理表格函数---------------------------------------
@@ -378,7 +571,7 @@
     itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
     itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
     // 查输入值(查检定项管理的详情)
-    // fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
+    fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
   }
   else {
     itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称
@@ -412,7 +605,7 @@
     >
       <el-row>
         <!-- 外观  -->
-        <el-col :span="8">
+        <el-col v-if="itemFormData.isShowAppearance" :span="8">
           <el-form-item label="外观检查:" prop="appearance">
             <el-select v-model="itemFormData.appearance" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
@@ -424,18 +617,18 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽'" :span="8">
-          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistance">
+        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽' && itemFormData.isShowInsulationResistance" :span="8">
+          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistanceValue">
             <el-input
-              v-model="itemFormData.insulationResistance"
+              v-model="itemFormData.insulationResistanceValue"
               :disabled="pageType === 'detail'"
               :placeholder="pageType === 'detail' ? ' ' : '请输入绝缘电阻'"
             />
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计'" :span="8">
-          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="jdtzwc">
-            <el-select v-model="itemFormData.jdtzwc" :disabled="pageType === 'detail'" class="full-width-input">
+        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计' && itemFormData.isShowAngleAdjustErrort" :span="8">
+          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="angleAdjustError">
+            <el-select v-model="itemFormData.angleAdjustError" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
                 v-for="i in [{ value: '1', name: '不可用' }]"
                 :key="i.value"
@@ -450,29 +643,33 @@
     <!-- 恒温槽  -->
     <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="thermostaticBathWaveList"
         :table-header="columns_thermostatic_bath_wave"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
     <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('bottom')">
           计算结果
         </el-button>
       </template>
       <multi-table
+        v-loading="tableBottom"
         :table-data="thermostaticBathEvenList"
         :table-header="columns_thermostatic_bath_even"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
@@ -532,71 +729,8 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-        </el-table-column>
-      </el-table>
-      <el-form
-        v-if="current === 'measure-data'"
-        ref="formRef"
-        :model="itemFormData"
-        label-width="120"
-        label-position="right"
-        style="margin-top: 20px;"
-      >
-        <el-row>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="α:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : 'α'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- △t(0℃)/℃ -->
-          <el-col :span="8">
-            <el-form-item label="△t(0℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(0℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="△t(100℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(100℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-table
-        ref="tableRef"
-        :data="resistanceResultList"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns_resistance_result"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <template #default="scope">
+            <div v-html="scope.row[item.value]" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/equipement/standard/book/components/config/first/config.vue b/src/views/equipement/standard/book/components/config/first/config.vue
index ebf707d..b3c100c 100644
--- a/src/views/equipement/standard/book/components/config/first/config.vue
+++ b/src/views/equipement/standard/book/components/config/first/config.vue
@@ -237,6 +237,7 @@
           checkType: item.checkType.join(','), // 核查类型
           thoroughfare: item.thoroughfare.join(','), // 通道
           remark: form.value.remark,
+          equipmentId: equipmentId.value, // 配套设备id
         }
       }),
     ], // 多功能校准源检定项数据(一个核查项分类对应一个核查项数据表)
diff --git a/src/views/equipement/standard/book/components/config/fourth/config.vue b/src/views/equipement/standard/book/components/config/fourth/config.vue
index b2161e1..cbe874c 100644
--- a/src/views/equipement/standard/book/components/config/fourth/config.vue
+++ b/src/views/equipement/standard/book/components/config/fourth/config.vue
@@ -199,6 +199,7 @@
   if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
   if (!checkList(list.value, '核查项表格')) { return false }
   const params = {
+    equipmentId: equipmentId.value, // 配套设备id
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     checkItemDataPistonGaugeList: list.value.map((item) => {
       return {
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 2178428..5b4e2f5 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -164,6 +164,7 @@
     }
   })
   const params = {
+    equipmentId: equipmentId.value, // 配套设备id
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     checkItemDataElectricalSafetyList: voltage.concat(resistance),
   }

diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index ef9b0f0..806e280 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -57,10 +57,11 @@
         :align="item.align"
         :show-overflow-tooltip="showOverflowTooltip"
       >
-        <template v-if="item.customHeader && item.text !== '-'" #header="scope">
-          <el-link :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
-            {{ item.text }}
+        <template #header="scope">
+          <el-link v-if="item.customHeader && item.text !== '-'" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </el-link>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <el-select
@@ -96,7 +97,6 @@
             v-model="scope.row[item.value]"
             :precision="item.precision"
             :min="min"
-            size="small"
             @change="handleInputNumberChange(scope)"
           />
           <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/measure/item/components/fifth/templateDetail.vue b/src/views/business/measure/item/components/fifth/templateDetail.vue
index ac9cd11..eb14d8e 100644
--- a/src/views/business/measure/item/components/fifth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifth/templateDetail.vue
@@ -78,8 +78,8 @@
   { text: 'dWst/dt', value: 'dwstDt', align: 'center', required: true, width: '200' },
   { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
   { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
-  { text: 'α允差上限/10(-6) ℃(-1)', value: 'aallowErrorUpper', align: 'center', required: true },
-  { text: 'α允差下限/10(-6) ℃(-1)', value: 'aallowErrorLower', align: 'center', required: true },
+  { text: 'α允差上限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorUpper', align: 'center', required: true, width: '160' },
+  { text: 'α允差下限/10<sup>-6</sup>℃<sup>-1</sup>', value: 'aallowErrorLower', align: 'center', required: true, width: '160' },
 ])
 
 // ------------------------------------------字典----------------------------------------------
@@ -505,7 +505,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <!-- 校准点、扩展不确定度u -->
@@ -540,7 +541,8 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required" style="color: red;">*</span>
+          <span v-html="item.text" />
         </template>
         <template #default="scope">
           <el-input-number
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
index 9311317..f8945fc 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/fifth/fifth-interface.ts
@@ -1,5 +1,60 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
   id: string
+  dataId?: string //	检定数据管理基础信息表id
+  dataType: string //	检定数据类型(一个检定数据中区分两个表格)(字典code)
 
+  calibratedPoint?: string //	校准点
+  dataCategory?: string //	检定数据类别(1检定数据，2计算结果数据)
+  drDt?: string //	dR/dt，该参数在结果处理表中每行都要传
+  dwstDt?: string //	dWst/dt，该参数在结果处理表中每行都要传
+  location?: string //	位置
+  lowerTemperatureDifferent?: string //	下水平面温差
+  maxHorizontalTemperatureDifferent?: string // 水平最大温差
+  maxValue?: string //	最大值
+  maxWorkTemperatureDifferent?: string // 工作区域最大温差
+  maximumError?: string //	最大允许误差
+  minValue?: string //		最小值
+  nominalTemperature?: string //		标称温度
+  nominalValue?: string //		α标称值(字典value)，该参数在结果处理表中每行都要传
+  rank?: string //	级别(字典value)，该参数在结果处理表中每行都要传
+  rtp?: string //
+  rvalue?: string //
+  unit?: string //		单位
+  upperLowerPoint?: string //		上/下限点
+  upperTemperatureDifferent?: string //		上水平面温差
+  urel?: string //		扩展不确定度
+  volatility?: string //		波动性
+  ws?: string //	ws
+
+  indicatingErrorForwardStroke?: string //	示值误差正行程
+  indicatingErrorReverseStroke?: string //	示值误差反行程
+  indicatingValueForwardStroke?: string //	标准器示值正行程
+  indicatingValueReverseStroke?: string //	标准器示值反行程
+  measureIndicationValueForwardStroke?: string //		被检示值正行程
+  measureIndicationValueReverseStroke?: string //		被检示值反行程
+
+  item?: string //	项目(结果表)
+  allowErrorLower?: string //	允差下限(结果表)
+  allowErrorUpper?: string //	允差上限(结果表)
+  measureValue?: string //		测量值(结果表)
+
+  oneValue?: string | number //		示值1(波动性测试)/ROA1(均匀性测试)/标准器示值1(工业铂铜热电阻)
+  twoValue?: string | number//		示值2(波动性测试)/RA1(均匀性测试)/被检示值1(工业铂铜热电阻)
+  threeValue?: string | number//		示值3(波动性测试)/ROA2(均匀性测试)/标准器示值2(工业铂铜热电阻)
+  fourValue?: string | number//	示值4(波动性测试)/RA2(均匀性测试)/被检示值2(工业铂铜热电阻)
+  fiveValue?: string | number//	示值5(波动性测试)/ROA3(均匀性测试)/标准器示值3(工业铂铜热电阻)
+  sixValue?: string | number//		示值6(波动性测试)/RA3(均匀性测试)/被检示值3(工业铂铜热电阻)
+  sevenValue?: string | number//		示值7(波动性测试)/ROA4(均匀性测试)/标准器示值4(工业铂铜热电阻)
+  eightValue?: string | number//	示值8(波动性测试)/RA4(均匀性测试)/被检示值4(工业铂铜热电阻)
+  nineValue?: string | number//		示值9(波动性测试)/ROA均值(均匀性测试)/标准器示值5(工业铂铜热电阻)
+  tenValue?: string | number//		示值10(波动性测试)/RA均值(均匀性测试)/被检示值5(工业铂铜热电阻)
+  elevenValue?: string | number//	示值11(波动性测试)/标准器示值6(工业铂铜热电阻)
+  twelveValue?: string | number//		示值12(波动性测试)/被检示值6(工业铂铜热电阻)
+  thirteenValue?: string | number//		示值13(波动性测试)/标准器示值均值(工业铂铜热电阻)
+  fourteenValue?: string | number//	示值14(波动性测试)/被检示值均值(工业铂铜热电阻)
+  fifteenValue?: string | number//	示值15(波动性测试)
+
+  editable?: boolean // 表格是否可编辑
+  params?: string // 检定项目
 }
diff --git a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
index 6f785bf..e9d0e60 100644
--- a/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fifth/templateDetail.vue
@@ -1,4 +1,4 @@
-<!-- 第6套：安全阀标准装置 -->
+<!-- 第5套：二等铂 -->
 <!-- 检定数据管理详情模板 -->
 <script lang="ts" setup name="MeasureDataTemplateDetail">
 import { ref } from 'vue'
@@ -34,12 +34,19 @@
   itemCategoryId: '', // 设备检定项分类名称id
   belongStandardEquipment: '', // 标准装置code
   belongStandardEquipmentName: '', // 标准装置名称
+
   appearance: '1', // 外观检查
-  insulationResistance: '', // 绝缘电阻
-  jdtzwc: '1', //  角度调整误差（可调整角度仪表）
+  isShowAppearance: false, // 外观检查输入数据--用来判断外观是否展示
+  isShowInsulationResistance: false, // 绝缘电阻输入数据--判断是否展示
+  insulationResistanceValue: '', // 绝缘电阻值
+  angleAdjustError: '1', //  角度调整误差（可调整角度仪表）
+  isShowAngleAdjustErrort: false, //  角度调整误差（可调整角度仪表）输入数据--判断是否展示
+
   conclusion: '', // 检验结论
   remark: '', // 备注
 })
+const tableTop = ref(false) // 上面表格loading
+const tableBottom = ref(false) // 下面表格loading
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -73,104 +80,108 @@
 const thermostaticBathWaveList = ref<IDetailMeasureList[]>([]) // 恒温槽-波动性测试表格数据
 const thermostaticBathEvenList = ref<IDetailMeasureList[]>([]) // 恒温槽-均匀性测试表格数据
 const columns_thermostatic_bath_wave = ref([ // 恒温槽--波动性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  // 下/上限点：指标上限、指标下限
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, type: 'text' },
-      { text: '2', value: '2', align: 'center', required: true, type: 'text' },
-      { text: '3', value: '3', align: 'center', required: true, type: 'text' },
-      { text: '4', value: '4', align: 'center', required: true, type: 'text' },
-      { text: '5', value: '5', align: 'center', required: true, type: 'text' },
-      { text: '6', value: '6', align: 'center', required: true, type: 'text' },
-      { text: '7', value: '7', align: 'center', required: true, type: 'text' },
-      { text: '8', value: '8', align: 'center', required: true, type: 'text' },
-      { text: '9', value: '9', align: 'center', required: true, type: 'text' },
-      { text: '10', value: '10', align: 'center', required: true, type: 'text' },
-      { text: '11', value: '11', align: 'center', required: true, type: 'text' },
-      { text: '12', value: '12', align: 'center', required: true, type: 'text' },
-      { text: '13', value: '13', align: 'center', required: true, type: 'text' },
-      { text: '14', value: '14', align: 'center', required: true, type: 'text' },
-      { text: '15', value: '15', align: 'center', required: true, type: 'text' },
+      { text: '1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '2', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '3', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '4', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '5', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '6', value: 'sixValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '7', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '8', value: 'eightValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '9', value: 'nineValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '10', value: 'tenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '11', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '12', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '13', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '14', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: '15', value: 'fifteenValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
     ],
   },
-  { text: '最大值', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '最小值', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '波动性', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '最大值', value: 'maxValue', align: 'center', required: true, type: 'text' },
+  { text: '最小值', value: 'minValue', align: 'center', required: true, type: 'text' },
+  { text: '波动性', value: 'volatility', align: 'center', type: 'text' },
 ])
 
 const columns_thermostatic_bath_even = ref([ // 恒温槽--均匀性测试
-  { text: '下/上限点', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '单位', value: 'checkPoint', align: 'center', required: true, type: 'text' },
-  { text: '位置', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '下/上限点', value: 'upperLowerPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  { text: '位置', value: 'location', align: 'center', required: true, type: 'text' },
   {
     text: '示值',
     value: 'indicatingValue',
     align: 'center',
-    required: true,
-    width: '110',
+    required: false,
+    width: '180',
     children: [
-      { text: 'ROA1', value: 'ROA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA1', value: 'RA1', align: 'center', required: true, type: 'text' },
-      { text: 'RA2', value: 'RA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA2', value: 'ROA2', align: 'center', required: true, type: 'text' },
-      { text: 'ROA3', value: 'ROA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA3', value: 'RA3', align: 'center', required: true, type: 'text' },
-      { text: 'RA4', value: 'RA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA4', value: 'ROA4', align: 'center', required: true, type: 'text' },
-      { text: 'ROA均值', value: 'ROA均值', align: 'center', required: true, type: 'text' },
-      { text: 'RA均值', value: 'RA均值', align: 'center', required: true, type: 'text' },
+      { text: 'ROA1', value: 'oneValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA1', value: 'twoValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'RA2', value: 'fourValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA2', value: 'threeValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { text: 'ROA3', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber', precision: 4 },
+      { 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: '上水平面温差', value: 'averageValue', align: 'center', required: true, type: 'text' },
-  { text: '下水平面温差', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
-  { text: '水平最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
-  { text: '工作区域最大温差', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '上水平面温差', value: 'upperTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '下水平面温差', value: 'lowerTemperatureDifferent', align: 'center', required: true, type: 'text' },
+  { text: '水平最大温差', value: 'maxHorizontalTemperatureDifferent', align: 'center', type: 'text' },
+  { text: '工作区域最大温差', value: 'maxWorkTemperatureDifferent', align: 'center', type: 'text' },
 ])
 
 // ===============================双金属温度计========================
 const bimetalThermometerList = ref<IDetailMeasureList[]>([]) // 双金属温度计表格数据
 
 const columns_bimetal_thermometer = ref([ // 双金属温度计表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '校准点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text', width: '90' },
+  { text: '校准点', value: 'calibratedPoint', align: 'center', required: true, type: 'text' },
   {
     text: '标准器示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    required: false,
+    width: '180',
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '被检示值',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'measureIndicationValueForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'measureIndicationValueReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '示值误差',
     value: 'beforeFrictionStroke',
     align: 'center',
-    required: true,
+    width: '180',
+    required: false,
     children: [
-      { text: '正行程', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '反行程', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '正行程', value: 'indicatingErrorForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '反行程', value: 'indicatingErrorReverseStroke', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
-  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '扩展不确定度U', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
+  { text: '扩展不确定度U', value: 'urel', align: 'center', required: true, type: 'text' },
 ])
 
 // ==============================工业铂铜热电阻=======================
@@ -178,86 +189,93 @@
 const resistanceResultList = ref<IDetailMeasureList[]>([]) // 结果处理表格数据
 
 const columns_resistance_franchise = ref([ // 允差表头
-  { text: '检定项目', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
-  { text: '标称温度', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '标称温度', value: 'nominalTemperature', align: 'center', required: true, type: 'text' },
   {
     text: '1',
     value: 'beforeFrictionStroke',
     align: 'center',
     required: true,
+    width: '180',
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'oneValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twoValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '2',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'threeValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '3',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'fiveValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'sixValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '4',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'sevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'eightValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '5',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'nineValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'tenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '6',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'elevenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'twelveValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
   {
     text: '均值',
     value: 'beforeFrictionStroke',
     align: 'center',
+    width: '180',
     required: true,
     children: [
-      { text: '标准器示值(℃)', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
-      { text: '被检示值(Ω)', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准器示值(℃)', value: 'thirteenValue', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值(Ω)', value: 'fourteenValue', align: 'center', required: true, type: 'inputNumber' },
     ],
   },
 ])
 
 // 结果处理表格
 const columns_resistance_result = ref([ // 结果处理表头
-  { text: '项目', value: 'params', align: 'center', required: true },
-  { text: '允差下限', value: 'terminalVoltage', align: 'center', required: true },
-  { text: '允差上限', value: 'rangeRange', align: 'center', required: true },
-  { text: '测量值', value: 'nominalValue', align: 'center', required: true },
+  { text: '项目', value: 'item', align: 'center', required: true },
+  { text: '允差下限', value: 'allowErrorLower', align: 'center', required: true },
+  { text: '允差上限', value: 'allowErrorUpper', align: 'center', required: true },
+  { text: '测量值', value: 'measureValue', align: 'center', required: true },
 ])
 
 // -------------------------------------------获取详情信息--------------------------------------------------
@@ -279,8 +297,9 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
-
+    // itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0）
+    // itemFormData.value.insulationResistance = `${res.data.insulationResistance}` // 绝缘电阻输入数据
+    // itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` // 角度调整误差（可调整角度仪表）
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
@@ -297,10 +316,169 @@
     loading.close()
   })
 }
+// 恒温槽均匀性初始化数据使用
+const thermostaticBathEvenMap = {
+  1: 'A',
+  2: 'B',
+  3: 'C',
+  4: 'D',
+  5: 'E',
+  6: 'F',
+  7: 'G',
+  0: 'H',
+} as any
 
 // 初始化输入数据
 const initInputData = (data: any) => {
-
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    for (let i = 1; i <= 16; i++) {
+      // 恒温槽波动性
+      thermostaticBathWaveList.value.push({
+        id: '',
+        dataType: '1', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        oneValue: 0,
+        twoValue: 0,
+        threeValue: 0,
+        fourValue: 0,
+        fiveValue: 0,
+        sixValue: 0,
+        sevenValue: 0,
+        eightValue: 0,
+        nineValue: 0,
+        tenValue: 0,
+        elevenValue: 0,
+        twelveValue: 0,
+        thirteenValue: 0,
+        fourteenValue: 0,
+        fifteenValue: 0,
+        maxValue: '', // 最大值
+        minValue: '', // 最小值
+        volatility: '', // 波动性
+        editable: pageType.value !== 'detail',
+      })
+      // 恒温槽均匀性
+      thermostaticBathEvenList.value.push({
+        id: '',
+        dataType: '2', // 用于区分两个表格
+        upperLowerPoint: i < 9 ? `${data[0].lowerIndex}` : `${data[0].upperIndex}`, // 指标上限和下限
+        unit: data[0].unit, // 单位
+        location: thermostaticBathEvenMap[i % 8], // 位置
+        oneValue: 0, // ROA1
+        twoValue: 0, // RA1
+        threeValue: 0, // ROA2
+        fourValue: 0, // RA2
+        fiveValue: 0, // ROA3
+        sixValue: 0, // RA3
+        sevenValue: 0, // ROA4
+        eightValue: 0, // RA4
+        nineValue: 0, // ROA均值
+        tenValue: 0, // RA均值
+        upperTemperatureDifferent: '', // 上水平面温差
+        lowerTemperatureDifferent: '', // 下水平面温差
+        maxHorizontalTemperatureDifferent: '', // 水平最大温差
+        maxWorkTemperatureDifferent: '', // 工作区域最大温差
+        editable: pageType.value !== 'detail',
+      })
+    }
+  }
+  else if (itemFormData.value.itemCategoryName === '双金属温度计') {
+    bimetalThermometerList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '示值误差', // 检定项目
+        dataType: '1', // 用于区分两个表格
+        calibratedPoint: item.calibratedPoint! + item.unit, // 校准点+单位
+        indicatingValueForwardStroke: 0, // 标准器示值正行程
+        indicatingValueReverseStroke: 0, // 标准器示值反行程
+        measureIndicationValueForwardStroke: 0, // 被检示值正行程
+        measureIndicationValueReverseStroke: 0, // 被检示值反行程
+        indicatingErrorForwardStroke: 0, // 示值误差正行程
+        indicatingErrorReverseStroke: 0, // 示值误差反行程
+        maximumError: item.maximumError, // 最大允许误差
+        urel: item.urel, // 扩展不确定度U
+        editable: pageType.value !== 'detail',
+      }
+    })
+  }
+  else { // 工业铂铜热电阻
+    // 允差
+    resistanceFranchiseList.value = data.map((item: IDetailMeasureList) => {
+      return {
+        id: '',
+        params: '允差',
+        dataType: '1', // 用于区分两个表格
+        nominalTemperature: item.nominalTemperature, // 标称温度
+        oneValue: 0, // 1 标准器示值
+        twoValue: 0, // 1 被检示值
+        threeValue: 0, //	标准器示值2
+        fourValue: 0, //	被检示值2
+        fiveValue: 0, // 标准器示值3
+        sixValue: 0, //	被检示值3
+        sevenValue: 0, //	标准器示值4
+        eightValue: 0, //	被检示值4
+        nineValue: 0, //	标准器示值5
+        tenValue: 0, //	被检示值5
+        elevenValue: 0, //	标准器示值6
+        twelveValue: 0, //	被检示值6
+        thirteenValue: 0, // 标准器示值均值
+        fourteenValue: 0, // 被检示值均值
+        editable: pageType.value !== 'detail',
+      }
+    })
+    // 结果表格
+    resistanceResultList.value = [
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(0℃)/Ω', // 项目
+        allowErrorLower: data[0].allowErrorLower, // 允差下限 data[0] 是 0℃
+        allowErrorUpper: data[0].allowErrorUpper, // 允差上限 data[0] 是 0℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'R\'(100℃)/Ω', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: 'α', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(0℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△t(100℃)/℃', // 项目
+        allowErrorLower: '/', // 允差下限
+        allowErrorUpper: '/', // 允差上限
+        measureValue: '', // 测量值
+      },
+      {
+        id: '',
+        dataType: '2',
+        item: '△α/10<sup>-6</sup>℃<sup>-1</sup>', // 项目
+        allowErrorLower: data[1].allowErrorLower, // 允差下限 data[1] 是 100℃
+        allowErrorUpper: data[1].allowErrorUpper, // 允差上限 data[1] 是 100℃
+        measureValue: '', // 测量值
+      },
+    ]
+  }
 }
 
 /**
@@ -316,8 +494,10 @@
     belongStandardEquipment, // 检校标准装置字典code
   }
   getItemInfo(params).then((res) => {
-    itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
-    initInputData(res.data.measureItemDataPistonGaugeList)
+    itemFormData.value.isShowAppearance = `${res.data.appearanceFunctionCheck}` === '1' // 外观（1/0）
+    itemFormData.value.isShowInsulationResistance = `${res.data.insulateResistance}` === '1' // 绝缘电阻输入数据
+    itemFormData.value.isShowAngleAdjustErrort = `${res.data.angleAdjustError}` === '1' // 角度调整误差（可调整角度仪表）
+    initInputData(res.data.measureItemDataResistanceThermometerList)
   })
 }
 
@@ -326,34 +506,47 @@
 const checkout = () => {
 }
 // -----------------------------------------生成结果处理----------------------------------------
-// 点击生成结果处理
-const createResult = () => {
-  // ElMessage.info('敬请期待')
-  return false
-  // if (!list.value.length) {
-  //   ElMessage.warning('没有检定项数据，无法生成结果')
-  //   return false
-  // }
-  // if (!useCheckList(list.value, measureColumns.value, '检定数据')) {
-  //   return false
-  // }
-  // const params = {
-  //   belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
-  //   itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-  //   measureDataCalibratorList: list.value,
-  // }
-  // calculateHandle(params).then((res) => {
-  //   if (res.data && res.data.length) {
-  //     resultList.value = res.data.map((item: IDetailMeasureList) => {
-  //       return {
-  //         ...item,
-  //       }
-  //     }) // 检定数据
-  //   }
-  //   else {
-  //     list.value = res.data
-  //   }
-  // })
+/**
+ * 点击生成结果处理
+ * @param type top上面表格 bottom下面表格
+ */
+const createResult = (type: 'top' | 'bottom') => {
+  let list = [] as IDetailMeasureList[]
+  let columns = [] as any
+  let title = '' // 提醒标题
+  if (itemFormData.value.itemCategoryName === '恒温槽') {
+    list = type === 'top' ? thermostaticBathWaveList.value : thermostaticBathEvenList.value
+    columns = type === 'top' ? columns_thermostatic_bath_wave.value : columns_thermostatic_bath_even.value
+    title = type === 'top' ? '波动性测试' : '均匀性测试'
+  }
+  if (!list.length) {
+    ElMessage.warning('没有检定项数据，无法生成结果')
+    return false
+  }
+  if (!useCheckList(list, columns, title)) {
+    return false
+  }
+  tableTop.value = type === 'top'
+  tableBottom.value = type === 'bottom'
+  const params = {
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
+    itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
+    measureDataResistanceThermometerLi: 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
+    // }
+    tableTop.value = false
+    tableBottom.value = false
+  }).catch(() => { tableTop.value = false; tableBottom.value = false })
 }
 
 // -------------------------------------------处理表格函数---------------------------------------
@@ -378,7 +571,7 @@
     itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
     itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
     // 查输入值(查检定项管理的详情)
-    // fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
+    fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
   }
   else {
     itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称
@@ -412,7 +605,7 @@
     >
       <el-row>
         <!-- 外观  -->
-        <el-col :span="8">
+        <el-col v-if="itemFormData.isShowAppearance" :span="8">
           <el-form-item label="外观检查:" prop="appearance">
             <el-select v-model="itemFormData.appearance" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
@@ -424,18 +617,18 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽'" :span="8">
-          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistance">
+        <el-col v-if="itemFormData.itemCategoryName !== '恒温槽' && itemFormData.isShowInsulationResistance" :span="8">
+          <el-form-item label="绝缘电阻（MΩ）:" prop="insulationResistanceValue">
             <el-input
-              v-model="itemFormData.insulationResistance"
+              v-model="itemFormData.insulationResistanceValue"
               :disabled="pageType === 'detail'"
               :placeholder="pageType === 'detail' ? ' ' : '请输入绝缘电阻'"
             />
           </el-form-item>
         </el-col>
-        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计'" :span="8">
-          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="jdtzwc">
-            <el-select v-model="itemFormData.jdtzwc" :disabled="pageType === 'detail'" class="full-width-input">
+        <el-col v-if="itemFormData.itemCategoryName === '双金属温度计' && itemFormData.isShowAngleAdjustErrort" :span="8">
+          <el-form-item label-width="250px" label="角度调整误差（可调整角度仪表）:" prop="angleAdjustError">
+            <el-select v-model="itemFormData.angleAdjustError" :disabled="pageType === 'detail'" class="full-width-input">
               <el-option
                 v-for="i in [{ value: '1', name: '不可用' }]"
                 :key="i.value"
@@ -450,29 +643,33 @@
     <!-- 恒温槽  -->
     <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="thermostaticBathWaveList"
         :table-header="columns_thermostatic_bath_wave"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
     <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('bottom')">
           计算结果
         </el-button>
       </template>
       <multi-table
+        v-loading="tableBottom"
         :table-data="thermostaticBathEvenList"
         :table-header="columns_thermostatic_bath_even"
-        :merge-rows="[]"
+        :merge-rows="['upperLowerPoint', 'unit']"
         :need-index="true"
+        max-height="400"
         @handle-input-number-change="handleInputNumberChange"
       />
     </detail-block>
@@ -532,71 +729,8 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-        </el-table-column>
-      </el-table>
-      <el-form
-        v-if="current === 'measure-data'"
-        ref="formRef"
-        :model="itemFormData"
-        label-width="120"
-        label-position="right"
-        style="margin-top: 20px;"
-      >
-        <el-row>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="α:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : 'α'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- △t(0℃)/℃ -->
-          <el-col :span="8">
-            <el-form-item label="△t(0℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(0℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- α -->
-          <el-col :span="8">
-            <el-form-item label="△t(100℃)/℃:" prop="a">
-              <el-input
-                v-model="itemFormData.conclusion"
-                autosize
-                type="textarea"
-                disabled
-                :placeholder="pageType === 'detail' ? ' ' : '△t(100℃)/℃'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-table
-        ref="tableRef"
-        :data="resistanceResultList"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns_resistance_result"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <template #default="scope">
+            <div v-html="scope.row[item.value]" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/equipement/standard/book/components/config/first/config.vue b/src/views/equipement/standard/book/components/config/first/config.vue
index ebf707d..b3c100c 100644
--- a/src/views/equipement/standard/book/components/config/first/config.vue
+++ b/src/views/equipement/standard/book/components/config/first/config.vue
@@ -237,6 +237,7 @@
           checkType: item.checkType.join(','), // 核查类型
           thoroughfare: item.thoroughfare.join(','), // 通道
           remark: form.value.remark,
+          equipmentId: equipmentId.value, // 配套设备id
         }
       }),
     ], // 多功能校准源检定项数据(一个核查项分类对应一个核查项数据表)
diff --git a/src/views/equipement/standard/book/components/config/fourth/config.vue b/src/views/equipement/standard/book/components/config/fourth/config.vue
index b2161e1..cbe874c 100644
--- a/src/views/equipement/standard/book/components/config/fourth/config.vue
+++ b/src/views/equipement/standard/book/components/config/fourth/config.vue
@@ -199,6 +199,7 @@
   if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
   if (!checkList(list.value, '核查项表格')) { return false }
   const params = {
+    equipmentId: equipmentId.value, // 配套设备id
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     checkItemDataPistonGaugeList: list.value.map((item) => {
       return {
diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue
index 2178428..5b4e2f5 100644
--- a/src/views/equipement/standard/book/components/config/third/config.vue
+++ b/src/views/equipement/standard/book/components/config/third/config.vue
@@ -164,6 +164,7 @@
     }
   })
   const params = {
+    equipmentId: equipmentId.value, // 配套设备id
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     checkItemDataElectricalSafetyList: voltage.concat(resistance),
   }
diff --git a/src/views/equipement/standard/checkItemClassification/detail.vue b/src/views/equipement/standard/checkItemClassification/detail.vue
index 427158a..547a0d3 100644
--- a/src/views/equipement/standard/checkItemClassification/detail.vue
+++ b/src/views/equipement/standard/checkItemClassification/detail.vue
@@ -101,6 +101,11 @@
   pageType.value = 'edit'
 }
 
+// 选择校准装置变化
+const changeSelectBelongStandardEquipment = (value: string) => {
+  form.value.belongStandardEquipmentName = standardList.value.find(item => item.value === value)!.name!
+}
+
 // -------------------------------------钩子-----------------------------------------------------
 
 onMounted(async () => {
@@ -164,6 +169,7 @@
                 class="short-input"
                 filterable
                 :disabled="pageType === 'detail'"
+                @change="changeSelectBelongStandardEquipment"
               >
                 <el-option v-for="item in standardList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>