diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 13f6131..6e86139 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -67,3 +67,15 @@
   }
   return result
 }
+export function initTableLastRow(data: any) {
+  const tableData = data
+  if (!tableData.length) {
+    return tableData
+  }
+  for (const i in tableData[tableData.length - 1]) {
+    if (i.includes('-span')) {
+      tableData[tableData.length - 1][i] = undefined
+    }
+  }
+  return tableData
+}

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 13f6131..6e86139 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -67,3 +67,15 @@
   }
   return result
 }
+export function initTableLastRow(data: any) {
+  const tableData = data
+  if (!tableData.length) {
+    return tableData
+  }
+  for (const i in tableData[tableData.length - 1]) {
+    if (i.includes('-span')) {
+      tableData[tableData.length - 1][i] = undefined
+    }
+  }
+  return tableData
+}
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index c9c8a1f..86d14c1 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -6,7 +6,7 @@
   },
   titleMenus: {
     type: Array as () => string[],
-    required: true,
+    // required: true,
     default: () => [],
   },
 })

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 13f6131..6e86139 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -67,3 +67,15 @@
   }
   return result
 }
+export function initTableLastRow(data: any) {
+  const tableData = data
+  if (!tableData.length) {
+    return tableData
+  }
+  for (const i in tableData[tableData.length - 1]) {
+    if (i.includes('-span')) {
+      tableData[tableData.length - 1][i] = undefined
+    }
+  }
+  return tableData
+}
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index c9c8a1f..86d14c1 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -6,7 +6,7 @@
   },
   titleMenus: {
     type: Array as () => string[],
-    required: true,
+    // required: true,
     default: () => [],
   },
 })
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index b3226c5..b14b937 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -83,6 +83,13 @@
 }, {
   deep: true,
 })
+watch(() => form.value.technicalIndexSymbol, (newVal) => {
+  if (newVal) {
+    for (const i in listDict.value) {
+      listDict.value[i] = listDict.value[i].map((item: any) => ({ ...item, technicalIndexSymbol: newVal }))
+    }
+  }
+})
 // 清空所有数据
 function clearAllList() {
   list.value = []

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 13f6131..6e86139 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -67,3 +67,15 @@
   }
   return result
 }
+export function initTableLastRow(data: any) {
+  const tableData = data
+  if (!tableData.length) {
+    return tableData
+  }
+  for (const i in tableData[tableData.length - 1]) {
+    if (i.includes('-span')) {
+      tableData[tableData.length - 1][i] = undefined
+    }
+  }
+  return tableData
+}
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index c9c8a1f..86d14c1 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -6,7 +6,7 @@
   },
   titleMenus: {
     type: Array as () => string[],
-    required: true,
+    // required: true,
     default: () => [],
   },
 })
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index b3226c5..b14b937 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -83,6 +83,13 @@
 }, {
   deep: true,
 })
+watch(() => form.value.technicalIndexSymbol, (newVal) => {
+  if (newVal) {
+    for (const i in listDict.value) {
+      listDict.value[i] = listDict.value[i].map((item: any) => ({ ...item, technicalIndexSymbol: newVal }))
+    }
+  }
+})
 // 清空所有数据
 function clearAllList() {
   list.value = []
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index 4d8037d..369a040 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -215,10 +215,13 @@
   if (newValue) {
     if (Array.isArray(newValue) && newValue?.length) {
       const data = newValue[newValue.length - 1]
+
       if (isMerge(data)) {
+        console.log('isMerge')
         return
       }
     }
+    console.log('要合并了')
     useMergeTableRow(newValue, props.needMergeCells)
   }
 }, {
@@ -340,7 +343,7 @@
                 />
               </el-select>
               <!-- 单选 -->
-              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 raioo">
+              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 radio">
                 <el-radio label="1" size="large">
                   是
                 </el-radio>
@@ -380,15 +383,15 @@
 
 .radio {
   :deep(.el-radio__label) {
-    display: none !important;
+    display: block !important;
   }
 }
 </style>
 
-<style lang="scss">
+<!-- <style lang="scss">
 .normal-table {
   .el-radio__label {
     display: none !important;
   }
 }
-</style>
+</style> -->

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 13f6131..6e86139 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -67,3 +67,15 @@
   }
   return result
 }
+export function initTableLastRow(data: any) {
+  const tableData = data
+  if (!tableData.length) {
+    return tableData
+  }
+  for (const i in tableData[tableData.length - 1]) {
+    if (i.includes('-span')) {
+      tableData[tableData.length - 1][i] = undefined
+    }
+  }
+  return tableData
+}
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index c9c8a1f..86d14c1 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -6,7 +6,7 @@
   },
   titleMenus: {
     type: Array as () => string[],
-    required: true,
+    // required: true,
     default: () => [],
   },
 })
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index b3226c5..b14b937 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -83,6 +83,13 @@
 }, {
   deep: true,
 })
+watch(() => form.value.technicalIndexSymbol, (newVal) => {
+  if (newVal) {
+    for (const i in listDict.value) {
+      listDict.value[i] = listDict.value[i].map((item: any) => ({ ...item, technicalIndexSymbol: newVal }))
+    }
+  }
+})
 // 清空所有数据
 function clearAllList() {
   list.value = []
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index 4d8037d..369a040 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -215,10 +215,13 @@
   if (newValue) {
     if (Array.isArray(newValue) && newValue?.length) {
       const data = newValue[newValue.length - 1]
+
       if (isMerge(data)) {
+        console.log('isMerge')
         return
       }
     }
+    console.log('要合并了')
     useMergeTableRow(newValue, props.needMergeCells)
   }
 }, {
@@ -340,7 +343,7 @@
                 />
               </el-select>
               <!-- 单选 -->
-              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 raioo">
+              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 radio">
                 <el-radio label="1" size="large">
                   是
                 </el-radio>
@@ -380,15 +383,15 @@
 
 .radio {
   :deep(.el-radio__label) {
-    display: none !important;
+    display: block !important;
   }
 }
 </style>
 
-<style lang="scss">
+<!-- <style lang="scss">
 .normal-table {
   .el-radio__label {
     display: none !important;
   }
 }
-</style>
+</style> -->
diff --git a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
index 13b0ac0..5ec5148 100644
--- a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
@@ -47,14 +47,14 @@
   belongStandardEquipment: string // 标准装置code
   belongStandardEquipmentName: string // 标准装置名称
   appearanceRemark: string // 外观（1/string | numberr）
-  appearanceFunctionCheck: string | numberr // 外观
-  voltageRegulation: string | numberr // 电源电压调整率
-  loadRegulation: string | numberr // 负载调整率
-  voltageRepresentError: string | numberr // 电压表示值误差
-  currentRepresentErrorDirect: string | numberr // 电流表示值误差(直接测量)
-  currentRepresentErrorIndirect: string | numberr // 电流表示值误差(间接测量)
-  rippleVoltage: string | numberr // 纹波电压
-  voltageOutputStability: string | numberr // 输出电压短期稳定性
+  appearanceFunctionCheck: string | number // 外观
+  voltageRegulation: string | number // 电源电压调整率
+  loadRegulation: string | number // 负载调整率
+  voltageRepresentError: string | number // 电压表示值误差
+  currentRepresentErrorDirect: string | number // 电流表示值误差(直接测量)
+  currentRepresentErrorIndirect: string | number // 电流表示值误差(间接测量)
+  rippleVoltage: string | number // 纹波电压
+  voltageOutputStability: string | number // 输出电压短期稳定性
   remark: string // 情况说明
   conclusion: string // 检验结论
 

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 13f6131..6e86139 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -67,3 +67,15 @@
   }
   return result
 }
+export function initTableLastRow(data: any) {
+  const tableData = data
+  if (!tableData.length) {
+    return tableData
+  }
+  for (const i in tableData[tableData.length - 1]) {
+    if (i.includes('-span')) {
+      tableData[tableData.length - 1][i] = undefined
+    }
+  }
+  return tableData
+}
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index c9c8a1f..86d14c1 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -6,7 +6,7 @@
   },
   titleMenus: {
     type: Array as () => string[],
-    required: true,
+    // required: true,
     default: () => [],
   },
 })
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index b3226c5..b14b937 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -83,6 +83,13 @@
 }, {
   deep: true,
 })
+watch(() => form.value.technicalIndexSymbol, (newVal) => {
+  if (newVal) {
+    for (const i in listDict.value) {
+      listDict.value[i] = listDict.value[i].map((item: any) => ({ ...item, technicalIndexSymbol: newVal }))
+    }
+  }
+})
 // 清空所有数据
 function clearAllList() {
   list.value = []
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index 4d8037d..369a040 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -215,10 +215,13 @@
   if (newValue) {
     if (Array.isArray(newValue) && newValue?.length) {
       const data = newValue[newValue.length - 1]
+
       if (isMerge(data)) {
+        console.log('isMerge')
         return
       }
     }
+    console.log('要合并了')
     useMergeTableRow(newValue, props.needMergeCells)
   }
 }, {
@@ -340,7 +343,7 @@
                 />
               </el-select>
               <!-- 单选 -->
-              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 raioo">
+              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 radio">
                 <el-radio label="1" size="large">
                   是
                 </el-radio>
@@ -380,15 +383,15 @@
 
 .radio {
   :deep(.el-radio__label) {
-    display: none !important;
+    display: block !important;
   }
 }
 </style>
 
-<style lang="scss">
+<!-- <style lang="scss">
 .normal-table {
   .el-radio__label {
     display: none !important;
   }
 }
-</style>
+</style> -->
diff --git a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
index 13b0ac0..5ec5148 100644
--- a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
@@ -47,14 +47,14 @@
   belongStandardEquipment: string // 标准装置code
   belongStandardEquipmentName: string // 标准装置名称
   appearanceRemark: string // 外观（1/string | numberr）
-  appearanceFunctionCheck: string | numberr // 外观
-  voltageRegulation: string | numberr // 电源电压调整率
-  loadRegulation: string | numberr // 负载调整率
-  voltageRepresentError: string | numberr // 电压表示值误差
-  currentRepresentErrorDirect: string | numberr // 电流表示值误差(直接测量)
-  currentRepresentErrorIndirect: string | numberr // 电流表示值误差(间接测量)
-  rippleVoltage: string | numberr // 纹波电压
-  voltageOutputStability: string | numberr // 输出电压短期稳定性
+  appearanceFunctionCheck: string | number // 外观
+  voltageRegulation: string | number // 电源电压调整率
+  loadRegulation: string | number // 负载调整率
+  voltageRepresentError: string | number // 电压表示值误差
+  currentRepresentErrorDirect: string | number // 电流表示值误差(直接测量)
+  currentRepresentErrorIndirect: string | number // 电流表示值误差(间接测量)
+  rippleVoltage: string | number // 纹波电压
+  voltageOutputStability: string | number // 输出电压短期稳定性
   remark: string // 情况说明
   conclusion: string // 检验结论
 
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index 5d7a853..f76d20a 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -19,7 +19,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { calc } from '@/utils/useCalc'
 import templateTable from '@/views/business/measure/item/components/second/templateTable.vue'
-import { initTableRow } from '@/commonMethods/useMergeTableRow'
+import { initTableLastRow, initTableRow } from '@/commonMethods/useMergeTableRow'
 import { differenceArray } from '@/utils/Array'
 const props = defineProps({
   infoId: String, // id
@@ -170,7 +170,7 @@
 const addRow = () => {
   if (!checkList(outputVoltageStabilityList.value, columns_output_voltage_stability.value, '输出电压短期稳定性')) { return }
   // 增加行
-  outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1])
+  outputVoltageStabilityList.value.push({ ...outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1] })
   // 初始化数据
   outputVoltageStabilityList.value = initTableRow(outputVoltageStabilityList.value)
 }
@@ -209,8 +209,10 @@
     // 有关于检定项的数据
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
     initInputData(res.data.measureDataDcPowerList)
+    console.log(1111111)
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
+    console.log(222222)
     // ==================================检定数据========================================================================
     infoId.value = res.data.id
     emits('giveInfoId', infoId.value)

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 13f6131..6e86139 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -67,3 +67,15 @@
   }
   return result
 }
+export function initTableLastRow(data: any) {
+  const tableData = data
+  if (!tableData.length) {
+    return tableData
+  }
+  for (const i in tableData[tableData.length - 1]) {
+    if (i.includes('-span')) {
+      tableData[tableData.length - 1][i] = undefined
+    }
+  }
+  return tableData
+}
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index c9c8a1f..86d14c1 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -6,7 +6,7 @@
   },
   titleMenus: {
     type: Array as () => string[],
-    required: true,
+    // required: true,
     default: () => [],
   },
 })
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index b3226c5..b14b937 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -83,6 +83,13 @@
 }, {
   deep: true,
 })
+watch(() => form.value.technicalIndexSymbol, (newVal) => {
+  if (newVal) {
+    for (const i in listDict.value) {
+      listDict.value[i] = listDict.value[i].map((item: any) => ({ ...item, technicalIndexSymbol: newVal }))
+    }
+  }
+})
 // 清空所有数据
 function clearAllList() {
   list.value = []
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index 4d8037d..369a040 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -215,10 +215,13 @@
   if (newValue) {
     if (Array.isArray(newValue) && newValue?.length) {
       const data = newValue[newValue.length - 1]
+
       if (isMerge(data)) {
+        console.log('isMerge')
         return
       }
     }
+    console.log('要合并了')
     useMergeTableRow(newValue, props.needMergeCells)
   }
 }, {
@@ -340,7 +343,7 @@
                 />
               </el-select>
               <!-- 单选 -->
-              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 raioo">
+              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 radio">
                 <el-radio label="1" size="large">
                   是
                 </el-radio>
@@ -380,15 +383,15 @@
 
 .radio {
   :deep(.el-radio__label) {
-    display: none !important;
+    display: block !important;
   }
 }
 </style>
 
-<style lang="scss">
+<!-- <style lang="scss">
 .normal-table {
   .el-radio__label {
     display: none !important;
   }
 }
-</style>
+</style> -->
diff --git a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
index 13b0ac0..5ec5148 100644
--- a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
@@ -47,14 +47,14 @@
   belongStandardEquipment: string // 标准装置code
   belongStandardEquipmentName: string // 标准装置名称
   appearanceRemark: string // 外观（1/string | numberr）
-  appearanceFunctionCheck: string | numberr // 外观
-  voltageRegulation: string | numberr // 电源电压调整率
-  loadRegulation: string | numberr // 负载调整率
-  voltageRepresentError: string | numberr // 电压表示值误差
-  currentRepresentErrorDirect: string | numberr // 电流表示值误差(直接测量)
-  currentRepresentErrorIndirect: string | numberr // 电流表示值误差(间接测量)
-  rippleVoltage: string | numberr // 纹波电压
-  voltageOutputStability: string | numberr // 输出电压短期稳定性
+  appearanceFunctionCheck: string | number // 外观
+  voltageRegulation: string | number // 电源电压调整率
+  loadRegulation: string | number // 负载调整率
+  voltageRepresentError: string | number // 电压表示值误差
+  currentRepresentErrorDirect: string | number // 电流表示值误差(直接测量)
+  currentRepresentErrorIndirect: string | number // 电流表示值误差(间接测量)
+  rippleVoltage: string | number // 纹波电压
+  voltageOutputStability: string | number // 输出电压短期稳定性
   remark: string // 情况说明
   conclusion: string // 检验结论
 
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index 5d7a853..f76d20a 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -19,7 +19,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { calc } from '@/utils/useCalc'
 import templateTable from '@/views/business/measure/item/components/second/templateTable.vue'
-import { initTableRow } from '@/commonMethods/useMergeTableRow'
+import { initTableLastRow, initTableRow } from '@/commonMethods/useMergeTableRow'
 import { differenceArray } from '@/utils/Array'
 const props = defineProps({
   infoId: String, // id
@@ -170,7 +170,7 @@
 const addRow = () => {
   if (!checkList(outputVoltageStabilityList.value, columns_output_voltage_stability.value, '输出电压短期稳定性')) { return }
   // 增加行
-  outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1])
+  outputVoltageStabilityList.value.push({ ...outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1] })
   // 初始化数据
   outputVoltageStabilityList.value = initTableRow(outputVoltageStabilityList.value)
 }
@@ -209,8 +209,10 @@
     // 有关于检定项的数据
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
     initInputData(res.data.measureDataDcPowerList)
+    console.log(1111111)
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
+    console.log(222222)
     // ==================================检定数据========================================================================
     infoId.value = res.data.id
     emits('giveInfoId', infoId.value)
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index d80daad..65a8349 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="checkDataDetail">
 import { ref, watch } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
+import { clearDateValue, handleDetailTableTableHead, handleSaveDateParams, solveHistoryIndicationTableData } from '../useStabilityCaculate'
 import saveCheckRecord from '../../dialog/saveCheckRecord.vue'
 import type { IList } from './second-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -10,12 +11,25 @@
 import { getDictByCode } from '@/api/system/dict'
 import multiTable from '@/components/MultiHeaderTable/index.vue'
 import { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book'
-import { addCheckData, calculateHandle, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
+import { addCheckData, calculateHandle, getHistoryIndication, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
+import { uniqueMultiArray } from '@/utils/Array'
+const props = defineProps({
+  selectStandardId: {
+    type: String,
+  },
+  pageType: { // 页面类型
+    type: String,
+  },
+  checkDate: { // 核查日期
+    type: String,
+  },
+})
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('')
+const equipmentId = ref('')
 const ruleFormRef = ref() // 表单ref
 const form = ref({
   // conclusion: '', // 结论
@@ -25,7 +39,8 @@
 const belongStandardEquipment = ref('2')
 const itemCategoryId = ref('') // 核查项分类id
 const itemCategoryName = ref('') // 核查项分类名称
-
+const dateArrStability = ref<string[]>([]) // 稳定性日期数组
+const currentDate = ref('') // 要查询历史稳定性的日期
 // ----------------------------------路由参数------------------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
@@ -48,17 +63,18 @@
 
 // ----------------------------------------核查数据----------------------------------------------
 const radioMenus = ref([ // 标签内容
-  { name: '直流电压', value: 'voltage' },
-  { name: '电源效应和负载效应', value: 'effect' },
-  { name: '直接电流（直接测量）', value: 'electricity-direct' },
-  { name: '直接电流（间接测量）', value: 'electricity-indirect' },
-  { name: '纹波电压', value: 'ripple-voltage' },
+  { name: '直流电压', value: 'voltage', params: '1' },
+  { name: '电源效应和负载效应', value: 'effect', params: '2' },
+  { name: '直接电流（直接测量）', value: 'electricity-direct', params: '3' },
+  { name: '直接电流（间接测量）', value: 'electricity-indirect', params: '4' },
+  { name: '纹波电压', value: 'ripple-voltage', params: '5' },
 ])
 const current = ref('voltage') // 选择的tab 默认基本信息
 const repeatabilityColumns = ref<TableColumn[]>([]) // 重复性表头
 const stabilityColumns = ref<TableColumn[]>([]) // 稳定性表头
+const stabilityColumnsCheckData = ref<TableColumn[]>([]) // 稳定性表头 -- 查询历史日期
 const columns_repeatability_voltage = ref<TableColumn[]>([ // 重复性表头（直流电压、电源效应和负载效应，直接电流（直接测量））
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
@@ -68,12 +84,12 @@
     required: true,
     width: '160',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '2', value: '2', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '3', value: '3', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '4', value: '4', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '5', value: '5', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '6', value: '6', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '1', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '2', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '3', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '4', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '5', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '6', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber' },
     ],
   },
   { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
@@ -82,7 +98,7 @@
 ])
 // 直接电流（间接测量） 重复性表头
 const columns_repeatability_electricity_indirect = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', 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: 'unit', align: 'center', required: true, type: 'text' },
@@ -93,12 +109,12 @@
     required: true,
     width: '160',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '2', value: '2', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '3', value: '3', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '4', value: '4', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '5', value: '5', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '6', value: '6', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '1', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '2', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '3', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '4', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '5', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '6', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber' },
     ],
   },
   { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
@@ -108,7 +124,7 @@
 
 // 纹波电压 重复性表头
 const columns_repeatability_ripple_voltage = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '频率', value: 'checkPoint', align: 'center', required: true, type: 'text' },
@@ -119,25 +135,26 @@
     required: true,
     width: '160',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '2', value: '2', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '3', value: '3', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '4', value: '4', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '5', value: '5', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '6', value: '6', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '7', value: '7', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '8', value: '8', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '9', value: '9', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '10', value: '10', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '1', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '2', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '3', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '4', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '5', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '6', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '7', value: 'testValueSeven', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '8', value: 'testValueEight', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '9', value: 'testValueNine', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '10', value: 'testValueTen', align: 'center', required: true, width: '180', type: 'inputNumber' },
     ],
   },
   { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
   { text: '标准偏差S(X)', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
   { text: '相对标准偏差', value: 'relativeRepeatability', align: 'center', type: 'text' },
 ])
+
 // 稳定性表头，直流电压、电源效应和负载效应
 const columns_stability_voltage = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
@@ -161,10 +178,61 @@
   { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
   { text: '相对标准偏差是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
 ])
-
+// 稳定性表头，直流电压、电源效应和负载效应 -- 查询历史日期
+const columns_stability_voltage_check_date = ref<TableColumn[]>([
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  {
+    text: '示值',
+    value: 'indicatingValue',
+    align: 'center',
+    required: true,
+    width: '110',
+    children: [
+      { text: '2022-12-12', value: '2022-12-12', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-13', value: '2022-12-13', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-14', value: '2022-12-14', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-15', value: '2022-12-15', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-16', value: '2022-12-16', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-17', value: '2022-12-17', align: 'center', required: true, type: 'text' },
+    ],
+  },
+  { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
+  { text: '标准偏差S(X)', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
+  { text: '相对标准偏差', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
+  { text: '相对标准偏差是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
+])
 // 稳定性表头，直接电流（直接测量）、直接电流（间接测量）
 const columns_stability_electricity_direct = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  {
+    text: '示值',
+    value: 'indicatingValue',
+    align: 'center',
+    required: true,
+    width: '110',
+    children: [
+      { text: '2022-12-12', value: '2022-12-12', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-13', value: '2022-12-13', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-14', value: '2022-12-14', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-15', value: '2022-12-15', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-16', value: '2022-12-16', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-17', value: '2022-12-17', align: 'center', required: true, type: 'text' },
+    ],
+  },
+  { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
+  { text: '标准偏差S(X)', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
+  { text: '相对重复性', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
+  { text: '相对重复性是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
+])
+// 稳定性表头，直接电流（直接测量）、直接电流（间接测量） -- 查询历史日期
+const columns_stability_electricity_direct_check_date = ref<TableColumn[]>([
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
@@ -190,7 +258,7 @@
 ])
 // 稳定性表头，纹波电压
 const columns_stability_ripple_voltage = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '频率', value: 'unit', align: 'center', required: true, type: 'text' },
@@ -214,50 +282,429 @@
   { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
   { text: '标准偏差是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
 ])
-
+// 稳定性表头，纹波电压 -- 查询历史日期
+const columns_stability_ripple_voltage_check_date = ref<TableColumn[]>([
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  { text: '频率', value: 'unit', align: 'center', required: true, type: 'text' },
+  {
+    text: '示值',
+    value: 'indicatingValue',
+    align: 'center',
+    required: true,
+    width: '110',
+    children: [
+      { text: '2022-12-12', value: '2022-12-12', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-13', value: '2022-12-13', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-14', value: '2022-12-14', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-15', value: '2022-12-15', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-16', value: '2022-12-16', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-17', value: '2022-12-17', align: 'center', required: true, type: 'text' },
+    ],
+  },
+  { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
+  { text: '标准偏差S(X)', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
+  { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
+  { text: '标准偏差是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
+])
 const listRepeatability = ref<any[]>([]) // 重复性数据
+const listRepeatabilityCheckDate = ref<any[]>([]) // 重复性数据-- 查询历史日期
 const listStability = ref<any[]>([]) // 稳定性数据
+const listStabilityCheckDate = ref<any[]>([]) // 稳定性数据-- 查询历史日期
 
 const voltageListRepeatability = ref<any[]>([]) // 直流电压重复性
+const voltageListRepeatabilityCheckDate = ref<any[]>([]) // 直流电压重复性 -- 查询历史日期
 const voltageListStability = ref<any[]>([]) // 直流电压稳定性
+const voltageListStabilityCheckDate = ref<any[]>([]) // 直流电压稳定性-- 查询历史日期
 const effectListRepeatability = ref<any[]>([]) // 电源效应和负载效应重复性
+const effectListRepeatabilityCheckDate = ref<any[]>([]) // 电源效应和负载效应重复性-- 查询历史日期
 const effectListStability = ref<any[]>([]) // 电源效应和负载效应稳定性
+const effectListStabilityCheckDate = ref<any[]>([]) // 电源效应和负载效应稳定性-- 查询历史日期
 const electricityDirectListRepeatability = ref<any[]>([]) // 直接电流（直接测量）重复性
-const electricityDirectListStability = ref<any[]>([]) // 直接电流（直接测量）稳定性
+const electricityDirectListRepeatabilityCheckDate = ref<any[]>([]) // 直接电流（直接测量）重复性-- 查询历史日期
+const electricityDirectListStability = ref<any[]>([]) // 直接电流（直接测量）稳定性/
+const electricityDirectListStabilityCheckDate = ref<any[]>([]) // 直接电流（直接测量）稳定性-- 查询历史日期
 const electricityIndirectListRepeatability = ref<any[]>([]) // 直接电流（间接测量）重复性
+const electricityIndirectListRepeatabilityCheckDate = ref<any[]>([]) // 直接电流（间接测量）重复性-- 查询历史日期
 const electricityIndirectListStability = ref<any[]>([]) // 直接电流（间接测量）稳定性
-const rippleVoltageListRepeatability = ref<any[]>([]) // 纹波电压重复性
+const electricityIndirectListStabilityCheckDate = ref<any[]>([]) // 直接电流（间接测量）稳定性-- 查询历史日期
+const rippleVoltageListRepeatability = ref<any[]>([]) // 纹波电压重复性-- 查询历史日期
+const rippleVoltageListRepeatabilityCheckDate = ref<any[]>([]) // 纹波电压重复性
 const rippleVoltageListStability = ref<any[]>([]) // 纹波电压稳定性
-
+const rippleVoltageListStabilityCheckDate = ref<any[]>([]) // 纹波电压稳定性-- 查询历史日期
+watch(() => [voltageListRepeatability.value, voltageListStability.value, effectListRepeatability.value, effectListStability.value, electricityDirectListRepeatability.value, electricityDirectListStability.value, electricityIndirectListRepeatability.value, electricityIndirectListStability.value, rippleVoltageListRepeatability.value, rippleVoltageListStability.value], () => {
+  const variable = current.value
+  current.value = ''
+  setTimeout(() => {
+    current.value = variable
+  })
+})
 // 获取配置详情
-function fetchCheckItemDetail(equipmentId: string, belongStandardEquipmentParam: string, itemCategoryIdParam: string, itemCategoryNameParam: string) {
+function fetchCheckItemDetail(cequipmentId: string, belongStandardEquipmentParam: string, itemCategoryIdParam: string, itemCategoryNameParam: string) {
   belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
   itemCategoryId.value = itemCategoryIdParam // 核查分类id
   itemCategoryName.value = itemCategoryNameParam // 核查分类名称
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  equipmentId.value = cequipmentId
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   const params = {
-    equipmentId, // 设备id
+    equipmentId: cequipmentId, // 设备id
     belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
     itemCategoryId: itemCategoryId.value, // 核查项分类id
     itemCategoryName: itemCategoryName.value, // 核查项分类名称
   }
   getCheckItemDetail(params).then((res) => {
-    // loading.close()
-    // handleData(res.data.checkItemDataCalibratorList)
+    console.log(res.data, '详情')
+    loading.close()
+    handleData(res.data.checkItemDataDcPowerList)
+    fetchHistoryIndication() // 获取稳定性
   })
 }
+// 处理数据
+function handleData(data: any) {
+  if (!data) { return }
+  console.log(data, 'data')
+  // 控制tab
+  const needShowTab = uniqueMultiArray(data, 'params').map((item: any) => item.params)
+  radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params))
+  current.value = radioMenus.value[0]?.value
+  // 直流电压重复性
+  voltageListRepeatability.value = data.filter((item: any) => item.params === '1').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '直流电压',
+    params: '1',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 直流电压稳定性
+  voltageListStability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+  // 电源效应和负载效应重复性
+  effectListRepeatability.value = data.filter((item: any) => item.params === '2').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '电源效应和负载效应',
+    params: '2',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 电源效应和负载效应稳定性
+  effectListStability.value = effectListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+  // 直接电流（直接测量）重复性
+  electricityDirectListRepeatability.value = data.filter((item: any) => item.params === '2').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '直接电流(直接测量)',
+    params: '3',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 直接电流（直接测量）稳定性
+  electricityDirectListStability.value = electricityDirectListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+  //  直接电流（间接测量）重复性
+  electricityIndirectListRepeatability.value = data.filter((item: any) => item.params === '2').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '直接电流(间接测量)',
+    params: '4',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 直接电流（间接测量）稳定性
+  electricityIndirectListStability.value = electricityIndirectListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+  // 纹波电压重复性
+  rippleVoltageListRepeatability.value = data.filter((item: any) => item.params === '2').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '纹波电压',
+    params: '5',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    testValueSeven: '',
+    testValueEight: '',
+    testValueNine: '',
+    testValueTen: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 纹波电压稳定性
+  rippleVoltageListStability.value = rippleVoltageListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+}
 
 // 点击生成结果处理
-const createResult = () => {
-  //
+const createResult = (params: string, type: string) => {
+  // 公共请求函数
+  const handleResult = (list: any, fun: any) => {
+    const data = {
+      belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置
+      checkDataDcPowerList: [],
+      itemCategoryId: itemCategoryId.value, // 核查项分类id
+      itemCategoryName: itemCategoryName.value, // 核查项分类id
+    }
+    data.checkDataDcPowerList = list
+    calculateHandle(data).then((res) => {
+      fun(res.data)
+    })
+  }
+  // 公共处理结果函数
+  const handeData = (initData: any, handleData: any) => {
+    return handleData.map((item: any, index: number) => {
+      return {
+        ...item,
+        averageValue: initData[index].averageValue, //	核查读数6（本次重复性示值算术平均值）
+        standardDeviation: initData[index].standardDeviation, //	标准偏差S(X)
+        relativeRepeatability: initData[index].relativeRepeatability, //	相对标准偏差
+        testValueSixDate: props.checkDate, //	核查读数6日期（本次核查日期）
+      }
+    })
+  }
+  switch (params) {
+    case 'voltage':
+      // 直流电压
+      if (!voltageListRepeatability.value.length) {
+        ElMessage.warning('直流电压未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            voltageListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              voltageListRepeatability.value = handeData(data, voltageListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!voltageListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算直流电压重复性')
+            break
+          }
+          break
+      }
+      break
+    case 'effect':
+      // 电源效应和负载效应
+      if (!effectListRepeatability.value.length) {
+        ElMessage.warning('电源效应和负载效应未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            effectListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              effectListRepeatability.value = handeData(data, effectListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!effectListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算电源效应和负载效应重复性')
+            break
+          }
+          break
+      }
+      break
+    case 'electricity-direct':
+      // 直接电流（直接测量）
+      if (!electricityDirectListRepeatability.value.length) {
+        ElMessage.warning('直接电流（直接测量）未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            electricityDirectListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              electricityDirectListRepeatability.value = handeData(data, electricityDirectListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!electricityDirectListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算直接电流（直接测量）重复性')
+            break
+          }
+          break
+      }
+      break
+    case 'electricity-indirect':
+      // 直接电流（间接测量）
+      if (!electricityIndirectListRepeatability.value.length) {
+        ElMessage.warning('直接电流（间接测量）未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            electricityIndirectListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              electricityIndirectListRepeatability.value = handeData(data, electricityIndirectListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!electricityIndirectListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算直接电流（间接测量）重复性')
+            break
+          }
+          break
+      }
+      break
+    case 'ripple-voltage':
+      // 纹波电压
+      if (!rippleVoltageListRepeatability.value.length) {
+        ElMessage.warning('纹波电压未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            rippleVoltageListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              rippleVoltageListRepeatability.value = handeData(data, rippleVoltageListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!rippleVoltageListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算纹波电压重复性')
+            break
+          }
+          break
+      }
+      break
+  }
 }
 // ------------------------------------------------------------------------------------------
-
+// 保存之前的校验
+// function checkList() {
+//   if (current.value === 'voltage' && `${voltageListRepeatability.value[0].averageValue}` === '') { // 直流电压
+//     ElMessage.warning('请计算直流电压重复性')
+//     return false
+//   }
+//   if (current.value === 'effect' && `${effectListRepeatability.value[0].averageValue}` === '') { // 电源效应和负载效应
+//     ElMessage.warning('请计算电源效应和负载效应重复性')
+//     return false
+//   }
+//   if (current.value === 'voltage' && `${voltageListStability.value[0].lessThan}` === '') { // 直流电压
+//     ElMessage.warning('请计算直流电压稳定性')
+//     return false
+//   }
+//   if (current.value === 'resistance' && `${resistanceListStability.value[0].lessThan}` === '') { // 电阻测量
+//     ElMessage.warning('请计算电阻测量稳定性')
+//     return false
+//   }
+//   return true
+// }
 // 获取详情
-function fetchInfo() {
+function fetchInfo(id = '') {
   // const loading = ElLoading.service({
   //   lock: true,
   //   background: 'rgba(255, 255, 255, 0.8)',
@@ -273,7 +720,62 @@
   //   loading.close()
   // })
 }
+/**
+ * 获取稳定性示值
+ * @param date 查询日期
+ */
+function fetchHistoryIndication(date = '') {
+  const params = {
+    belongStandardEquipment: belongStandardEquipment.value,	// 检校标准装置(字典code)
+    checkDate: date || props.checkDate!,	// 核查日期
+    checkParam: '',	// 核查参数((直流稳压电源-直接电流(间接测量))
+    conclusion: '合格',	// 结论
+    equipmentId: equipmentId.value,	// 被核查设备id
+    params: radioMenus.value.filter(item => item.value === current.value)[0].params,	// 核查项目
+    stabilityExamine: '1',	// 是否用于稳定性考核(1/0)
+    standardEquipmentId: props.selectStandardId!,	// 被核查标准装置id
+  }
+  if (props.selectStandardId && equipmentId.value) {
+    console.log(123)
+    getHistoryIndication(params).then((res) => {
+      if (date === '') { // 正常核查数据
+        const num = props.pageType === 'edit' ? 5 : 4
+        // 直流电压
+        voltageListStability.value = voltageListStability.value.map((item) => {
+          clearDateValue(item)
+          const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3)
+          columns_stability_voltage.value = columnsData
+          return item = itemData
+        })
+        voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3)
+      }
+      else {
+        // 直流电压
+        voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => {
+          clearDateValue(item)
+          const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3)
+          columns_stability_voltage_check_date.value = columnsData
+          // stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value
+          return item = itemData
+        })
+        voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3)
+        console.log(voltageListStabilityCheckDate.value, 'voltageListStabilityCheckDate.value')
+        console.log(columns_stability_voltage_check_date.value, 'columns_stability_voltage_check_date.value')
+      }
+    })
+  }
+}
+// =======================点击表头日期查询历史稳定性数据===================
+// 点击表头
+const handleClickHeader = (val: any, checkDateDetailId: string) => {
+  dateArrStability.value = ['核查数据', val.label]
+  fetchInfo(checkDateDetailId) // 获取此次历史日期的详情
+}
 
+// 日期变化
+const handleChangeRadio = (date: string) => {
+  currentDate.value = date
+}
 // -------------------------------------钩子-----------------------------------------------------
 watch(() => current.value, (newValue) => {
   switch (newValue) {
@@ -281,7 +783,7 @@
       repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头
       stabilityColumns.value = columns_stability_voltage.value // 稳定性表头
       listRepeatability.value = voltageListRepeatability.value // 重复性数据
-      listStability.value = voltageListRepeatability.value // 稳定性数据
+      listStability.value = voltageListStability.value // 稳定性数据
       break
     case 'effect': // 电源效应和负载效应
       repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头
@@ -307,12 +809,13 @@
       listRepeatability.value = rippleVoltageListRepeatability.value // 重复性数据
       listStability.value = rippleVoltageListStability.value // 稳定性数据
       break
-    default:
-      break
   }
 }, { immediate: true })
 
 onMounted(async () => {
+  belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置
+  itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id
+  itemCategoryName.value = $route.query.itemCategoryName as string // 核查项分类名称
   if (pageType.value !== 'add') {
     // fetchInfo()
   }
@@ -323,7 +826,7 @@
 
 <template>
   <!-- 核查数据 -->
-  <detail-block title="核查数据">
+  <detail-block :title="dateArrStability.length > 1 ? ' ' : '核查数据'" :title-menus="dateArrStability" @handle-change-radio="handleChangeRadio">
     <div style="display: flex;justify-content: space-between;">
       <el-radio-group v-model="current" style="margin-bottom: 20px;">
         <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
@@ -333,29 +836,51 @@
     </div>
     <div style="display: flex;justify-content: space-between;align-items: center;">
       <h5>核查类型--重复性</h5>
-      <el-button v-if="pageType !== 'detail'" type="primary" @click="createResult">
+      <el-button v-if="pageType !== 'detail'" type="primary" @click="createResult(current, '重复性')">
         生成结果处理
       </el-button>
     </div>
     <multi-table
+      v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listRepeatability"
       :table-header="repeatabilityColumns"
       :merge-rows="[]"
       :need-index="true"
     />
+    <!-- 历史日期重复性数据 -->
+    <multi-table
+      v-show="currentDate !== '核查数据' && currentDate !== ''"
+      :table-data="listRepeatabilityCheckDate"
+      :table-header="repeatabilityColumns"
+      :merge-rows="[]"
+      :need-index="true"
+      max-height="300"
+    />
 
     <div style="display: flex;justify-content: space-between;align-items: center;">
       <h5>核查类型--稳定性</h5>
-      <el-button v-if="pageType !== 'detail'" type="primary" @click="createResult">
+      <el-button v-if="pageType !== 'detail'" type="primary" @click="createResult(current, '稳定性')">
         生成结果处理
       </el-button>
     </div>
 
     <multi-table
+      v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listStability"
       :table-header="stabilityColumns"
       :merge-rows="[]"
       :need-index="true"
+      max-height="500"
+      @handle-click-header="handleClickHeader"
+    />
+    <multi-table
+      v-show="currentDate !== '核查数据' && currentDate !== ''"
+      :table-data="listStabilityCheckDate"
+      :table-header="stabilityColumnsCheckData"
+      :merge-rows="[]"
+      :need-index="true"
+      max-height="500"
+      @handle-click-header="handleClickHeader"
     />
     <!-- 稳定性考核是否合格 -->
     <el-form

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 13f6131..6e86139 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -67,3 +67,15 @@
   }
   return result
 }
+export function initTableLastRow(data: any) {
+  const tableData = data
+  if (!tableData.length) {
+    return tableData
+  }
+  for (const i in tableData[tableData.length - 1]) {
+    if (i.includes('-span')) {
+      tableData[tableData.length - 1][i] = undefined
+    }
+  }
+  return tableData
+}
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index c9c8a1f..86d14c1 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -6,7 +6,7 @@
   },
   titleMenus: {
     type: Array as () => string[],
-    required: true,
+    // required: true,
     default: () => [],
   },
 })
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index b3226c5..b14b937 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -83,6 +83,13 @@
 }, {
   deep: true,
 })
+watch(() => form.value.technicalIndexSymbol, (newVal) => {
+  if (newVal) {
+    for (const i in listDict.value) {
+      listDict.value[i] = listDict.value[i].map((item: any) => ({ ...item, technicalIndexSymbol: newVal }))
+    }
+  }
+})
 // 清空所有数据
 function clearAllList() {
   list.value = []
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index 4d8037d..369a040 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -215,10 +215,13 @@
   if (newValue) {
     if (Array.isArray(newValue) && newValue?.length) {
       const data = newValue[newValue.length - 1]
+
       if (isMerge(data)) {
+        console.log('isMerge')
         return
       }
     }
+    console.log('要合并了')
     useMergeTableRow(newValue, props.needMergeCells)
   }
 }, {
@@ -340,7 +343,7 @@
                 />
               </el-select>
               <!-- 单选 -->
-              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 raioo">
+              <el-radio-group v-if="item.type === 'radio'" v-model="scope.row[item.value]" :disabled="disabled(scope, item)" style="width: 100%;" class="ml-4 radio">
                 <el-radio label="1" size="large">
                   是
                 </el-radio>
@@ -380,15 +383,15 @@
 
 .radio {
   :deep(.el-radio__label) {
-    display: none !important;
+    display: block !important;
   }
 }
 </style>
 
-<style lang="scss">
+<!-- <style lang="scss">
 .normal-table {
   .el-radio__label {
     display: none !important;
   }
 }
-</style>
+</style> -->
diff --git a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
index 13b0ac0..5ec5148 100644
--- a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
@@ -47,14 +47,14 @@
   belongStandardEquipment: string // 标准装置code
   belongStandardEquipmentName: string // 标准装置名称
   appearanceRemark: string // 外观（1/string | numberr）
-  appearanceFunctionCheck: string | numberr // 外观
-  voltageRegulation: string | numberr // 电源电压调整率
-  loadRegulation: string | numberr // 负载调整率
-  voltageRepresentError: string | numberr // 电压表示值误差
-  currentRepresentErrorDirect: string | numberr // 电流表示值误差(直接测量)
-  currentRepresentErrorIndirect: string | numberr // 电流表示值误差(间接测量)
-  rippleVoltage: string | numberr // 纹波电压
-  voltageOutputStability: string | numberr // 输出电压短期稳定性
+  appearanceFunctionCheck: string | number // 外观
+  voltageRegulation: string | number // 电源电压调整率
+  loadRegulation: string | number // 负载调整率
+  voltageRepresentError: string | number // 电压表示值误差
+  currentRepresentErrorDirect: string | number // 电流表示值误差(直接测量)
+  currentRepresentErrorIndirect: string | number // 电流表示值误差(间接测量)
+  rippleVoltage: string | number // 纹波电压
+  voltageOutputStability: string | number // 输出电压短期稳定性
   remark: string // 情况说明
   conclusion: string // 检验结论
 
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index 5d7a853..f76d20a 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -19,7 +19,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { calc } from '@/utils/useCalc'
 import templateTable from '@/views/business/measure/item/components/second/templateTable.vue'
-import { initTableRow } from '@/commonMethods/useMergeTableRow'
+import { initTableLastRow, initTableRow } from '@/commonMethods/useMergeTableRow'
 import { differenceArray } from '@/utils/Array'
 const props = defineProps({
   infoId: String, // id
@@ -170,7 +170,7 @@
 const addRow = () => {
   if (!checkList(outputVoltageStabilityList.value, columns_output_voltage_stability.value, '输出电压短期稳定性')) { return }
   // 增加行
-  outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1])
+  outputVoltageStabilityList.value.push({ ...outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1] })
   // 初始化数据
   outputVoltageStabilityList.value = initTableRow(outputVoltageStabilityList.value)
 }
@@ -209,8 +209,10 @@
     // 有关于检定项的数据
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
     initInputData(res.data.measureDataDcPowerList)
+    console.log(1111111)
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
+    console.log(222222)
     // ==================================检定数据========================================================================
     infoId.value = res.data.id
     emits('giveInfoId', infoId.value)
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index d80daad..65a8349 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="checkDataDetail">
 import { ref, watch } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
+import { clearDateValue, handleDetailTableTableHead, handleSaveDateParams, solveHistoryIndicationTableData } from '../useStabilityCaculate'
 import saveCheckRecord from '../../dialog/saveCheckRecord.vue'
 import type { IList } from './second-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -10,12 +11,25 @@
 import { getDictByCode } from '@/api/system/dict'
 import multiTable from '@/components/MultiHeaderTable/index.vue'
 import { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book'
-import { addCheckData, calculateHandle, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
+import { addCheckData, calculateHandle, getHistoryIndication, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
+import { uniqueMultiArray } from '@/utils/Array'
+const props = defineProps({
+  selectStandardId: {
+    type: String,
+  },
+  pageType: { // 页面类型
+    type: String,
+  },
+  checkDate: { // 核查日期
+    type: String,
+  },
+})
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('')
+const equipmentId = ref('')
 const ruleFormRef = ref() // 表单ref
 const form = ref({
   // conclusion: '', // 结论
@@ -25,7 +39,8 @@
 const belongStandardEquipment = ref('2')
 const itemCategoryId = ref('') // 核查项分类id
 const itemCategoryName = ref('') // 核查项分类名称
-
+const dateArrStability = ref<string[]>([]) // 稳定性日期数组
+const currentDate = ref('') // 要查询历史稳定性的日期
 // ----------------------------------路由参数------------------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
@@ -48,17 +63,18 @@
 
 // ----------------------------------------核查数据----------------------------------------------
 const radioMenus = ref([ // 标签内容
-  { name: '直流电压', value: 'voltage' },
-  { name: '电源效应和负载效应', value: 'effect' },
-  { name: '直接电流（直接测量）', value: 'electricity-direct' },
-  { name: '直接电流（间接测量）', value: 'electricity-indirect' },
-  { name: '纹波电压', value: 'ripple-voltage' },
+  { name: '直流电压', value: 'voltage', params: '1' },
+  { name: '电源效应和负载效应', value: 'effect', params: '2' },
+  { name: '直接电流（直接测量）', value: 'electricity-direct', params: '3' },
+  { name: '直接电流（间接测量）', value: 'electricity-indirect', params: '4' },
+  { name: '纹波电压', value: 'ripple-voltage', params: '5' },
 ])
 const current = ref('voltage') // 选择的tab 默认基本信息
 const repeatabilityColumns = ref<TableColumn[]>([]) // 重复性表头
 const stabilityColumns = ref<TableColumn[]>([]) // 稳定性表头
+const stabilityColumnsCheckData = ref<TableColumn[]>([]) // 稳定性表头 -- 查询历史日期
 const columns_repeatability_voltage = ref<TableColumn[]>([ // 重复性表头（直流电压、电源效应和负载效应，直接电流（直接测量））
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
@@ -68,12 +84,12 @@
     required: true,
     width: '160',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '2', value: '2', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '3', value: '3', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '4', value: '4', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '5', value: '5', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '6', value: '6', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '1', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '2', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '3', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '4', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '5', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '6', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber' },
     ],
   },
   { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
@@ -82,7 +98,7 @@
 ])
 // 直接电流（间接测量） 重复性表头
 const columns_repeatability_electricity_indirect = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', 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: 'unit', align: 'center', required: true, type: 'text' },
@@ -93,12 +109,12 @@
     required: true,
     width: '160',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '2', value: '2', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '3', value: '3', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '4', value: '4', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '5', value: '5', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '6', value: '6', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '1', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '2', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '3', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '4', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '5', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '6', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber' },
     ],
   },
   { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
@@ -108,7 +124,7 @@
 
 // 纹波电压 重复性表头
 const columns_repeatability_ripple_voltage = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '频率', value: 'checkPoint', align: 'center', required: true, type: 'text' },
@@ -119,25 +135,26 @@
     required: true,
     width: '160',
     children: [
-      { text: '1', value: '1', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '2', value: '2', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '3', value: '3', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '4', value: '4', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '5', value: '5', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '6', value: '6', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '7', value: '7', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '8', value: '8', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '9', value: '9', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '10', value: '10', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '1', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '2', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '3', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '4', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '5', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '6', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '7', value: 'testValueSeven', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '8', value: 'testValueEight', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '9', value: 'testValueNine', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '10', value: 'testValueTen', align: 'center', required: true, width: '180', type: 'inputNumber' },
     ],
   },
   { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
   { text: '标准偏差S(X)', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
   { text: '相对标准偏差', value: 'relativeRepeatability', align: 'center', type: 'text' },
 ])
+
 // 稳定性表头，直流电压、电源效应和负载效应
 const columns_stability_voltage = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
@@ -161,10 +178,61 @@
   { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
   { text: '相对标准偏差是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
 ])
-
+// 稳定性表头，直流电压、电源效应和负载效应 -- 查询历史日期
+const columns_stability_voltage_check_date = ref<TableColumn[]>([
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  {
+    text: '示值',
+    value: 'indicatingValue',
+    align: 'center',
+    required: true,
+    width: '110',
+    children: [
+      { text: '2022-12-12', value: '2022-12-12', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-13', value: '2022-12-13', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-14', value: '2022-12-14', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-15', value: '2022-12-15', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-16', value: '2022-12-16', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-17', value: '2022-12-17', align: 'center', required: true, type: 'text' },
+    ],
+  },
+  { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
+  { text: '标准偏差S(X)', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
+  { text: '相对标准偏差', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
+  { text: '相对标准偏差是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
+])
 // 稳定性表头，直接电流（直接测量）、直接电流（间接测量）
 const columns_stability_electricity_direct = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  {
+    text: '示值',
+    value: 'indicatingValue',
+    align: 'center',
+    required: true,
+    width: '110',
+    children: [
+      { text: '2022-12-12', value: '2022-12-12', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-13', value: '2022-12-13', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-14', value: '2022-12-14', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-15', value: '2022-12-15', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-16', value: '2022-12-16', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-17', value: '2022-12-17', align: 'center', required: true, type: 'text' },
+    ],
+  },
+  { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
+  { text: '标准偏差S(X)', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
+  { text: '相对重复性', value: 'relativeRepeatability', align: 'center', type: 'text' },
+  { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
+  { text: '相对重复性是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
+])
+// 稳定性表头，直接电流（直接测量）、直接电流（间接测量） -- 查询历史日期
+const columns_stability_electricity_direct_check_date = ref<TableColumn[]>([
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   {
@@ -190,7 +258,7 @@
 ])
 // 稳定性表头，纹波电压
 const columns_stability_ripple_voltage = ref<TableColumn[]>([
-  { text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '频率', value: 'unit', align: 'center', required: true, type: 'text' },
@@ -214,50 +282,429 @@
   { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
   { text: '标准偏差是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
 ])
-
+// 稳定性表头，纹波电压 -- 查询历史日期
+const columns_stability_ripple_voltage_check_date = ref<TableColumn[]>([
+  { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'text' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
+  { text: '频率', value: 'unit', align: 'center', required: true, type: 'text' },
+  {
+    text: '示值',
+    value: 'indicatingValue',
+    align: 'center',
+    required: true,
+    width: '110',
+    children: [
+      { text: '2022-12-12', value: '2022-12-12', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-13', value: '2022-12-13', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-14', value: '2022-12-14', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-15', value: '2022-12-15', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-16', value: '2022-12-16', align: 'center', required: true, type: 'text' },
+      { text: '2022-12-17', value: '2022-12-17', align: 'center', required: true, type: 'text' },
+    ],
+  },
+  { text: '算数平均值', value: 'averageValue', align: 'center', required: true, type: 'text' },
+  { text: '标准偏差S(X)', value: 'standardDeviation', align: 'center', required: true, type: 'text' },
+  { text: '相对扩展不确定度Urel', value: 'urel', align: 'center', type: 'text' },
+  { text: '标准偏差是否小于相对扩展不确定度Urel', value: 'lessThan', align: 'center', type: 'text' },
+])
 const listRepeatability = ref<any[]>([]) // 重复性数据
+const listRepeatabilityCheckDate = ref<any[]>([]) // 重复性数据-- 查询历史日期
 const listStability = ref<any[]>([]) // 稳定性数据
+const listStabilityCheckDate = ref<any[]>([]) // 稳定性数据-- 查询历史日期
 
 const voltageListRepeatability = ref<any[]>([]) // 直流电压重复性
+const voltageListRepeatabilityCheckDate = ref<any[]>([]) // 直流电压重复性 -- 查询历史日期
 const voltageListStability = ref<any[]>([]) // 直流电压稳定性
+const voltageListStabilityCheckDate = ref<any[]>([]) // 直流电压稳定性-- 查询历史日期
 const effectListRepeatability = ref<any[]>([]) // 电源效应和负载效应重复性
+const effectListRepeatabilityCheckDate = ref<any[]>([]) // 电源效应和负载效应重复性-- 查询历史日期
 const effectListStability = ref<any[]>([]) // 电源效应和负载效应稳定性
+const effectListStabilityCheckDate = ref<any[]>([]) // 电源效应和负载效应稳定性-- 查询历史日期
 const electricityDirectListRepeatability = ref<any[]>([]) // 直接电流（直接测量）重复性
-const electricityDirectListStability = ref<any[]>([]) // 直接电流（直接测量）稳定性
+const electricityDirectListRepeatabilityCheckDate = ref<any[]>([]) // 直接电流（直接测量）重复性-- 查询历史日期
+const electricityDirectListStability = ref<any[]>([]) // 直接电流（直接测量）稳定性/
+const electricityDirectListStabilityCheckDate = ref<any[]>([]) // 直接电流（直接测量）稳定性-- 查询历史日期
 const electricityIndirectListRepeatability = ref<any[]>([]) // 直接电流（间接测量）重复性
+const electricityIndirectListRepeatabilityCheckDate = ref<any[]>([]) // 直接电流（间接测量）重复性-- 查询历史日期
 const electricityIndirectListStability = ref<any[]>([]) // 直接电流（间接测量）稳定性
-const rippleVoltageListRepeatability = ref<any[]>([]) // 纹波电压重复性
+const electricityIndirectListStabilityCheckDate = ref<any[]>([]) // 直接电流（间接测量）稳定性-- 查询历史日期
+const rippleVoltageListRepeatability = ref<any[]>([]) // 纹波电压重复性-- 查询历史日期
+const rippleVoltageListRepeatabilityCheckDate = ref<any[]>([]) // 纹波电压重复性
 const rippleVoltageListStability = ref<any[]>([]) // 纹波电压稳定性
-
+const rippleVoltageListStabilityCheckDate = ref<any[]>([]) // 纹波电压稳定性-- 查询历史日期
+watch(() => [voltageListRepeatability.value, voltageListStability.value, effectListRepeatability.value, effectListStability.value, electricityDirectListRepeatability.value, electricityDirectListStability.value, electricityIndirectListRepeatability.value, electricityIndirectListStability.value, rippleVoltageListRepeatability.value, rippleVoltageListStability.value], () => {
+  const variable = current.value
+  current.value = ''
+  setTimeout(() => {
+    current.value = variable
+  })
+})
 // 获取配置详情
-function fetchCheckItemDetail(equipmentId: string, belongStandardEquipmentParam: string, itemCategoryIdParam: string, itemCategoryNameParam: string) {
+function fetchCheckItemDetail(cequipmentId: string, belongStandardEquipmentParam: string, itemCategoryIdParam: string, itemCategoryNameParam: string) {
   belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
   itemCategoryId.value = itemCategoryIdParam // 核查分类id
   itemCategoryName.value = itemCategoryNameParam // 核查分类名称
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  equipmentId.value = cequipmentId
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   const params = {
-    equipmentId, // 设备id
+    equipmentId: cequipmentId, // 设备id
     belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
     itemCategoryId: itemCategoryId.value, // 核查项分类id
     itemCategoryName: itemCategoryName.value, // 核查项分类名称
   }
   getCheckItemDetail(params).then((res) => {
-    // loading.close()
-    // handleData(res.data.checkItemDataCalibratorList)
+    console.log(res.data, '详情')
+    loading.close()
+    handleData(res.data.checkItemDataDcPowerList)
+    fetchHistoryIndication() // 获取稳定性
   })
 }
+// 处理数据
+function handleData(data: any) {
+  if (!data) { return }
+  console.log(data, 'data')
+  // 控制tab
+  const needShowTab = uniqueMultiArray(data, 'params').map((item: any) => item.params)
+  radioMenus.value = radioMenus.value.filter((item: any) => needShowTab.includes(item.params))
+  current.value = radioMenus.value[0]?.value
+  // 直流电压重复性
+  voltageListRepeatability.value = data.filter((item: any) => item.params === '1').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '直流电压',
+    params: '1',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 直流电压稳定性
+  voltageListStability.value = voltageListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+  // 电源效应和负载效应重复性
+  effectListRepeatability.value = data.filter((item: any) => item.params === '2').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '电源效应和负载效应',
+    params: '2',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 电源效应和负载效应稳定性
+  effectListStability.value = effectListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+  // 直接电流（直接测量）重复性
+  electricityDirectListRepeatability.value = data.filter((item: any) => item.params === '2').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '直接电流(直接测量)',
+    params: '3',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 直接电流（直接测量）稳定性
+  electricityDirectListStability.value = electricityDirectListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+  //  直接电流（间接测量）重复性
+  electricityIndirectListRepeatability.value = data.filter((item: any) => item.params === '2').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '直接电流(间接测量)',
+    params: '4',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 直接电流（间接测量）稳定性
+  electricityIndirectListStability.value = electricityIndirectListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+  // 纹波电压重复性
+  rippleVoltageListRepeatability.value = data.filter((item: any) => item.params === '2').map((item: any) => ({
+    ...item,
+    editable: true,
+    checkPoint: item.checkPoint,
+    unit: item.unit,
+    averageValue: '',
+    standardDeviation: '',
+    relativeRepeatability: '',
+    paramsName: '纹波电压',
+    params: '5',
+    checkType: ['重复性'],
+    testValueOne: '1',
+    testValueTwo: '1',
+    testValueThree: '1',
+    testValueFour: '1',
+    testValueFive: '1',
+    testValueSix: '1',
+    testValueOneDate: '',
+    testValueTwoDate: '',
+    testValueThreeDate: '',
+    testValueFourDate: '',
+    testValueFiveDate: '',
+    testValueSixDate: '',
+    testValueSeven: '',
+    testValueEight: '',
+    testValueNine: '',
+    testValueTen: '',
+    urel: item.urel,
+    lessThan: '',
+  }))
+  // 纹波电压稳定性
+  rippleVoltageListStability.value = rippleVoltageListRepeatability.value.map((item: any) => ({ ...item, checkType: '稳定性' }))
+}
 
 // 点击生成结果处理
-const createResult = () => {
-  //
+const createResult = (params: string, type: string) => {
+  // 公共请求函数
+  const handleResult = (list: any, fun: any) => {
+    const data = {
+      belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置
+      checkDataDcPowerList: [],
+      itemCategoryId: itemCategoryId.value, // 核查项分类id
+      itemCategoryName: itemCategoryName.value, // 核查项分类id
+    }
+    data.checkDataDcPowerList = list
+    calculateHandle(data).then((res) => {
+      fun(res.data)
+    })
+  }
+  // 公共处理结果函数
+  const handeData = (initData: any, handleData: any) => {
+    return handleData.map((item: any, index: number) => {
+      return {
+        ...item,
+        averageValue: initData[index].averageValue, //	核查读数6（本次重复性示值算术平均值）
+        standardDeviation: initData[index].standardDeviation, //	标准偏差S(X)
+        relativeRepeatability: initData[index].relativeRepeatability, //	相对标准偏差
+        testValueSixDate: props.checkDate, //	核查读数6日期（本次核查日期）
+      }
+    })
+  }
+  switch (params) {
+    case 'voltage':
+      // 直流电压
+      if (!voltageListRepeatability.value.length) {
+        ElMessage.warning('直流电压未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            voltageListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              voltageListRepeatability.value = handeData(data, voltageListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!voltageListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算直流电压重复性')
+            break
+          }
+          break
+      }
+      break
+    case 'effect':
+      // 电源效应和负载效应
+      if (!effectListRepeatability.value.length) {
+        ElMessage.warning('电源效应和负载效应未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            effectListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              effectListRepeatability.value = handeData(data, effectListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!effectListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算电源效应和负载效应重复性')
+            break
+          }
+          break
+      }
+      break
+    case 'electricity-direct':
+      // 直接电流（直接测量）
+      if (!electricityDirectListRepeatability.value.length) {
+        ElMessage.warning('直接电流（直接测量）未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            electricityDirectListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              electricityDirectListRepeatability.value = handeData(data, electricityDirectListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!electricityDirectListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算直接电流（直接测量）重复性')
+            break
+          }
+          break
+      }
+      break
+    case 'electricity-indirect':
+      // 直接电流（间接测量）
+      if (!electricityIndirectListRepeatability.value.length) {
+        ElMessage.warning('直接电流（间接测量）未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            electricityIndirectListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              electricityIndirectListRepeatability.value = handeData(data, electricityIndirectListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!electricityIndirectListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算直接电流（间接测量）重复性')
+            break
+          }
+          break
+      }
+      break
+    case 'ripple-voltage':
+      // 纹波电压
+      if (!rippleVoltageListRepeatability.value.length) {
+        ElMessage.warning('纹波电压未配置重复性，请检查')
+        break
+      }
+      switch (type) {
+        case '重复性':
+          handleResult(
+            rippleVoltageListRepeatability.value.map((item: { lessThan: string }) => {
+              return {
+                ...item,
+                lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1)
+              }
+            }), (data: any) => {
+              rippleVoltageListRepeatability.value = handeData(data, rippleVoltageListRepeatability.value)
+            })
+          break
+        case '稳定性':
+          if (!rippleVoltageListRepeatability.value[0].averageValue) {
+            ElMessage.warning('请先计算纹波电压重复性')
+            break
+          }
+          break
+      }
+      break
+  }
 }
 // ------------------------------------------------------------------------------------------
-
+// 保存之前的校验
+// function checkList() {
+//   if (current.value === 'voltage' && `${voltageListRepeatability.value[0].averageValue}` === '') { // 直流电压
+//     ElMessage.warning('请计算直流电压重复性')
+//     return false
+//   }
+//   if (current.value === 'effect' && `${effectListRepeatability.value[0].averageValue}` === '') { // 电源效应和负载效应
+//     ElMessage.warning('请计算电源效应和负载效应重复性')
+//     return false
+//   }
+//   if (current.value === 'voltage' && `${voltageListStability.value[0].lessThan}` === '') { // 直流电压
+//     ElMessage.warning('请计算直流电压稳定性')
+//     return false
+//   }
+//   if (current.value === 'resistance' && `${resistanceListStability.value[0].lessThan}` === '') { // 电阻测量
+//     ElMessage.warning('请计算电阻测量稳定性')
+//     return false
+//   }
+//   return true
+// }
 // 获取详情
-function fetchInfo() {
+function fetchInfo(id = '') {
   // const loading = ElLoading.service({
   //   lock: true,
   //   background: 'rgba(255, 255, 255, 0.8)',
@@ -273,7 +720,62 @@
   //   loading.close()
   // })
 }
+/**
+ * 获取稳定性示值
+ * @param date 查询日期
+ */
+function fetchHistoryIndication(date = '') {
+  const params = {
+    belongStandardEquipment: belongStandardEquipment.value,	// 检校标准装置(字典code)
+    checkDate: date || props.checkDate!,	// 核查日期
+    checkParam: '',	// 核查参数((直流稳压电源-直接电流(间接测量))
+    conclusion: '合格',	// 结论
+    equipmentId: equipmentId.value,	// 被核查设备id
+    params: radioMenus.value.filter(item => item.value === current.value)[0].params,	// 核查项目
+    stabilityExamine: '1',	// 是否用于稳定性考核(1/0)
+    standardEquipmentId: props.selectStandardId!,	// 被核查标准装置id
+  }
+  if (props.selectStandardId && equipmentId.value) {
+    console.log(123)
+    getHistoryIndication(params).then((res) => {
+      if (date === '') { // 正常核查数据
+        const num = props.pageType === 'edit' ? 5 : 4
+        // 直流电压
+        voltageListStability.value = voltageListStability.value.map((item) => {
+          clearDateValue(item)
+          const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data, item, columns_stability_voltage.value, num, 3)
+          columns_stability_voltage.value = columnsData
+          return item = itemData
+        })
+        voltageListStability.value = handleSaveDateParams(columns_stability_voltage.value, voltageListStability.value, 3)
+      }
+      else {
+        // 直流电压
+        voltageListStabilityCheckDate.value = voltageListStabilityCheckDate.value.map((item) => {
+          clearDateValue(item)
+          const { itemData, columnsData } = solveHistoryIndicationTableData(res.data, item, columns_stability_voltage_check_date.value, 5, 3)
+          columns_stability_voltage_check_date.value = columnsData
+          // stabilityColumnsCheckData.value = columns_stability_voltage_check_date.value
+          return item = itemData
+        })
+        voltageListStabilityCheckDate.value = handleSaveDateParams(columns_stability_voltage_check_date.value, voltageListStabilityCheckDate.value, 3)
+        console.log(voltageListStabilityCheckDate.value, 'voltageListStabilityCheckDate.value')
+        console.log(columns_stability_voltage_check_date.value, 'columns_stability_voltage_check_date.value')
+      }
+    })
+  }
+}
+// =======================点击表头日期查询历史稳定性数据===================
+// 点击表头
+const handleClickHeader = (val: any, checkDateDetailId: string) => {
+  dateArrStability.value = ['核查数据', val.label]
+  fetchInfo(checkDateDetailId) // 获取此次历史日期的详情
+}
 
+// 日期变化
+const handleChangeRadio = (date: string) => {
+  currentDate.value = date
+}
 // -------------------------------------钩子-----------------------------------------------------
 watch(() => current.value, (newValue) => {
   switch (newValue) {
@@ -281,7 +783,7 @@
       repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头
       stabilityColumns.value = columns_stability_voltage.value // 稳定性表头
       listRepeatability.value = voltageListRepeatability.value // 重复性数据
-      listStability.value = voltageListRepeatability.value // 稳定性数据
+      listStability.value = voltageListStability.value // 稳定性数据
       break
     case 'effect': // 电源效应和负载效应
       repeatabilityColumns.value = columns_repeatability_voltage.value // 重复性表头
@@ -307,12 +809,13 @@
       listRepeatability.value = rippleVoltageListRepeatability.value // 重复性数据
       listStability.value = rippleVoltageListStability.value // 稳定性数据
       break
-    default:
-      break
   }
 }, { immediate: true })
 
 onMounted(async () => {
+  belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置
+  itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id
+  itemCategoryName.value = $route.query.itemCategoryName as string // 核查项分类名称
   if (pageType.value !== 'add') {
     // fetchInfo()
   }
@@ -323,7 +826,7 @@
 
 <template>
   <!-- 核查数据 -->
-  <detail-block title="核查数据">
+  <detail-block :title="dateArrStability.length > 1 ? ' ' : '核查数据'" :title-menus="dateArrStability" @handle-change-radio="handleChangeRadio">
     <div style="display: flex;justify-content: space-between;">
       <el-radio-group v-model="current" style="margin-bottom: 20px;">
         <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
@@ -333,29 +836,51 @@
     </div>
     <div style="display: flex;justify-content: space-between;align-items: center;">
       <h5>核查类型--重复性</h5>
-      <el-button v-if="pageType !== 'detail'" type="primary" @click="createResult">
+      <el-button v-if="pageType !== 'detail'" type="primary" @click="createResult(current, '重复性')">
         生成结果处理
       </el-button>
     </div>
     <multi-table
+      v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listRepeatability"
       :table-header="repeatabilityColumns"
       :merge-rows="[]"
       :need-index="true"
     />
+    <!-- 历史日期重复性数据 -->
+    <multi-table
+      v-show="currentDate !== '核查数据' && currentDate !== ''"
+      :table-data="listRepeatabilityCheckDate"
+      :table-header="repeatabilityColumns"
+      :merge-rows="[]"
+      :need-index="true"
+      max-height="300"
+    />
 
     <div style="display: flex;justify-content: space-between;align-items: center;">
       <h5>核查类型--稳定性</h5>
-      <el-button v-if="pageType !== 'detail'" type="primary" @click="createResult">
+      <el-button v-if="pageType !== 'detail'" type="primary" @click="createResult(current, '稳定性')">
         生成结果处理
       </el-button>
     </div>
 
     <multi-table
+      v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listStability"
       :table-header="stabilityColumns"
       :merge-rows="[]"
       :need-index="true"
+      max-height="500"
+      @handle-click-header="handleClickHeader"
+    />
+    <multi-table
+      v-show="currentDate !== '核查数据' && currentDate !== ''"
+      :table-data="listStabilityCheckDate"
+      :table-header="stabilityColumnsCheckData"
+      :merge-rows="[]"
+      :need-index="true"
+      max-height="500"
+      @handle-click-header="handleClickHeader"
     />
     <!-- 稳定性考核是否合格 -->
     <el-form
diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue
index 1efc614..21871ab 100644
--- a/src/views/quality/internal/workManage/components/edit.vue
+++ b/src/views/quality/internal/workManage/components/edit.vue
@@ -296,7 +296,7 @@
                 </el-select>
               </el-tooltip>
               <el-select v-else v-model="ruleForm.teamMembers" multiple filterable clearable placeholder="内审组组员" style="width: 100%;">
-                <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
+                <el-option v-for="(item) in userList3" :key="item.id" :label="item.name" :value="item.name">
                   <span style="float: left;">{{ item.name }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>