diff --git a/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts b/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts
new file mode 100644
index 0000000..9311317
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts
@@ -0,0 +1,5 @@
+// 检定项数据表格
+export interface IDetailMeasureList {
+  id: string
+
+}

diff --git a/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts b/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts
new file mode 100644
index 0000000..9311317
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts
@@ -0,0 +1,5 @@
+// 检定项数据表格
+export interface IDetailMeasureList {
+  id: string
+
+}
diff --git a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue
new file mode 100644
index 0000000..33e120b
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue
@@ -0,0 +1,418 @@
+<!-- 第7套：精密露点仪标准装置 -->
+<!-- 检定数据管理详情模板 -->
+<script lang="ts" setup name="MeasureDataTemplateDetail">
+import { ref } from 'vue'
+import { ElLoading, ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import changeRecord from '../changeRecord.vue'
+import selectStandard from '../../dialog/selectStandardDialog.vue'
+import TemplateFormAndTable from '../templateFormAndTable.vue'
+import { useSolveFormData } from '../useSolveFormData'
+import type { IDetailMeasureList } from './seventh-interface'
+import templateTable from './templateTable.vue'
+import useUserStore from '@/store/modules/user'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { calculateHandle, getInfo } from '@/api/business/taskMeasure/measureData'
+import { getInfo as getItemInfo } from '@/api/business/measure/item'
+import { useCheckList } from '@/commonMethods/useCheckList'
+import { calc } from '@/utils/useCalc'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+
+const props = defineProps({
+  infoId: String, // id
+  dataNo: String, // 检定数据编号
+})
+const emits = defineEmits(['giveInfoId'])
+const user = useUserStore() // 用户信息
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const ruleFormRef = ref() // 表单ref
+const templateFormAndTableRef = ref() // 表单和被检设备、测量设备表格公共组件ref
+const itemFormData = ref({ // 有关于检定项的数据
+  itemId: '', // 检定项id
+  itemCategoryName: '', // 设备检定项分类名称
+  itemCategoryId: '', // 设备检定项分类名称id
+  belongStandardEquipment: '', // 标准装置code
+  belongStandardEquipmentName: '', // 标准装置名称
+  appearance: '1', // 外观（1/0）
+  appearanceRemark: '1', // 外观备注说明
+})
+
+// -------------------------------------------路由参数------------------------------------------
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// ------------------------------------------标签----------------------------------------------------------
+const radioMenus = ref([ // 标签内容
+  { name: '检定数据', value: 'measure-data' },
+  { name: '历史修改记录', value: 'change-record' },
+])
+const current = ref('measure-data') // 选择的tab 默认基本信息
+
+// ---------------------------------------检定项数据表格----------------------------------------------------
+const list = ref<IDetailMeasureList[]>([]) // 表格数据
+const columns = ref<TableColumn[]>([])
+const columns_mechanical = ref<TableColumn[]>([ // 机械式温湿度仪表
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '类型', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+  { text: '温度/湿度', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+  { text: '温度点/湿度点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  {
+    text: '1',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '2',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '均值',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  { text: '误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+])
+const columns_digital = ref<TableColumn[]>([ // 数字式/外置探头式温湿度仪表
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '类型', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+  { text: '温度/湿度', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+  { text: '温度点/湿度点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  {
+    text: '1',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '2',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '3',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '均值',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  { text: '误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '不确定度', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+])
+
+// -------------------------------------------获取详情信息--------------------------------------------------
+// 获取页面详情信息
+const fetchInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getInfo({
+    id: infoId.value,
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment,
+    // 我的任务跳转过来如果已经配置过检定项了，到编辑页面，且用一下三个字段替代传id请求详情
+    itemId: $route.query.itemId, // 检定项id
+    orderId: $route.query.orderId, // 任务单id
+    sampleId: $route.query.sampleId, // 被检设备id
+  }).then((res) => {
+    // 有关于检定项的数据
+    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）
+
+    // =======================================表单公共组件数据处理=======================================================
+    useSolveFormData(res, templateFormAndTableRef.value)
+    // ==================================检定数据========================================================================
+
+    // list.value = res.data.measureDataPistonGaugeList.map((item: IDetailMeasureList) => {
+    //   return {
+    //     ...item,
+    //     editable: pageType.value !== 'detail',
+    //   }
+    // }) // 检定数据
+
+    infoId.value = res.data.id
+    emits('giveInfoId', infoId.value)
+    loading.close()
+  })
+}
+
+// 初始化输入数据
+const initInputData = (data: any) => {
+
+}
+
+/**
+ * 新增的时候获取检定项输入数据(获取检定项分类详情)
+ * @param itemId  检定项id
+ * @param itemCategoryName 检定项分类名字
+ * @param belongStandardEquipment 检校标准装置字典
+ */
+const fetchItemInfo = (itemId: string, itemCategoryName: string, belongStandardEquipment = '') => {
+  const params = {
+    id: itemId,
+    itemCategoryName, // 检定项分类名字
+    belongStandardEquipment, // 检校标准装置字典code
+  }
+  getItemInfo(params).then((res) => {
+    itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
+    initInputData(res.data.measureItemDataPistonGaugeList)
+  })
+}
+
+// ----------------------------------------点击保存时校验---------------------------------------
+// 校验
+const checkout = () => {
+}
+// -----------------------------------------生成结果处理----------------------------------------
+// 点击计算结果
+const calculate = () => {
+  // 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
+  //   }
+  // })
+}
+
+// ------------------------------------------钩子----------------------------------------------
+watch(() => itemFormData.value.itemCategoryName, (newValue) => {
+  console.log(newValue, 'itemCategoryName.value')
+
+  if (newValue) {
+    switch (newValue) {
+      case '机械式温湿度仪表':
+        columns.value = columns_mechanical.value
+        break
+      case '数字式/外置探头式温湿度仪表':
+        columns.value = columns_digital.value
+        break
+      default:
+        break
+    }
+  }
+}, { immediate: true, deep: true })
+
+watch(() => props.infoId, (newValue) => {
+  if (newValue) {
+    infoId.value = newValue
+  }
+}, { immediate: true })
+
+onMounted(() => {
+  if (pageType.value === 'add') { // 从我的任务跳转过来（新增）
+    itemFormData.value.itemId = $route.query.itemId as string// 检定项id
+    itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称
+    itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id
+    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)
+  }
+  else {
+    itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称
+    itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id
+    itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
+    itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
+    // fetchInfo()
+  }
+})
+
+defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType })
+</script>
+
+<template>
+  <div class="measure-data-template-detail">
+    <template-form-and-table ref="templateFormAndTableRef" :page-type="pageType" />
+    <!-- 标签 -->
+    <detail-block :title="pageType !== 'detail' ? '检定数据' : ''" :class="pageType === 'detail' ? 'setBottom' : ''">
+      <el-radio-group v-if="pageType === 'detail'" v-model="current">
+        <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+
+      <el-form
+        v-if="current === 'measure-data'"
+        ref="formRef"
+        :model="itemFormData"
+        label-width="140"
+        label-position="right"
+        style="margin-top: 20px;"
+      >
+        <el-row>
+          <!-- 外观  -->
+          <el-col :span="8">
+            <el-form-item label="外观:" prop="appearance">
+              <el-radio-group v-model="itemFormData.appearance" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  合格
+                </el-radio>
+                <el-radio label="0">
+                  不合格
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="`${itemFormData.appearance}` === '0' " :span="12">
+            <el-form-item label="备注说明:" prop="appearanceRemark">
+              <el-input
+                v-model="itemFormData.appearanceRemark"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? ' ' : '外观备注说明'"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <!-- 示值误差 -->
+      <detail-block v-if="current === 'measure-data'" title="示值测试">
+        <div style="display: flex; justify-content: space-between;">
+          <el-form-item label="标准器示值是否已通过软件修正:" prop="appearance">
+            <el-radio-group v-model="itemFormData.appearance" :disabled="pageType === 'detail'">
+              <el-radio label="1">
+                是
+              </el-radio>
+              <el-radio label="0">
+                否
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-button type="primary">
+            计算结果
+          </el-button>
+        </div>
+        <multi-table
+          :table-data="list"
+          :table-header="columns"
+          :merge-rows="[]"
+          :need-index="true"
+        />
+      </detail-block>
+
+      <!-- ------------------------------------------------结论------------------------------------------------ -->
+      <el-form
+        v-if="current === 'measure-data'"
+        ref="formRef"
+        :model="itemFormData"
+        label-width="140"
+        label-position="right"
+        style="margin-top: 20px;"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="结论:" prop="appearanceRemark">
+              <el-input
+                v-model="itemFormData.appearanceRemark"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? ' ' : '结论'"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:" prop="appearanceRemark">
+              <el-input
+                v-model="itemFormData.appearanceRemark"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? ' ' : '备注'"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <!-- 历史修改记录 -->
+      <change-record v-show="pageType === 'detail' && current === 'change-record'" :info-id="infoId" />
+    </detail-block>
+  </div>
+</template>
+
+<style lang="scss">
+.measure-data-template-detail {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>

diff --git a/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts b/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts
new file mode 100644
index 0000000..9311317
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/components/seventh/seventh-interface.ts
@@ -0,0 +1,5 @@
+// 检定项数据表格
+export interface IDetailMeasureList {
+  id: string
+
+}
diff --git a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue
new file mode 100644
index 0000000..33e120b
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue
@@ -0,0 +1,418 @@
+<!-- 第7套：精密露点仪标准装置 -->
+<!-- 检定数据管理详情模板 -->
+<script lang="ts" setup name="MeasureDataTemplateDetail">
+import { ref } from 'vue'
+import { ElLoading, ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import changeRecord from '../changeRecord.vue'
+import selectStandard from '../../dialog/selectStandardDialog.vue'
+import TemplateFormAndTable from '../templateFormAndTable.vue'
+import { useSolveFormData } from '../useSolveFormData'
+import type { IDetailMeasureList } from './seventh-interface'
+import templateTable from './templateTable.vue'
+import useUserStore from '@/store/modules/user'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { calculateHandle, getInfo } from '@/api/business/taskMeasure/measureData'
+import { getInfo as getItemInfo } from '@/api/business/measure/item'
+import { useCheckList } from '@/commonMethods/useCheckList'
+import { calc } from '@/utils/useCalc'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+
+const props = defineProps({
+  infoId: String, // id
+  dataNo: String, // 检定数据编号
+})
+const emits = defineEmits(['giveInfoId'])
+const user = useUserStore() // 用户信息
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const ruleFormRef = ref() // 表单ref
+const templateFormAndTableRef = ref() // 表单和被检设备、测量设备表格公共组件ref
+const itemFormData = ref({ // 有关于检定项的数据
+  itemId: '', // 检定项id
+  itemCategoryName: '', // 设备检定项分类名称
+  itemCategoryId: '', // 设备检定项分类名称id
+  belongStandardEquipment: '', // 标准装置code
+  belongStandardEquipmentName: '', // 标准装置名称
+  appearance: '1', // 外观（1/0）
+  appearanceRemark: '1', // 外观备注说明
+})
+
+// -------------------------------------------路由参数------------------------------------------
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// ------------------------------------------标签----------------------------------------------------------
+const radioMenus = ref([ // 标签内容
+  { name: '检定数据', value: 'measure-data' },
+  { name: '历史修改记录', value: 'change-record' },
+])
+const current = ref('measure-data') // 选择的tab 默认基本信息
+
+// ---------------------------------------检定项数据表格----------------------------------------------------
+const list = ref<IDetailMeasureList[]>([]) // 表格数据
+const columns = ref<TableColumn[]>([])
+const columns_mechanical = ref<TableColumn[]>([ // 机械式温湿度仪表
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '类型', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+  { text: '温度/湿度', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+  { text: '温度点/湿度点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  {
+    text: '1',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '2',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '均值',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  { text: '误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+])
+const columns_digital = ref<TableColumn[]>([ // 数字式/外置探头式温湿度仪表
+  { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '类型', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+  { text: '温度/湿度', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+  { text: '温度点/湿度点', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  {
+    text: '1',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '被检示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '2',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '3',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  {
+    text: '均值',
+    value: 'beforeFrictionStroke',
+    align: 'center',
+    required: true,
+    children: [
+      { text: '标准示值', value: 'beforeFrictionForwardStroke', align: 'center', required: true, type: 'inputNumber' },
+      { text: '标准示值', value: 'beforeFrictionReverseStroke', align: 'center', required: true, type: 'inputNumber' },
+    ],
+  },
+  { text: '误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '最大允许误差', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+  { text: '不确定度', value: 'indicatingValue', align: 'center', required: true, type: 'text' },
+])
+
+// -------------------------------------------获取详情信息--------------------------------------------------
+// 获取页面详情信息
+const fetchInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getInfo({
+    id: infoId.value,
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment,
+    // 我的任务跳转过来如果已经配置过检定项了，到编辑页面，且用一下三个字段替代传id请求详情
+    itemId: $route.query.itemId, // 检定项id
+    orderId: $route.query.orderId, // 任务单id
+    sampleId: $route.query.sampleId, // 被检设备id
+  }).then((res) => {
+    // 有关于检定项的数据
+    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）
+
+    // =======================================表单公共组件数据处理=======================================================
+    useSolveFormData(res, templateFormAndTableRef.value)
+    // ==================================检定数据========================================================================
+
+    // list.value = res.data.measureDataPistonGaugeList.map((item: IDetailMeasureList) => {
+    //   return {
+    //     ...item,
+    //     editable: pageType.value !== 'detail',
+    //   }
+    // }) // 检定数据
+
+    infoId.value = res.data.id
+    emits('giveInfoId', infoId.value)
+    loading.close()
+  })
+}
+
+// 初始化输入数据
+const initInputData = (data: any) => {
+
+}
+
+/**
+ * 新增的时候获取检定项输入数据(获取检定项分类详情)
+ * @param itemId  检定项id
+ * @param itemCategoryName 检定项分类名字
+ * @param belongStandardEquipment 检校标准装置字典
+ */
+const fetchItemInfo = (itemId: string, itemCategoryName: string, belongStandardEquipment = '') => {
+  const params = {
+    id: itemId,
+    itemCategoryName, // 检定项分类名字
+    belongStandardEquipment, // 检校标准装置字典code
+  }
+  getItemInfo(params).then((res) => {
+    itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
+    initInputData(res.data.measureItemDataPistonGaugeList)
+  })
+}
+
+// ----------------------------------------点击保存时校验---------------------------------------
+// 校验
+const checkout = () => {
+}
+// -----------------------------------------生成结果处理----------------------------------------
+// 点击计算结果
+const calculate = () => {
+  // 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
+  //   }
+  // })
+}
+
+// ------------------------------------------钩子----------------------------------------------
+watch(() => itemFormData.value.itemCategoryName, (newValue) => {
+  console.log(newValue, 'itemCategoryName.value')
+
+  if (newValue) {
+    switch (newValue) {
+      case '机械式温湿度仪表':
+        columns.value = columns_mechanical.value
+        break
+      case '数字式/外置探头式温湿度仪表':
+        columns.value = columns_digital.value
+        break
+      default:
+        break
+    }
+  }
+}, { immediate: true, deep: true })
+
+watch(() => props.infoId, (newValue) => {
+  if (newValue) {
+    infoId.value = newValue
+  }
+}, { immediate: true })
+
+onMounted(() => {
+  if (pageType.value === 'add') { // 从我的任务跳转过来（新增）
+    itemFormData.value.itemId = $route.query.itemId as string// 检定项id
+    itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称
+    itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id
+    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)
+  }
+  else {
+    itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称
+    itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id
+    itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
+    itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
+    // fetchInfo()
+  }
+})
+
+defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType })
+</script>
+
+<template>
+  <div class="measure-data-template-detail">
+    <template-form-and-table ref="templateFormAndTableRef" :page-type="pageType" />
+    <!-- 标签 -->
+    <detail-block :title="pageType !== 'detail' ? '检定数据' : ''" :class="pageType === 'detail' ? 'setBottom' : ''">
+      <el-radio-group v-if="pageType === 'detail'" v-model="current">
+        <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+
+      <el-form
+        v-if="current === 'measure-data'"
+        ref="formRef"
+        :model="itemFormData"
+        label-width="140"
+        label-position="right"
+        style="margin-top: 20px;"
+      >
+        <el-row>
+          <!-- 外观  -->
+          <el-col :span="8">
+            <el-form-item label="外观:" prop="appearance">
+              <el-radio-group v-model="itemFormData.appearance" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  合格
+                </el-radio>
+                <el-radio label="0">
+                  不合格
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="`${itemFormData.appearance}` === '0' " :span="12">
+            <el-form-item label="备注说明:" prop="appearanceRemark">
+              <el-input
+                v-model="itemFormData.appearanceRemark"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? ' ' : '外观备注说明'"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <!-- 示值误差 -->
+      <detail-block v-if="current === 'measure-data'" title="示值测试">
+        <div style="display: flex; justify-content: space-between;">
+          <el-form-item label="标准器示值是否已通过软件修正:" prop="appearance">
+            <el-radio-group v-model="itemFormData.appearance" :disabled="pageType === 'detail'">
+              <el-radio label="1">
+                是
+              </el-radio>
+              <el-radio label="0">
+                否
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-button type="primary">
+            计算结果
+          </el-button>
+        </div>
+        <multi-table
+          :table-data="list"
+          :table-header="columns"
+          :merge-rows="[]"
+          :need-index="true"
+        />
+      </detail-block>
+
+      <!-- ------------------------------------------------结论------------------------------------------------ -->
+      <el-form
+        v-if="current === 'measure-data'"
+        ref="formRef"
+        :model="itemFormData"
+        label-width="140"
+        label-position="right"
+        style="margin-top: 20px;"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="结论:" prop="appearanceRemark">
+              <el-input
+                v-model="itemFormData.appearanceRemark"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? ' ' : '结论'"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:" prop="appearanceRemark">
+              <el-input
+                v-model="itemFormData.appearanceRemark"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? ' ' : '备注'"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <!-- 历史修改记录 -->
+      <change-record v-show="pageType === 'detail' && current === 'change-record'" :info-id="infoId" />
+    </detail-block>
+  </div>
+</template>
+
+<style lang="scss">
+.measure-data-template-detail {
+  .el-radio__label {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index 0d109d0..63b33da 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -8,6 +8,7 @@
 import FourthTemplateDetail from './components/fourth/templateDetail.vue'
 import FifthTemplateDetail from './components/fifth/templateDetail.vue'
 import SixthTemplateDetail from './components/sixth/templateDetail.vue'
+import SeventhTemplateDetail from './components/seventh/templateDetail.vue'
 import EighthTemplateDetail from './components/eighth/templateDetail.vue'
 import NinthTemplateDetail from './components/ninth/templateDetail.vue'
 import TenthTemplateDetail from './components/tenth/templateDetail.vue'
@@ -209,6 +210,8 @@
     <fifth-template-detail v-if="belongStandardEquipment === '5'" ref="templateDetailRef" :data-no="dataNo" :info-id="infoId" @giveInfoId="giveInfoId" />
     <!-- 第6套：安全阀标准装置 -->
     <sixth-template-detail v-if="belongStandardEquipment === '6'" ref="templateDetailRef" :data-no="dataNo" :info-id="infoId" @giveInfoId="giveInfoId" />
+    <!-- 第7套：精密露点仪标准装置 -->
+    <seventh-template-detail v-if="belongStandardEquipment === '7'" ref="templateDetailRef" :data-no="dataNo" :info-id="infoId" @giveInfoId="giveInfoId" />
     <!-- 第8套：E2等砝码标准装置 -->
     <eighth-template-detail v-if="belongStandardEquipment === '8'" ref="templateDetailRef" :data-no="dataNo" :info-id="infoId" @giveInfoId="giveInfoId" />
     <!-- 第9套：频谱分析仪标准装置 -->