diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"

diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index b549286..1bf1cb3 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -333,7 +333,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">
+              <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 label="1" size="large">
                   是
                 </el-radio>
@@ -370,6 +370,12 @@
     visibility: hidden;
   }
 }
+
+.radio {
+  :deep(.el-radio__label) {
+    display: none !important;
+  }
+}
 </style>
 
 <style lang="scss">

diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index b549286..1bf1cb3 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -333,7 +333,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">
+              <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 label="1" size="large">
                   是
                 </el-radio>
@@ -370,6 +370,12 @@
     visibility: hidden;
   }
 }
+
+.radio {
+  :deep(.el-radio__label) {
+    display: none !important;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index b024f31..dfb136d 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -88,6 +88,9 @@
 const addRow = () => {
   if (checkList()) {
     setAllRowReadable()
+    if (list.value.length) {
+      list.value.push(list.value[list.value.length - 1])
+    }
     list.value.push({
       id: '',
       params: '整定压力',

diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index b549286..1bf1cb3 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -333,7 +333,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">
+              <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 label="1" size="large">
                   是
                 </el-radio>
@@ -370,6 +370,12 @@
     visibility: hidden;
   }
 }
+
+.radio {
+  :deep(.el-radio__label) {
+    display: none !important;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index b024f31..dfb136d 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -88,6 +88,9 @@
 const addRow = () => {
   if (checkList()) {
     setAllRowReadable()
+    if (list.value.length) {
+      list.value.push(list.value[list.value.length - 1])
+    }
     list.value.push({
       id: '',
       params: '整定压力',
diff --git a/src/views/equipement/standard/book/components/config/second/config.vue b/src/views/equipement/standard/book/components/config/second/config.vue
index a5128e8..9fc3681 100644
--- a/src/views/equipement/standard/book/components/config/second/config.vue
+++ b/src/views/equipement/standard/book/components/config/second/config.vue
@@ -56,14 +56,34 @@
 const checkoutDCDirectList = ref<IList[]>([]) // 直流电流（直接测量）多选
 const checkoutRippleVoltageList = ref<IList[]>([]) // 纹波电压多选
 // 列表显示状态
-const checkedTable = ref({
+const checkedTable = ref<{ [key: string]: any }>({
   directVoltage: '1',
   effect: '1',
-  DCIndirect: '1',
   DCDirect: '1',
+  DCIndirect: '1',
   rippleVoltage: '1',
 })
-
+const checkedDict = {
+  '1-直流电压': 'directVoltage',
+  '2-电源效应和负载效应': 'effect',
+  '3-直流电流(直接测量)': 'DCDirect',
+  '4-直流电流(间接测量)': 'DCIndirect',
+  '5-纹波电压': 'rippleVoltage',
+} as { [key: string]: any }
+// 表格数据对应 list 字典
+const listDict = ref<{ [key: string]: any }>({})
+// 监听所有表格数据
+watch(() => [listDirectVoltage.value, listEffect.value, listDCIndirect.value, listDCDirect.value, listRippleVoltage.value], () => {
+  listDict.value = {
+    '1-直流电压': listDirectVoltage.value,
+    '2-电源效应和负载效应': listEffect.value,
+    '3-直流电流(直接测量)': listDCDirect.value,
+    '4-直流电流(间接测量)': listDCIndirect.value,
+    '5-纹波电压': listRippleVoltage.value,
+  }
+}, {
+  deep: true,
+})
 const columns_direct_voltage_DC_direct = ref<any[]>([ // 直流电压表头、直流电流（直接测量）
   { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'select-dict', code: 'checkPointVoltage' },
@@ -120,13 +140,35 @@
 function checkList(list: any[], columns: any[], title: string) {
   return useCheckList(list, columns, title)
 }
-
+// 校验所有表格
+function checkAllList() {
+  let result = true
+  for (const i in columnsDict.value) {
+    const requireLength = !!((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]])
+    if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
+      result = false
+      break
+    }
+  }
+  return result
+}
+// 过滤数据  check为0的
+function filterData() {
+  let result = [] as any[]
+  for (const i in listDict.value) {
+    console.log(checkedTable.value[checkedDict[i]], 'checkedTable.value[checkedDict[i]]')
+    if ((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 /**
  * 增加行公共方法
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string, index: string) => {
+const addRow = (list: IList[], title: string, index: string, item: any) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
     let data = {} as any
     switch (title) {
@@ -141,7 +183,7 @@
           urel: '',
           resolution: '0.1', // 分辨力
         }
-        listDirectVoltage.value.push(data)
+        item ? listDirectVoltage.value.push({ ...item, paramsName: '直流电压' }) : listDirectVoltage.value.length ? listDirectVoltage.value.push(listDirectVoltage.value[listDirectVoltage.value.length - 1]) : listDirectVoltage.value.push(data)
         break
       case '电源效应和负载效应': // 电源电压调整率
         data = {
@@ -158,7 +200,8 @@
         if (listEffect.value.length) {
           data.datumPoint = '0'
         }
-        listEffect.value.push(data)
+        // listEffect.value.push(item ? ({ ...item, paramsName: '电源效应和负载效应' }) : data)
+        item ? listEffect.value.push({ ...item, paramsName: '电源效应和负载效应' }) : listEffect.value.length ? listEffect.value.push(listEffect.value[listEffect.value.length - 1]) : listEffect.value.push(data)
         break
       case '直流电流(直接测量)': // 直流电流(直接测量)
         data = {
@@ -171,7 +214,8 @@
           urel: '',
           resolution: '0.00001', // 分辨力
         }
-        listDCDirect.value.push(data)
+        // listDCDirect.value.push(item ? ({ ...item, paramsName: '直流电流(直接测量)' }) : data)
+        item ? listDCDirect.value.push({ ...item, paramsName: '直流电流(直接测量)' }) : listDCDirect.value.length ? listDCDirect.value.push(listDCDirect.value[listDCDirect.value.length - 1]) : listDCDirect.value.push(data)
         break
       case '直流电流(间接测量)': // 直流电流(间接测量)
         data = {
@@ -186,7 +230,8 @@
           resistanceValue: '', // 电阻值
           resistanceValueUnit: '', // 电阻值单位
         }
-        listDCIndirect.value.push(data)
+        // listDCIndirect.value.push(item ? ({ ...item, paramsName: '直流电流(间接测量)' }) : data)
+        item ? listDCIndirect.value.push({ ...item, paramsName: '直流电流(间接测量)' }) : listDCIndirect.value.length ? listDCIndirect.value.push(listDCIndirect.value[listDCIndirect.value.length - 1]) : listDCIndirect.value.push(data)
         break
       case '纹波电压': // 纹波电压
         data = {
@@ -201,7 +246,8 @@
           resistanceValue: '', // 频率值
           resistanceValueUnit: '', // 频率值单位
         }
-        listRippleVoltage.value.push(data)
+        // listRippleVoltage.value.push(item ? ({ ...item, paramsName: '纹波电压' }) : data)
+        item ? listRippleVoltage.value.push({ ...item, paramsName: '纹波电压' }) : listRippleVoltage.value.length ? listRippleVoltage.value.push(listRippleVoltage.value[listRippleVoltage.value.length - 1]) : listRippleVoltage.value.push(data)
         break
     }
   }
@@ -211,11 +257,6 @@
  * @param checkoutList 选中的数组
  * @param list 操作的数组
  */
-/**
- * 删除行公共方法
- * @param checkoutList 选中的数组
- * @param list 操作的数组
- */
 const delRow = (checkoutList: IList[], list: IList[], title: string) => {
   if (!checkoutList.length) {
     ElMessage.warning('请选中要删除的行')
@@ -272,12 +313,6 @@
     fun(true)
     return
   }
-  // // 指针式 禁用最大允许误差
-
-  // if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
-  //   fun(true)
-  //   return
-  // }
   fun(pageType.value === 'detail')
 }
 // ---------------------------------------按钮-----------------------------------------------------
@@ -307,46 +342,70 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  filterData()
+  const list = filterData()
+  console.log(list, 'list')
+  if (!list.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkAllList()) { return }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataDcPowerList: list.map((item: any) => ({ ...item, equipmentId: equipmentId.value, remark: form.value.remark })),
+    equipmentId: equipmentId.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    const data = res.data.checkItemDataDcPowerList.map((item: any) => {
+      return {
+        ...item,
+        resolution: Number(item.resolution),
+        checkType: JSON.parse(item.checkType),
+        datumPoint: String(item.datumPoint),
+      }
+    })
+    form.value.remark = data[0]?.remark
+    const params = {
+      1: '直流电压',
+      2: '电源效应和负载效应',
+      3: '直流电流(直接测量)',
+      4: '直流电流(间接测量)',
+      5: '纹波电压',
+    } as { [key: string]: any }
+    // 处理表格数据
+    data.forEach((item: any) => {
+      addRow([], params[item.params], '', item)
+    })
+    // 处理表格选中状态
+    setTimeout(() => {
+      for (const i in listDict.value) {
+        checkedTable.value[checkedDict[i]] = listDict.value[i].length ? 1 : 0
+      }
+    })
+    loading.close()
+  })
 }
 
 // ------------------------------------------字典--------------------------------------------------
@@ -411,7 +470,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -574,9 +633,8 @@
 
     <!-- 纹波电压 -->
     <template-table
-      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
+      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'"
       :select-all-list="tableDict"
-      @customSelect="customSelect"
       @disabled="disabled"
       @selection-change="(e) => handleSelectionChange(e, '纹波电压')"
       @add-row="addRow"

diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index b549286..1bf1cb3 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -333,7 +333,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">
+              <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 label="1" size="large">
                   是
                 </el-radio>
@@ -370,6 +370,12 @@
     visibility: hidden;
   }
 }
+
+.radio {
+  :deep(.el-radio__label) {
+    display: none !important;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index b024f31..dfb136d 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -88,6 +88,9 @@
 const addRow = () => {
   if (checkList()) {
     setAllRowReadable()
+    if (list.value.length) {
+      list.value.push(list.value[list.value.length - 1])
+    }
     list.value.push({
       id: '',
       params: '整定压力',
diff --git a/src/views/equipement/standard/book/components/config/second/config.vue b/src/views/equipement/standard/book/components/config/second/config.vue
index a5128e8..9fc3681 100644
--- a/src/views/equipement/standard/book/components/config/second/config.vue
+++ b/src/views/equipement/standard/book/components/config/second/config.vue
@@ -56,14 +56,34 @@
 const checkoutDCDirectList = ref<IList[]>([]) // 直流电流（直接测量）多选
 const checkoutRippleVoltageList = ref<IList[]>([]) // 纹波电压多选
 // 列表显示状态
-const checkedTable = ref({
+const checkedTable = ref<{ [key: string]: any }>({
   directVoltage: '1',
   effect: '1',
-  DCIndirect: '1',
   DCDirect: '1',
+  DCIndirect: '1',
   rippleVoltage: '1',
 })
-
+const checkedDict = {
+  '1-直流电压': 'directVoltage',
+  '2-电源效应和负载效应': 'effect',
+  '3-直流电流(直接测量)': 'DCDirect',
+  '4-直流电流(间接测量)': 'DCIndirect',
+  '5-纹波电压': 'rippleVoltage',
+} as { [key: string]: any }
+// 表格数据对应 list 字典
+const listDict = ref<{ [key: string]: any }>({})
+// 监听所有表格数据
+watch(() => [listDirectVoltage.value, listEffect.value, listDCIndirect.value, listDCDirect.value, listRippleVoltage.value], () => {
+  listDict.value = {
+    '1-直流电压': listDirectVoltage.value,
+    '2-电源效应和负载效应': listEffect.value,
+    '3-直流电流(直接测量)': listDCDirect.value,
+    '4-直流电流(间接测量)': listDCIndirect.value,
+    '5-纹波电压': listRippleVoltage.value,
+  }
+}, {
+  deep: true,
+})
 const columns_direct_voltage_DC_direct = ref<any[]>([ // 直流电压表头、直流电流（直接测量）
   { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'select-dict', code: 'checkPointVoltage' },
@@ -120,13 +140,35 @@
 function checkList(list: any[], columns: any[], title: string) {
   return useCheckList(list, columns, title)
 }
-
+// 校验所有表格
+function checkAllList() {
+  let result = true
+  for (const i in columnsDict.value) {
+    const requireLength = !!((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]])
+    if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
+      result = false
+      break
+    }
+  }
+  return result
+}
+// 过滤数据  check为0的
+function filterData() {
+  let result = [] as any[]
+  for (const i in listDict.value) {
+    console.log(checkedTable.value[checkedDict[i]], 'checkedTable.value[checkedDict[i]]')
+    if ((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 /**
  * 增加行公共方法
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string, index: string) => {
+const addRow = (list: IList[], title: string, index: string, item: any) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
     let data = {} as any
     switch (title) {
@@ -141,7 +183,7 @@
           urel: '',
           resolution: '0.1', // 分辨力
         }
-        listDirectVoltage.value.push(data)
+        item ? listDirectVoltage.value.push({ ...item, paramsName: '直流电压' }) : listDirectVoltage.value.length ? listDirectVoltage.value.push(listDirectVoltage.value[listDirectVoltage.value.length - 1]) : listDirectVoltage.value.push(data)
         break
       case '电源效应和负载效应': // 电源电压调整率
         data = {
@@ -158,7 +200,8 @@
         if (listEffect.value.length) {
           data.datumPoint = '0'
         }
-        listEffect.value.push(data)
+        // listEffect.value.push(item ? ({ ...item, paramsName: '电源效应和负载效应' }) : data)
+        item ? listEffect.value.push({ ...item, paramsName: '电源效应和负载效应' }) : listEffect.value.length ? listEffect.value.push(listEffect.value[listEffect.value.length - 1]) : listEffect.value.push(data)
         break
       case '直流电流(直接测量)': // 直流电流(直接测量)
         data = {
@@ -171,7 +214,8 @@
           urel: '',
           resolution: '0.00001', // 分辨力
         }
-        listDCDirect.value.push(data)
+        // listDCDirect.value.push(item ? ({ ...item, paramsName: '直流电流(直接测量)' }) : data)
+        item ? listDCDirect.value.push({ ...item, paramsName: '直流电流(直接测量)' }) : listDCDirect.value.length ? listDCDirect.value.push(listDCDirect.value[listDCDirect.value.length - 1]) : listDCDirect.value.push(data)
         break
       case '直流电流(间接测量)': // 直流电流(间接测量)
         data = {
@@ -186,7 +230,8 @@
           resistanceValue: '', // 电阻值
           resistanceValueUnit: '', // 电阻值单位
         }
-        listDCIndirect.value.push(data)
+        // listDCIndirect.value.push(item ? ({ ...item, paramsName: '直流电流(间接测量)' }) : data)
+        item ? listDCIndirect.value.push({ ...item, paramsName: '直流电流(间接测量)' }) : listDCIndirect.value.length ? listDCIndirect.value.push(listDCIndirect.value[listDCIndirect.value.length - 1]) : listDCIndirect.value.push(data)
         break
       case '纹波电压': // 纹波电压
         data = {
@@ -201,7 +246,8 @@
           resistanceValue: '', // 频率值
           resistanceValueUnit: '', // 频率值单位
         }
-        listRippleVoltage.value.push(data)
+        // listRippleVoltage.value.push(item ? ({ ...item, paramsName: '纹波电压' }) : data)
+        item ? listRippleVoltage.value.push({ ...item, paramsName: '纹波电压' }) : listRippleVoltage.value.length ? listRippleVoltage.value.push(listRippleVoltage.value[listRippleVoltage.value.length - 1]) : listRippleVoltage.value.push(data)
         break
     }
   }
@@ -211,11 +257,6 @@
  * @param checkoutList 选中的数组
  * @param list 操作的数组
  */
-/**
- * 删除行公共方法
- * @param checkoutList 选中的数组
- * @param list 操作的数组
- */
 const delRow = (checkoutList: IList[], list: IList[], title: string) => {
   if (!checkoutList.length) {
     ElMessage.warning('请选中要删除的行')
@@ -272,12 +313,6 @@
     fun(true)
     return
   }
-  // // 指针式 禁用最大允许误差
-
-  // if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
-  //   fun(true)
-  //   return
-  // }
   fun(pageType.value === 'detail')
 }
 // ---------------------------------------按钮-----------------------------------------------------
@@ -307,46 +342,70 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  filterData()
+  const list = filterData()
+  console.log(list, 'list')
+  if (!list.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkAllList()) { return }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataDcPowerList: list.map((item: any) => ({ ...item, equipmentId: equipmentId.value, remark: form.value.remark })),
+    equipmentId: equipmentId.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    const data = res.data.checkItemDataDcPowerList.map((item: any) => {
+      return {
+        ...item,
+        resolution: Number(item.resolution),
+        checkType: JSON.parse(item.checkType),
+        datumPoint: String(item.datumPoint),
+      }
+    })
+    form.value.remark = data[0]?.remark
+    const params = {
+      1: '直流电压',
+      2: '电源效应和负载效应',
+      3: '直流电流(直接测量)',
+      4: '直流电流(间接测量)',
+      5: '纹波电压',
+    } as { [key: string]: any }
+    // 处理表格数据
+    data.forEach((item: any) => {
+      addRow([], params[item.params], '', item)
+    })
+    // 处理表格选中状态
+    setTimeout(() => {
+      for (const i in listDict.value) {
+        checkedTable.value[checkedDict[i]] = listDict.value[i].length ? 1 : 0
+      }
+    })
+    loading.close()
+  })
 }
 
 // ------------------------------------------字典--------------------------------------------------
@@ -411,7 +470,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -574,9 +633,8 @@
 
     <!-- 纹波电压 -->
     <template-table
-      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
+      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'"
       :select-all-list="tableDict"
-      @customSelect="customSelect"
       @disabled="disabled"
       @selection-change="(e) => handleSelectionChange(e, '纹波电压')"
       @add-row="addRow"
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 417999c..c094fd2 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -9,8 +9,8 @@
 import type { dictType } from '@/global'
 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 { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book'
+import { addCheckData, calculateHandle, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
@@ -234,20 +234,20 @@
   belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
   itemCategoryId.value = itemCategoryIdParam // 核查分类id
   itemCategoryName.value = itemCategoryNameParam // 核查分类名称
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
   const params = {
     equipmentId, // 设备id
     belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
     itemCategoryId: itemCategoryId.value, // 核查项分类id
     itemCategoryName: itemCategoryName.value, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   loading.close()
-  //   handleData(res.data.checkItemDataCalibratorList)
-  // })
+  getCheckItemDetail(params).then((res) => {
+    // loading.close()
+    // handleData(res.data.checkItemDataCalibratorList)
+  })
 }
 
 // 点击生成结果处理

diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index b549286..1bf1cb3 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -333,7 +333,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">
+              <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 label="1" size="large">
                   是
                 </el-radio>
@@ -370,6 +370,12 @@
     visibility: hidden;
   }
 }
+
+.radio {
+  :deep(.el-radio__label) {
+    display: none !important;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index b024f31..dfb136d 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -88,6 +88,9 @@
 const addRow = () => {
   if (checkList()) {
     setAllRowReadable()
+    if (list.value.length) {
+      list.value.push(list.value[list.value.length - 1])
+    }
     list.value.push({
       id: '',
       params: '整定压力',
diff --git a/src/views/equipement/standard/book/components/config/second/config.vue b/src/views/equipement/standard/book/components/config/second/config.vue
index a5128e8..9fc3681 100644
--- a/src/views/equipement/standard/book/components/config/second/config.vue
+++ b/src/views/equipement/standard/book/components/config/second/config.vue
@@ -56,14 +56,34 @@
 const checkoutDCDirectList = ref<IList[]>([]) // 直流电流（直接测量）多选
 const checkoutRippleVoltageList = ref<IList[]>([]) // 纹波电压多选
 // 列表显示状态
-const checkedTable = ref({
+const checkedTable = ref<{ [key: string]: any }>({
   directVoltage: '1',
   effect: '1',
-  DCIndirect: '1',
   DCDirect: '1',
+  DCIndirect: '1',
   rippleVoltage: '1',
 })
-
+const checkedDict = {
+  '1-直流电压': 'directVoltage',
+  '2-电源效应和负载效应': 'effect',
+  '3-直流电流(直接测量)': 'DCDirect',
+  '4-直流电流(间接测量)': 'DCIndirect',
+  '5-纹波电压': 'rippleVoltage',
+} as { [key: string]: any }
+// 表格数据对应 list 字典
+const listDict = ref<{ [key: string]: any }>({})
+// 监听所有表格数据
+watch(() => [listDirectVoltage.value, listEffect.value, listDCIndirect.value, listDCDirect.value, listRippleVoltage.value], () => {
+  listDict.value = {
+    '1-直流电压': listDirectVoltage.value,
+    '2-电源效应和负载效应': listEffect.value,
+    '3-直流电流(直接测量)': listDCDirect.value,
+    '4-直流电流(间接测量)': listDCIndirect.value,
+    '5-纹波电压': listRippleVoltage.value,
+  }
+}, {
+  deep: true,
+})
 const columns_direct_voltage_DC_direct = ref<any[]>([ // 直流电压表头、直流电流（直接测量）
   { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'select-dict', code: 'checkPointVoltage' },
@@ -120,13 +140,35 @@
 function checkList(list: any[], columns: any[], title: string) {
   return useCheckList(list, columns, title)
 }
-
+// 校验所有表格
+function checkAllList() {
+  let result = true
+  for (const i in columnsDict.value) {
+    const requireLength = !!((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]])
+    if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
+      result = false
+      break
+    }
+  }
+  return result
+}
+// 过滤数据  check为0的
+function filterData() {
+  let result = [] as any[]
+  for (const i in listDict.value) {
+    console.log(checkedTable.value[checkedDict[i]], 'checkedTable.value[checkedDict[i]]')
+    if ((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 /**
  * 增加行公共方法
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string, index: string) => {
+const addRow = (list: IList[], title: string, index: string, item: any) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
     let data = {} as any
     switch (title) {
@@ -141,7 +183,7 @@
           urel: '',
           resolution: '0.1', // 分辨力
         }
-        listDirectVoltage.value.push(data)
+        item ? listDirectVoltage.value.push({ ...item, paramsName: '直流电压' }) : listDirectVoltage.value.length ? listDirectVoltage.value.push(listDirectVoltage.value[listDirectVoltage.value.length - 1]) : listDirectVoltage.value.push(data)
         break
       case '电源效应和负载效应': // 电源电压调整率
         data = {
@@ -158,7 +200,8 @@
         if (listEffect.value.length) {
           data.datumPoint = '0'
         }
-        listEffect.value.push(data)
+        // listEffect.value.push(item ? ({ ...item, paramsName: '电源效应和负载效应' }) : data)
+        item ? listEffect.value.push({ ...item, paramsName: '电源效应和负载效应' }) : listEffect.value.length ? listEffect.value.push(listEffect.value[listEffect.value.length - 1]) : listEffect.value.push(data)
         break
       case '直流电流(直接测量)': // 直流电流(直接测量)
         data = {
@@ -171,7 +214,8 @@
           urel: '',
           resolution: '0.00001', // 分辨力
         }
-        listDCDirect.value.push(data)
+        // listDCDirect.value.push(item ? ({ ...item, paramsName: '直流电流(直接测量)' }) : data)
+        item ? listDCDirect.value.push({ ...item, paramsName: '直流电流(直接测量)' }) : listDCDirect.value.length ? listDCDirect.value.push(listDCDirect.value[listDCDirect.value.length - 1]) : listDCDirect.value.push(data)
         break
       case '直流电流(间接测量)': // 直流电流(间接测量)
         data = {
@@ -186,7 +230,8 @@
           resistanceValue: '', // 电阻值
           resistanceValueUnit: '', // 电阻值单位
         }
-        listDCIndirect.value.push(data)
+        // listDCIndirect.value.push(item ? ({ ...item, paramsName: '直流电流(间接测量)' }) : data)
+        item ? listDCIndirect.value.push({ ...item, paramsName: '直流电流(间接测量)' }) : listDCIndirect.value.length ? listDCIndirect.value.push(listDCIndirect.value[listDCIndirect.value.length - 1]) : listDCIndirect.value.push(data)
         break
       case '纹波电压': // 纹波电压
         data = {
@@ -201,7 +246,8 @@
           resistanceValue: '', // 频率值
           resistanceValueUnit: '', // 频率值单位
         }
-        listRippleVoltage.value.push(data)
+        // listRippleVoltage.value.push(item ? ({ ...item, paramsName: '纹波电压' }) : data)
+        item ? listRippleVoltage.value.push({ ...item, paramsName: '纹波电压' }) : listRippleVoltage.value.length ? listRippleVoltage.value.push(listRippleVoltage.value[listRippleVoltage.value.length - 1]) : listRippleVoltage.value.push(data)
         break
     }
   }
@@ -211,11 +257,6 @@
  * @param checkoutList 选中的数组
  * @param list 操作的数组
  */
-/**
- * 删除行公共方法
- * @param checkoutList 选中的数组
- * @param list 操作的数组
- */
 const delRow = (checkoutList: IList[], list: IList[], title: string) => {
   if (!checkoutList.length) {
     ElMessage.warning('请选中要删除的行')
@@ -272,12 +313,6 @@
     fun(true)
     return
   }
-  // // 指针式 禁用最大允许误差
-
-  // if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
-  //   fun(true)
-  //   return
-  // }
   fun(pageType.value === 'detail')
 }
 // ---------------------------------------按钮-----------------------------------------------------
@@ -307,46 +342,70 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  filterData()
+  const list = filterData()
+  console.log(list, 'list')
+  if (!list.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkAllList()) { return }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataDcPowerList: list.map((item: any) => ({ ...item, equipmentId: equipmentId.value, remark: form.value.remark })),
+    equipmentId: equipmentId.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    const data = res.data.checkItemDataDcPowerList.map((item: any) => {
+      return {
+        ...item,
+        resolution: Number(item.resolution),
+        checkType: JSON.parse(item.checkType),
+        datumPoint: String(item.datumPoint),
+      }
+    })
+    form.value.remark = data[0]?.remark
+    const params = {
+      1: '直流电压',
+      2: '电源效应和负载效应',
+      3: '直流电流(直接测量)',
+      4: '直流电流(间接测量)',
+      5: '纹波电压',
+    } as { [key: string]: any }
+    // 处理表格数据
+    data.forEach((item: any) => {
+      addRow([], params[item.params], '', item)
+    })
+    // 处理表格选中状态
+    setTimeout(() => {
+      for (const i in listDict.value) {
+        checkedTable.value[checkedDict[i]] = listDict.value[i].length ? 1 : 0
+      }
+    })
+    loading.close()
+  })
 }
 
 // ------------------------------------------字典--------------------------------------------------
@@ -411,7 +470,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -574,9 +633,8 @@
 
     <!-- 纹波电压 -->
     <template-table
-      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
+      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'"
       :select-all-list="tableDict"
-      @customSelect="customSelect"
       @disabled="disabled"
       @selection-change="(e) => handleSelectionChange(e, '纹波电压')"
       @add-row="addRow"
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 417999c..c094fd2 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -9,8 +9,8 @@
 import type { dictType } from '@/global'
 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 { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book'
+import { addCheckData, calculateHandle, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
@@ -234,20 +234,20 @@
   belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
   itemCategoryId.value = itemCategoryIdParam // 核查分类id
   itemCategoryName.value = itemCategoryNameParam // 核查分类名称
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
   const params = {
     equipmentId, // 设备id
     belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
     itemCategoryId: itemCategoryId.value, // 核查项分类id
     itemCategoryName: itemCategoryName.value, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   loading.close()
-  //   handleData(res.data.checkItemDataCalibratorList)
-  // })
+  getCheckItemDetail(params).then((res) => {
+    // loading.close()
+    // handleData(res.data.checkItemDataCalibratorList)
+  })
 }
 
 // 点击生成结果处理
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 7abe2dc..b747189 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -647,7 +647,7 @@
     <!-- 第1套：多功能校准源标准装置 -->
     <check-data-first v-if="belongStandardEquipment === '1'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第2套：直流稳压电源 -->
-    <check-data-second v-if="belongStandardEquipment === '2'" ref="checkDataRef" />
+    <check-data-second v-if="belongStandardEquipment === '2'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第3套：多功能电器安全校准器 -->
     <check-data-third v-if="belongStandardEquipment === '3'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第4套：0.02级活塞式压力计 -->

diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index b549286..1bf1cb3 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -333,7 +333,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">
+              <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 label="1" size="large">
                   是
                 </el-radio>
@@ -370,6 +370,12 @@
     visibility: hidden;
   }
 }
+
+.radio {
+  :deep(.el-radio__label) {
+    display: none !important;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index b024f31..dfb136d 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -88,6 +88,9 @@
 const addRow = () => {
   if (checkList()) {
     setAllRowReadable()
+    if (list.value.length) {
+      list.value.push(list.value[list.value.length - 1])
+    }
     list.value.push({
       id: '',
       params: '整定压力',
diff --git a/src/views/equipement/standard/book/components/config/second/config.vue b/src/views/equipement/standard/book/components/config/second/config.vue
index a5128e8..9fc3681 100644
--- a/src/views/equipement/standard/book/components/config/second/config.vue
+++ b/src/views/equipement/standard/book/components/config/second/config.vue
@@ -56,14 +56,34 @@
 const checkoutDCDirectList = ref<IList[]>([]) // 直流电流（直接测量）多选
 const checkoutRippleVoltageList = ref<IList[]>([]) // 纹波电压多选
 // 列表显示状态
-const checkedTable = ref({
+const checkedTable = ref<{ [key: string]: any }>({
   directVoltage: '1',
   effect: '1',
-  DCIndirect: '1',
   DCDirect: '1',
+  DCIndirect: '1',
   rippleVoltage: '1',
 })
-
+const checkedDict = {
+  '1-直流电压': 'directVoltage',
+  '2-电源效应和负载效应': 'effect',
+  '3-直流电流(直接测量)': 'DCDirect',
+  '4-直流电流(间接测量)': 'DCIndirect',
+  '5-纹波电压': 'rippleVoltage',
+} as { [key: string]: any }
+// 表格数据对应 list 字典
+const listDict = ref<{ [key: string]: any }>({})
+// 监听所有表格数据
+watch(() => [listDirectVoltage.value, listEffect.value, listDCIndirect.value, listDCDirect.value, listRippleVoltage.value], () => {
+  listDict.value = {
+    '1-直流电压': listDirectVoltage.value,
+    '2-电源效应和负载效应': listEffect.value,
+    '3-直流电流(直接测量)': listDCDirect.value,
+    '4-直流电流(间接测量)': listDCIndirect.value,
+    '5-纹波电压': listRippleVoltage.value,
+  }
+}, {
+  deep: true,
+})
 const columns_direct_voltage_DC_direct = ref<any[]>([ // 直流电压表头、直流电流（直接测量）
   { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'select-dict', code: 'checkPointVoltage' },
@@ -120,13 +140,35 @@
 function checkList(list: any[], columns: any[], title: string) {
   return useCheckList(list, columns, title)
 }
-
+// 校验所有表格
+function checkAllList() {
+  let result = true
+  for (const i in columnsDict.value) {
+    const requireLength = !!((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]])
+    if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
+      result = false
+      break
+    }
+  }
+  return result
+}
+// 过滤数据  check为0的
+function filterData() {
+  let result = [] as any[]
+  for (const i in listDict.value) {
+    console.log(checkedTable.value[checkedDict[i]], 'checkedTable.value[checkedDict[i]]')
+    if ((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 /**
  * 增加行公共方法
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string, index: string) => {
+const addRow = (list: IList[], title: string, index: string, item: any) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
     let data = {} as any
     switch (title) {
@@ -141,7 +183,7 @@
           urel: '',
           resolution: '0.1', // 分辨力
         }
-        listDirectVoltage.value.push(data)
+        item ? listDirectVoltage.value.push({ ...item, paramsName: '直流电压' }) : listDirectVoltage.value.length ? listDirectVoltage.value.push(listDirectVoltage.value[listDirectVoltage.value.length - 1]) : listDirectVoltage.value.push(data)
         break
       case '电源效应和负载效应': // 电源电压调整率
         data = {
@@ -158,7 +200,8 @@
         if (listEffect.value.length) {
           data.datumPoint = '0'
         }
-        listEffect.value.push(data)
+        // listEffect.value.push(item ? ({ ...item, paramsName: '电源效应和负载效应' }) : data)
+        item ? listEffect.value.push({ ...item, paramsName: '电源效应和负载效应' }) : listEffect.value.length ? listEffect.value.push(listEffect.value[listEffect.value.length - 1]) : listEffect.value.push(data)
         break
       case '直流电流(直接测量)': // 直流电流(直接测量)
         data = {
@@ -171,7 +214,8 @@
           urel: '',
           resolution: '0.00001', // 分辨力
         }
-        listDCDirect.value.push(data)
+        // listDCDirect.value.push(item ? ({ ...item, paramsName: '直流电流(直接测量)' }) : data)
+        item ? listDCDirect.value.push({ ...item, paramsName: '直流电流(直接测量)' }) : listDCDirect.value.length ? listDCDirect.value.push(listDCDirect.value[listDCDirect.value.length - 1]) : listDCDirect.value.push(data)
         break
       case '直流电流(间接测量)': // 直流电流(间接测量)
         data = {
@@ -186,7 +230,8 @@
           resistanceValue: '', // 电阻值
           resistanceValueUnit: '', // 电阻值单位
         }
-        listDCIndirect.value.push(data)
+        // listDCIndirect.value.push(item ? ({ ...item, paramsName: '直流电流(间接测量)' }) : data)
+        item ? listDCIndirect.value.push({ ...item, paramsName: '直流电流(间接测量)' }) : listDCIndirect.value.length ? listDCIndirect.value.push(listDCIndirect.value[listDCIndirect.value.length - 1]) : listDCIndirect.value.push(data)
         break
       case '纹波电压': // 纹波电压
         data = {
@@ -201,7 +246,8 @@
           resistanceValue: '', // 频率值
           resistanceValueUnit: '', // 频率值单位
         }
-        listRippleVoltage.value.push(data)
+        // listRippleVoltage.value.push(item ? ({ ...item, paramsName: '纹波电压' }) : data)
+        item ? listRippleVoltage.value.push({ ...item, paramsName: '纹波电压' }) : listRippleVoltage.value.length ? listRippleVoltage.value.push(listRippleVoltage.value[listRippleVoltage.value.length - 1]) : listRippleVoltage.value.push(data)
         break
     }
   }
@@ -211,11 +257,6 @@
  * @param checkoutList 选中的数组
  * @param list 操作的数组
  */
-/**
- * 删除行公共方法
- * @param checkoutList 选中的数组
- * @param list 操作的数组
- */
 const delRow = (checkoutList: IList[], list: IList[], title: string) => {
   if (!checkoutList.length) {
     ElMessage.warning('请选中要删除的行')
@@ -272,12 +313,6 @@
     fun(true)
     return
   }
-  // // 指针式 禁用最大允许误差
-
-  // if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
-  //   fun(true)
-  //   return
-  // }
   fun(pageType.value === 'detail')
 }
 // ---------------------------------------按钮-----------------------------------------------------
@@ -307,46 +342,70 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  filterData()
+  const list = filterData()
+  console.log(list, 'list')
+  if (!list.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkAllList()) { return }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataDcPowerList: list.map((item: any) => ({ ...item, equipmentId: equipmentId.value, remark: form.value.remark })),
+    equipmentId: equipmentId.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    const data = res.data.checkItemDataDcPowerList.map((item: any) => {
+      return {
+        ...item,
+        resolution: Number(item.resolution),
+        checkType: JSON.parse(item.checkType),
+        datumPoint: String(item.datumPoint),
+      }
+    })
+    form.value.remark = data[0]?.remark
+    const params = {
+      1: '直流电压',
+      2: '电源效应和负载效应',
+      3: '直流电流(直接测量)',
+      4: '直流电流(间接测量)',
+      5: '纹波电压',
+    } as { [key: string]: any }
+    // 处理表格数据
+    data.forEach((item: any) => {
+      addRow([], params[item.params], '', item)
+    })
+    // 处理表格选中状态
+    setTimeout(() => {
+      for (const i in listDict.value) {
+        checkedTable.value[checkedDict[i]] = listDict.value[i].length ? 1 : 0
+      }
+    })
+    loading.close()
+  })
 }
 
 // ------------------------------------------字典--------------------------------------------------
@@ -411,7 +470,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -574,9 +633,8 @@
 
     <!-- 纹波电压 -->
     <template-table
-      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
+      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'"
       :select-all-list="tableDict"
-      @customSelect="customSelect"
       @disabled="disabled"
       @selection-change="(e) => handleSelectionChange(e, '纹波电压')"
       @add-row="addRow"
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 417999c..c094fd2 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -9,8 +9,8 @@
 import type { dictType } from '@/global'
 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 { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book'
+import { addCheckData, calculateHandle, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
@@ -234,20 +234,20 @@
   belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
   itemCategoryId.value = itemCategoryIdParam // 核查分类id
   itemCategoryName.value = itemCategoryNameParam // 核查分类名称
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
   const params = {
     equipmentId, // 设备id
     belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
     itemCategoryId: itemCategoryId.value, // 核查项分类id
     itemCategoryName: itemCategoryName.value, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   loading.close()
-  //   handleData(res.data.checkItemDataCalibratorList)
-  // })
+  getCheckItemDetail(params).then((res) => {
+    // loading.close()
+    // handleData(res.data.checkItemDataCalibratorList)
+  })
 }
 
 // 点击生成结果处理
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 7abe2dc..b747189 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -647,7 +647,7 @@
     <!-- 第1套：多功能校准源标准装置 -->
     <check-data-first v-if="belongStandardEquipment === '1'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第2套：直流稳压电源 -->
-    <check-data-second v-if="belongStandardEquipment === '2'" ref="checkDataRef" />
+    <check-data-second v-if="belongStandardEquipment === '2'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第3套：多功能电器安全校准器 -->
     <check-data-third v-if="belongStandardEquipment === '3'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第4套：0.02级活塞式压力计 -->
diff --git a/src/views/quality/supervise/record/components/processRecord.vue b/src/views/quality/supervise/record/components/processRecord.vue
index 9fd6904..8b8c833 100644
--- a/src/views/quality/supervise/record/components/processRecord.vue
+++ b/src/views/quality/supervise/record/components/processRecord.vue
@@ -133,7 +133,7 @@
         <template #default="scope">
           <span v-if="!scope.row.editable && !item.isInput">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && item.isInput" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && item.isInput" v-model="scope.row[item.value]" type="textarea" :rows="2"
             :placeholder="`${item.text}`" class="input"
           />
         </template>

diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index b549286..1bf1cb3 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -333,7 +333,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">
+              <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 label="1" size="large">
                   是
                 </el-radio>
@@ -370,6 +370,12 @@
     visibility: hidden;
   }
 }
+
+.radio {
+  :deep(.el-radio__label) {
+    display: none !important;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index b024f31..dfb136d 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -88,6 +88,9 @@
 const addRow = () => {
   if (checkList()) {
     setAllRowReadable()
+    if (list.value.length) {
+      list.value.push(list.value[list.value.length - 1])
+    }
     list.value.push({
       id: '',
       params: '整定压力',
diff --git a/src/views/equipement/standard/book/components/config/second/config.vue b/src/views/equipement/standard/book/components/config/second/config.vue
index a5128e8..9fc3681 100644
--- a/src/views/equipement/standard/book/components/config/second/config.vue
+++ b/src/views/equipement/standard/book/components/config/second/config.vue
@@ -56,14 +56,34 @@
 const checkoutDCDirectList = ref<IList[]>([]) // 直流电流（直接测量）多选
 const checkoutRippleVoltageList = ref<IList[]>([]) // 纹波电压多选
 // 列表显示状态
-const checkedTable = ref({
+const checkedTable = ref<{ [key: string]: any }>({
   directVoltage: '1',
   effect: '1',
-  DCIndirect: '1',
   DCDirect: '1',
+  DCIndirect: '1',
   rippleVoltage: '1',
 })
-
+const checkedDict = {
+  '1-直流电压': 'directVoltage',
+  '2-电源效应和负载效应': 'effect',
+  '3-直流电流(直接测量)': 'DCDirect',
+  '4-直流电流(间接测量)': 'DCIndirect',
+  '5-纹波电压': 'rippleVoltage',
+} as { [key: string]: any }
+// 表格数据对应 list 字典
+const listDict = ref<{ [key: string]: any }>({})
+// 监听所有表格数据
+watch(() => [listDirectVoltage.value, listEffect.value, listDCIndirect.value, listDCDirect.value, listRippleVoltage.value], () => {
+  listDict.value = {
+    '1-直流电压': listDirectVoltage.value,
+    '2-电源效应和负载效应': listEffect.value,
+    '3-直流电流(直接测量)': listDCDirect.value,
+    '4-直流电流(间接测量)': listDCIndirect.value,
+    '5-纹波电压': listRippleVoltage.value,
+  }
+}, {
+  deep: true,
+})
 const columns_direct_voltage_DC_direct = ref<any[]>([ // 直流电压表头、直流电流（直接测量）
   { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'select-dict', code: 'checkPointVoltage' },
@@ -120,13 +140,35 @@
 function checkList(list: any[], columns: any[], title: string) {
   return useCheckList(list, columns, title)
 }
-
+// 校验所有表格
+function checkAllList() {
+  let result = true
+  for (const i in columnsDict.value) {
+    const requireLength = !!((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]])
+    if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
+      result = false
+      break
+    }
+  }
+  return result
+}
+// 过滤数据  check为0的
+function filterData() {
+  let result = [] as any[]
+  for (const i in listDict.value) {
+    console.log(checkedTable.value[checkedDict[i]], 'checkedTable.value[checkedDict[i]]')
+    if ((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 /**
  * 增加行公共方法
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string, index: string) => {
+const addRow = (list: IList[], title: string, index: string, item: any) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
     let data = {} as any
     switch (title) {
@@ -141,7 +183,7 @@
           urel: '',
           resolution: '0.1', // 分辨力
         }
-        listDirectVoltage.value.push(data)
+        item ? listDirectVoltage.value.push({ ...item, paramsName: '直流电压' }) : listDirectVoltage.value.length ? listDirectVoltage.value.push(listDirectVoltage.value[listDirectVoltage.value.length - 1]) : listDirectVoltage.value.push(data)
         break
       case '电源效应和负载效应': // 电源电压调整率
         data = {
@@ -158,7 +200,8 @@
         if (listEffect.value.length) {
           data.datumPoint = '0'
         }
-        listEffect.value.push(data)
+        // listEffect.value.push(item ? ({ ...item, paramsName: '电源效应和负载效应' }) : data)
+        item ? listEffect.value.push({ ...item, paramsName: '电源效应和负载效应' }) : listEffect.value.length ? listEffect.value.push(listEffect.value[listEffect.value.length - 1]) : listEffect.value.push(data)
         break
       case '直流电流(直接测量)': // 直流电流(直接测量)
         data = {
@@ -171,7 +214,8 @@
           urel: '',
           resolution: '0.00001', // 分辨力
         }
-        listDCDirect.value.push(data)
+        // listDCDirect.value.push(item ? ({ ...item, paramsName: '直流电流(直接测量)' }) : data)
+        item ? listDCDirect.value.push({ ...item, paramsName: '直流电流(直接测量)' }) : listDCDirect.value.length ? listDCDirect.value.push(listDCDirect.value[listDCDirect.value.length - 1]) : listDCDirect.value.push(data)
         break
       case '直流电流(间接测量)': // 直流电流(间接测量)
         data = {
@@ -186,7 +230,8 @@
           resistanceValue: '', // 电阻值
           resistanceValueUnit: '', // 电阻值单位
         }
-        listDCIndirect.value.push(data)
+        // listDCIndirect.value.push(item ? ({ ...item, paramsName: '直流电流(间接测量)' }) : data)
+        item ? listDCIndirect.value.push({ ...item, paramsName: '直流电流(间接测量)' }) : listDCIndirect.value.length ? listDCIndirect.value.push(listDCIndirect.value[listDCIndirect.value.length - 1]) : listDCIndirect.value.push(data)
         break
       case '纹波电压': // 纹波电压
         data = {
@@ -201,7 +246,8 @@
           resistanceValue: '', // 频率值
           resistanceValueUnit: '', // 频率值单位
         }
-        listRippleVoltage.value.push(data)
+        // listRippleVoltage.value.push(item ? ({ ...item, paramsName: '纹波电压' }) : data)
+        item ? listRippleVoltage.value.push({ ...item, paramsName: '纹波电压' }) : listRippleVoltage.value.length ? listRippleVoltage.value.push(listRippleVoltage.value[listRippleVoltage.value.length - 1]) : listRippleVoltage.value.push(data)
         break
     }
   }
@@ -211,11 +257,6 @@
  * @param checkoutList 选中的数组
  * @param list 操作的数组
  */
-/**
- * 删除行公共方法
- * @param checkoutList 选中的数组
- * @param list 操作的数组
- */
 const delRow = (checkoutList: IList[], list: IList[], title: string) => {
   if (!checkoutList.length) {
     ElMessage.warning('请选中要删除的行')
@@ -272,12 +313,6 @@
     fun(true)
     return
   }
-  // // 指针式 禁用最大允许误差
-
-  // if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
-  //   fun(true)
-  //   return
-  // }
   fun(pageType.value === 'detail')
 }
 // ---------------------------------------按钮-----------------------------------------------------
@@ -307,46 +342,70 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  filterData()
+  const list = filterData()
+  console.log(list, 'list')
+  if (!list.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkAllList()) { return }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataDcPowerList: list.map((item: any) => ({ ...item, equipmentId: equipmentId.value, remark: form.value.remark })),
+    equipmentId: equipmentId.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    const data = res.data.checkItemDataDcPowerList.map((item: any) => {
+      return {
+        ...item,
+        resolution: Number(item.resolution),
+        checkType: JSON.parse(item.checkType),
+        datumPoint: String(item.datumPoint),
+      }
+    })
+    form.value.remark = data[0]?.remark
+    const params = {
+      1: '直流电压',
+      2: '电源效应和负载效应',
+      3: '直流电流(直接测量)',
+      4: '直流电流(间接测量)',
+      5: '纹波电压',
+    } as { [key: string]: any }
+    // 处理表格数据
+    data.forEach((item: any) => {
+      addRow([], params[item.params], '', item)
+    })
+    // 处理表格选中状态
+    setTimeout(() => {
+      for (const i in listDict.value) {
+        checkedTable.value[checkedDict[i]] = listDict.value[i].length ? 1 : 0
+      }
+    })
+    loading.close()
+  })
 }
 
 // ------------------------------------------字典--------------------------------------------------
@@ -411,7 +470,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -574,9 +633,8 @@
 
     <!-- 纹波电压 -->
     <template-table
-      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
+      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'"
       :select-all-list="tableDict"
-      @customSelect="customSelect"
       @disabled="disabled"
       @selection-change="(e) => handleSelectionChange(e, '纹波电压')"
       @add-row="addRow"
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 417999c..c094fd2 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -9,8 +9,8 @@
 import type { dictType } from '@/global'
 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 { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book'
+import { addCheckData, calculateHandle, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
@@ -234,20 +234,20 @@
   belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
   itemCategoryId.value = itemCategoryIdParam // 核查分类id
   itemCategoryName.value = itemCategoryNameParam // 核查分类名称
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
   const params = {
     equipmentId, // 设备id
     belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
     itemCategoryId: itemCategoryId.value, // 核查项分类id
     itemCategoryName: itemCategoryName.value, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   loading.close()
-  //   handleData(res.data.checkItemDataCalibratorList)
-  // })
+  getCheckItemDetail(params).then((res) => {
+    // loading.close()
+    // handleData(res.data.checkItemDataCalibratorList)
+  })
 }
 
 // 点击生成结果处理
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 7abe2dc..b747189 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -647,7 +647,7 @@
     <!-- 第1套：多功能校准源标准装置 -->
     <check-data-first v-if="belongStandardEquipment === '1'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第2套：直流稳压电源 -->
-    <check-data-second v-if="belongStandardEquipment === '2'" ref="checkDataRef" />
+    <check-data-second v-if="belongStandardEquipment === '2'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第3套：多功能电器安全校准器 -->
     <check-data-third v-if="belongStandardEquipment === '3'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第4套：0.02级活塞式压力计 -->
diff --git a/src/views/quality/supervise/record/components/processRecord.vue b/src/views/quality/supervise/record/components/processRecord.vue
index 9fd6904..8b8c833 100644
--- a/src/views/quality/supervise/record/components/processRecord.vue
+++ b/src/views/quality/supervise/record/components/processRecord.vue
@@ -133,7 +133,7 @@
         <template #default="scope">
           <span v-if="!scope.row.editable && !item.isInput">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && item.isInput" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && item.isInput" v-model="scope.row[item.value]" type="textarea" :rows="2"
             :placeholder="`${item.text}`" class="input"
           />
         </template>
diff --git a/src/views/quality/supervise/record/index.vue b/src/views/quality/supervise/record/index.vue
index 6d468cc..7cd25ce 100644
--- a/src/views/quality/supervise/record/index.vue
+++ b/src/views/quality/supervise/record/index.vue
@@ -10,10 +10,12 @@
 import pdfFileItem from '@/views/quality/supervise/record/components/pdfFileItem.vue'
 import { getQualityReportFile } from '@/api/quality/supervise/report'
 import { getQualityNoReportFile } from '@/api/quality/supervise/analysis'
+import useUserStore from '@/store/modules/user'
 const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
 const userList = ref<userType[]>([]) // 可使用人列表
 const deptList = ref<{ deptName: string; deptId: string }[]>([]) // 部门列表
 const deptAllList = ref<{ deptName: string; deptId: string }[]>([]) // 部门列表
+const userStore = useUserStore()
 const active = ref<string>('全部')
 // 查询条件
 const listQuery = ref({
@@ -69,6 +71,9 @@
 }
 // 搜索
 const searchList = () => {
+  if (active.value === '1') {
+    listQuery.value.creator = userStore.id
+  }
   fetchData(true)
 }
 
@@ -255,7 +260,7 @@
           <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
         </el-select>
       </search-item>
-      <search-item>
+      <search-item v-if="active !== '1'">
         <el-select v-model="listQuery.creator" filterable clearable placeholder="质量监督员" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
             <span style="float: left;">{{ item.name }}</span>
@@ -365,6 +370,7 @@
           >
             <template #default="{ row }">
               <el-button
+                v-if="active !== '1'"
                 size="small"
                 type="primary"
                 link

diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index d037a4c..f03be8c 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -128,7 +128,7 @@
 const columns_voltage_representation_value_error_number = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
@@ -143,7 +143,7 @@
 const columns_voltage_representation_value_error_pointer = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
-  { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
+  { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
@@ -251,7 +251,7 @@
  */
 const addRow = (list: IList[], title: string, index: string) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
-    let data = {}
+    let data = {} as any
     switch (title) {
       case '电源电压调整率': // 电源电压调整率
         data = {
@@ -263,8 +263,9 @@
           unit: '', // 单位
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
-        }
-        lineVoltageRegulationList.value.push(data)
+        } as any
+        lineVoltageRegulationList.value.length ? lineVoltageRegulationList.value.push(lineVoltageRegulationList.value[lineVoltageRegulationList.value.length - 1]) : lineVoltageRegulationList.value.push(data)
+
         break
       case '负载调整率': // 负载调整率
         data = {
@@ -282,6 +283,10 @@
         break
       case '电压表示值误差': // 电压表示值误差
         // 1数字式、2指针式
+        if (voltageRepresentationValueErrorList.value.length) {
+          voltageRepresentationValueErrorList.value.push(voltageRepresentationValueErrorList.value[voltageRepresentationValueErrorList.value.length - 1])
+          break
+        }
         data = {
           params: '电压表示值误差',
           dataType: '3',
@@ -315,6 +320,10 @@
         }
         break
       case '电流表示值误差(直接测量)': // 电流表示值误差(直接测量)
+        if (ammeterDirectList.value.length) {
+          ammeterDirectList.value.push(ammeterDirectList.value[ammeterDirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(直接测量)',
           dataType: '4',
@@ -348,6 +357,10 @@
         }
         break
       case '电流表示值误差(间接测量)': // 电流表示值误差(间接测量)
+        if (ammeterIndirectList.value.length) {
+          ammeterIndirectList.value.push(ammeterIndirectList.value[ammeterIndirectList.value.length - 1])
+          break
+        }
         data = {
           params: '电流表示值误差(间接测量)',
           dataType: '5',
@@ -384,6 +397,10 @@
         }
         break
       case '纹波电压': // 纹波电压
+        if (rippleVoltageList.value.length) {
+          rippleVoltageList.value.push(rippleVoltageList.value[rippleVoltageList.value.length - 1])
+          break
+        }
         data = {
           params: '纹波电压',
           dataType: '6',
@@ -405,7 +422,7 @@
           unit: '', // 单位
           editable: true,
         }
-        outputVoltageStabilityList.value.push(data)
+        outputVoltageStabilityList.value.length ? outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1]) : outputVoltageStabilityList.value.push(data)
         break
     }
   }
@@ -687,7 +704,15 @@
     负载情况: loadSituationList.value,
     最大允许误差: standardMaximumError.value,
     标准电阻值单位: standardResistance.value,
-    测量单位: unitList1.value,
+  }
+}
+// 自定义下拉框内容
+const customSelect = (data: any, fun: any) => {
+  if (data.column.text === '单位') {
+    fun(unitList1.value)
+  }
+  else {
+    fun(tableDict.value[data.text])
   }
 }
 // 生成最终list
@@ -825,10 +850,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
+    :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
+    @customSelect="customSelect"
     @disabled="disabled"
-    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -855,10 +880,10 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
+    :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
     :select-all-list="tableDict"
     @disabled="disabled"
-    @disabled-item="disabledItem"
+    @customSelect="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index b549286..1bf1cb3 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -333,7 +333,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">
+              <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 label="1" size="large">
                   是
                 </el-radio>
@@ -370,6 +370,12 @@
     visibility: hidden;
   }
 }
+
+.radio {
+  :deep(.el-radio__label) {
+    display: none !important;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index b024f31..dfb136d 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -88,6 +88,9 @@
 const addRow = () => {
   if (checkList()) {
     setAllRowReadable()
+    if (list.value.length) {
+      list.value.push(list.value[list.value.length - 1])
+    }
     list.value.push({
       id: '',
       params: '整定压力',
diff --git a/src/views/equipement/standard/book/components/config/second/config.vue b/src/views/equipement/standard/book/components/config/second/config.vue
index a5128e8..9fc3681 100644
--- a/src/views/equipement/standard/book/components/config/second/config.vue
+++ b/src/views/equipement/standard/book/components/config/second/config.vue
@@ -56,14 +56,34 @@
 const checkoutDCDirectList = ref<IList[]>([]) // 直流电流（直接测量）多选
 const checkoutRippleVoltageList = ref<IList[]>([]) // 纹波电压多选
 // 列表显示状态
-const checkedTable = ref({
+const checkedTable = ref<{ [key: string]: any }>({
   directVoltage: '1',
   effect: '1',
-  DCIndirect: '1',
   DCDirect: '1',
+  DCIndirect: '1',
   rippleVoltage: '1',
 })
-
+const checkedDict = {
+  '1-直流电压': 'directVoltage',
+  '2-电源效应和负载效应': 'effect',
+  '3-直流电流(直接测量)': 'DCDirect',
+  '4-直流电流(间接测量)': 'DCIndirect',
+  '5-纹波电压': 'rippleVoltage',
+} as { [key: string]: any }
+// 表格数据对应 list 字典
+const listDict = ref<{ [key: string]: any }>({})
+// 监听所有表格数据
+watch(() => [listDirectVoltage.value, listEffect.value, listDCIndirect.value, listDCDirect.value, listRippleVoltage.value], () => {
+  listDict.value = {
+    '1-直流电压': listDirectVoltage.value,
+    '2-电源效应和负载效应': listEffect.value,
+    '3-直流电流(直接测量)': listDCDirect.value,
+    '4-直流电流(间接测量)': listDCIndirect.value,
+    '5-纹波电压': listRippleVoltage.value,
+  }
+}, {
+  deep: true,
+})
 const columns_direct_voltage_DC_direct = ref<any[]>([ // 直流电压表头、直流电流（直接测量）
   { text: '核查项目', value: 'paramsName', align: 'center', required: true, type: 'text' },
   { text: '核查点', value: 'checkPoint', align: 'center', required: true, type: 'select-dict', code: 'checkPointVoltage' },
@@ -120,13 +140,35 @@
 function checkList(list: any[], columns: any[], title: string) {
   return useCheckList(list, columns, title)
 }
-
+// 校验所有表格
+function checkAllList() {
+  let result = true
+  for (const i in columnsDict.value) {
+    const requireLength = !!((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]])
+    if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
+      result = false
+      break
+    }
+  }
+  return result
+}
+// 过滤数据  check为0的
+function filterData() {
+  let result = [] as any[]
+  for (const i in listDict.value) {
+    console.log(checkedTable.value[checkedDict[i]], 'checkedTable.value[checkedDict[i]]')
+    if ((checkedTable.value[checkedDict[i]] === '1' || checkedTable.value[checkedDict[i]] === 1) && checkedTable.value[checkedDict[i]]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 /**
  * 增加行公共方法
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string, index: string) => {
+const addRow = (list: IList[], title: string, index: string, item: any) => {
   if (checkList(list, columnsDict.value[`${index}-${title}`], `${title}表格`)) {
     let data = {} as any
     switch (title) {
@@ -141,7 +183,7 @@
           urel: '',
           resolution: '0.1', // 分辨力
         }
-        listDirectVoltage.value.push(data)
+        item ? listDirectVoltage.value.push({ ...item, paramsName: '直流电压' }) : listDirectVoltage.value.length ? listDirectVoltage.value.push(listDirectVoltage.value[listDirectVoltage.value.length - 1]) : listDirectVoltage.value.push(data)
         break
       case '电源效应和负载效应': // 电源电压调整率
         data = {
@@ -158,7 +200,8 @@
         if (listEffect.value.length) {
           data.datumPoint = '0'
         }
-        listEffect.value.push(data)
+        // listEffect.value.push(item ? ({ ...item, paramsName: '电源效应和负载效应' }) : data)
+        item ? listEffect.value.push({ ...item, paramsName: '电源效应和负载效应' }) : listEffect.value.length ? listEffect.value.push(listEffect.value[listEffect.value.length - 1]) : listEffect.value.push(data)
         break
       case '直流电流(直接测量)': // 直流电流(直接测量)
         data = {
@@ -171,7 +214,8 @@
           urel: '',
           resolution: '0.00001', // 分辨力
         }
-        listDCDirect.value.push(data)
+        // listDCDirect.value.push(item ? ({ ...item, paramsName: '直流电流(直接测量)' }) : data)
+        item ? listDCDirect.value.push({ ...item, paramsName: '直流电流(直接测量)' }) : listDCDirect.value.length ? listDCDirect.value.push(listDCDirect.value[listDCDirect.value.length - 1]) : listDCDirect.value.push(data)
         break
       case '直流电流(间接测量)': // 直流电流(间接测量)
         data = {
@@ -186,7 +230,8 @@
           resistanceValue: '', // 电阻值
           resistanceValueUnit: '', // 电阻值单位
         }
-        listDCIndirect.value.push(data)
+        // listDCIndirect.value.push(item ? ({ ...item, paramsName: '直流电流(间接测量)' }) : data)
+        item ? listDCIndirect.value.push({ ...item, paramsName: '直流电流(间接测量)' }) : listDCIndirect.value.length ? listDCIndirect.value.push(listDCIndirect.value[listDCIndirect.value.length - 1]) : listDCIndirect.value.push(data)
         break
       case '纹波电压': // 纹波电压
         data = {
@@ -201,7 +246,8 @@
           resistanceValue: '', // 频率值
           resistanceValueUnit: '', // 频率值单位
         }
-        listRippleVoltage.value.push(data)
+        // listRippleVoltage.value.push(item ? ({ ...item, paramsName: '纹波电压' }) : data)
+        item ? listRippleVoltage.value.push({ ...item, paramsName: '纹波电压' }) : listRippleVoltage.value.length ? listRippleVoltage.value.push(listRippleVoltage.value[listRippleVoltage.value.length - 1]) : listRippleVoltage.value.push(data)
         break
     }
   }
@@ -211,11 +257,6 @@
  * @param checkoutList 选中的数组
  * @param list 操作的数组
  */
-/**
- * 删除行公共方法
- * @param checkoutList 选中的数组
- * @param list 操作的数组
- */
 const delRow = (checkoutList: IList[], list: IList[], title: string) => {
   if (!checkoutList.length) {
     ElMessage.warning('请选中要删除的行')
@@ -272,12 +313,6 @@
     fun(true)
     return
   }
-  // // 指针式 禁用最大允许误差
-
-  // if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
-  //   fun(true)
-  //   return
-  // }
   fun(pageType.value === 'detail')
 }
 // ---------------------------------------按钮-----------------------------------------------------
@@ -307,46 +342,70 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  filterData()
+  const list = filterData()
+  console.log(list, 'list')
+  if (!list.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkAllList()) { return }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataDcPowerList: list.map((item: any) => ({ ...item, equipmentId: equipmentId.value, remark: form.value.remark })),
+    equipmentId: equipmentId.value,
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    const data = res.data.checkItemDataDcPowerList.map((item: any) => {
+      return {
+        ...item,
+        resolution: Number(item.resolution),
+        checkType: JSON.parse(item.checkType),
+        datumPoint: String(item.datumPoint),
+      }
+    })
+    form.value.remark = data[0]?.remark
+    const params = {
+      1: '直流电压',
+      2: '电源效应和负载效应',
+      3: '直流电流(直接测量)',
+      4: '直流电流(间接测量)',
+      5: '纹波电压',
+    } as { [key: string]: any }
+    // 处理表格数据
+    data.forEach((item: any) => {
+      addRow([], params[item.params], '', item)
+    })
+    // 处理表格选中状态
+    setTimeout(() => {
+      for (const i in listDict.value) {
+        checkedTable.value[checkedDict[i]] = listDict.value[i].length ? 1 : 0
+      }
+    })
+    loading.close()
+  })
 }
 
 // ------------------------------------------字典--------------------------------------------------
@@ -411,7 +470,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -574,9 +633,8 @@
 
     <!-- 纹波电压 -->
     <template-table
-      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'" :custom-select="true"
+      :data="listRippleVoltage" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="5" :show-btn="pageType !== 'detail'"
       :select-all-list="tableDict"
-      @customSelect="customSelect"
       @disabled="disabled"
       @selection-change="(e) => handleSelectionChange(e, '纹波电压')"
       @add-row="addRow"
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 417999c..c094fd2 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -9,8 +9,8 @@
 import type { dictType } from '@/global'
 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 { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book'
+import { addCheckData, calculateHandle, getInfo, updateCheckData } from '@/api/equipment/standard/checkData'
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
@@ -234,20 +234,20 @@
   belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
   itemCategoryId.value = itemCategoryIdParam // 核查分类id
   itemCategoryName.value = itemCategoryNameParam // 核查分类名称
-  const loading = ElLoading.service({
-    lock: true,
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
   const params = {
     equipmentId, // 设备id
     belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
     itemCategoryId: itemCategoryId.value, // 核查项分类id
     itemCategoryName: itemCategoryName.value, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   loading.close()
-  //   handleData(res.data.checkItemDataCalibratorList)
-  // })
+  getCheckItemDetail(params).then((res) => {
+    // loading.close()
+    // handleData(res.data.checkItemDataCalibratorList)
+  })
 }
 
 // 点击生成结果处理
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 7abe2dc..b747189 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -647,7 +647,7 @@
     <!-- 第1套：多功能校准源标准装置 -->
     <check-data-first v-if="belongStandardEquipment === '1'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第2套：直流稳压电源 -->
-    <check-data-second v-if="belongStandardEquipment === '2'" ref="checkDataRef" />
+    <check-data-second v-if="belongStandardEquipment === '2'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第3套：多功能电器安全校准器 -->
     <check-data-third v-if="belongStandardEquipment === '3'" ref="checkDataRef" :check-date="form.checkDate" :page-type="pageType" :select-standard-id="selectStandardId" />
     <!-- 第4套：0.02级活塞式压力计 -->
diff --git a/src/views/quality/supervise/record/components/processRecord.vue b/src/views/quality/supervise/record/components/processRecord.vue
index 9fd6904..8b8c833 100644
--- a/src/views/quality/supervise/record/components/processRecord.vue
+++ b/src/views/quality/supervise/record/components/processRecord.vue
@@ -133,7 +133,7 @@
         <template #default="scope">
           <span v-if="!scope.row.editable && !item.isInput">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && item.isInput" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && item.isInput" v-model="scope.row[item.value]" type="textarea" :rows="2"
             :placeholder="`${item.text}`" class="input"
           />
         </template>
diff --git a/src/views/quality/supervise/record/index.vue b/src/views/quality/supervise/record/index.vue
index 6d468cc..7cd25ce 100644
--- a/src/views/quality/supervise/record/index.vue
+++ b/src/views/quality/supervise/record/index.vue
@@ -10,10 +10,12 @@
 import pdfFileItem from '@/views/quality/supervise/record/components/pdfFileItem.vue'
 import { getQualityReportFile } from '@/api/quality/supervise/report'
 import { getQualityNoReportFile } from '@/api/quality/supervise/analysis'
+import useUserStore from '@/store/modules/user'
 const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
 const userList = ref<userType[]>([]) // 可使用人列表
 const deptList = ref<{ deptName: string; deptId: string }[]>([]) // 部门列表
 const deptAllList = ref<{ deptName: string; deptId: string }[]>([]) // 部门列表
+const userStore = useUserStore()
 const active = ref<string>('全部')
 // 查询条件
 const listQuery = ref({
@@ -69,6 +71,9 @@
 }
 // 搜索
 const searchList = () => {
+  if (active.value === '1') {
+    listQuery.value.creator = userStore.id
+  }
   fetchData(true)
 }
 
@@ -255,7 +260,7 @@
           <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
         </el-select>
       </search-item>
-      <search-item>
+      <search-item v-if="active !== '1'">
         <el-select v-model="listQuery.creator" filterable clearable placeholder="质量监督员" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
             <span style="float: left;">{{ item.name }}</span>
@@ -365,6 +370,7 @@
           >
             <template #default="{ row }">
               <el-button
+                v-if="active !== '1'"
                 size="small"
                 type="primary"
                 link
diff --git a/src/views/quality/supervise/report/components/recordDialog.vue b/src/views/quality/supervise/report/components/recordDialog.vue
index 497b3d6..b43da64 100644
--- a/src/views/quality/supervise/report/components/recordDialog.vue
+++ b/src/views/quality/supervise/report/components/recordDialog.vue
@@ -6,6 +6,7 @@
 import { deleteQualityRecord, getQualityRecordList, getSearchDept } from '@/api/quality/supervise/record'
 import { getUserList } from '@/api/system/user'
 import type { userType } from '@/views/system/user/user-interface'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   isMulti: {
     type: Boolean,
@@ -14,6 +15,7 @@
 })
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
+const userStore = useUserStore()
 const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
 const userList = ref<userType[]>([]) // 可使用人列表
 const deptList = ref<{ deptName: string; deptId: string }[]>([]) // 部门列表
@@ -72,6 +74,7 @@
 }
 // 搜索
 const searchList = () => {
+  listQuery.value.creator = userStore.id
   fetchData(true)
 }
 searchList()
@@ -182,14 +185,14 @@
           <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.creator" filterable clearable placeholder="质量监督员" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
             <span style="float: left;">{{ item.name }}</span>
             <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
           </el-option>
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"