diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 07a7a7a..66401ed 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -1,6 +1,6 @@
 <!-- 显示图片或链接 -->
 <script lang="ts" setup name="showPhoto">
-import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
+// import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
 import { computed, onMounted, onUpdated, ref } from 'vue'
 import { getPhotoUrl } from '../../api/file'
 const props = defineProps({

diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 07a7a7a..66401ed 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -1,6 +1,6 @@
 <!-- 显示图片或链接 -->
 <script lang="ts" setup name="showPhoto">
-import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
+// import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
 import { computed, onMounted, onUpdated, ref } from 'vue'
 import { getPhotoUrl } from '../../api/file'
 const props = defineProps({
diff --git a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
index 4242468..b05138c 100644
--- a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
+++ b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
-import { el } from 'element-plus/es/locale'
+// import { el } from 'element-plus/es/locale'
 import { interchangeListTerminate } from '@/api/business/manager/sendReceive'
 import type { deptType } from '@/global'
 import { getDeptTreeList } from '@/api/system/dept'

diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 07a7a7a..66401ed 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -1,6 +1,6 @@
 <!-- 显示图片或链接 -->
 <script lang="ts" setup name="showPhoto">
-import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
+// import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
 import { computed, onMounted, onUpdated, ref } from 'vue'
 import { getPhotoUrl } from '../../api/file'
 const props = defineProps({
diff --git a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
index 4242468..b05138c 100644
--- a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
+++ b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
-import { el } from 'element-plus/es/locale'
+// import { el } from 'element-plus/es/locale'
 import { interchangeListTerminate } from '@/api/business/manager/sendReceive'
 import type { deptType } from '@/global'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index c6a1758..4385469 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -35,7 +35,7 @@
   },
 })
 
-const form = ref({
+const form1 = ref({
   voltageRepresentationValueErrorType: '1', // 电压表示值误差类型：1数字式、2指针式
   ammeterDirectType: '1', // 电流表示值误差(直接测量)类型：1数字式、2指针式
   ammeterIndirectType: '1', // 电流表示值误差(间接测量)类型：1数字式、2指针式
@@ -50,12 +50,12 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form.value = newVal
+  form1.value = newVal
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
-const list = ref<IList[]>([])
+const list1 = ref<IList[]>([])
 const lineVoltageRegulationList = ref<IList[]>([]) // 电源电压调整率
 const loadRegulationList = ref<IList[]>([]) // 负载调整率
 const voltageRepresentationValueErrorList = ref<IList[]>([]) // 电压表示值误差
@@ -76,9 +76,9 @@
     '6-纹波电压': rippleVoltageList.value, // 6
     '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7
   }
-  list.value = []
+  list1.value = []
   for (const i in listDict.value) {
-    list.value = [...list.value, ...listDict.value[i]]
+    list1.value = [...list1.value, ...listDict.value[i]]
   }
 }, {
   deep: true,
@@ -92,7 +92,7 @@
 // })
 // 清空所有数据
 function clearAllList() {
-  list.value = []
+  list1.value = []
   lineVoltageRegulationList.value = [] // 电源电压调整率
   loadRegulationList.value = [] // 负载调整率
   voltageRepresentationValueErrorList.value = [] // 电压表示值误差
@@ -238,15 +238,15 @@
 )
 // 表格对应的 选择状态
 let chekedDict = {} as { [key: string]: any }
-watch(() => form.value, () => {
+watch(() => form1.value, () => {
   chekedDict = {
-    '1-电源电压调整率': form.value.voltageRegulation, // 1
-    '2-负载调整率': form.value.loadRegulation, // 2
-    '3-电压示值误差': form.value.voltageRepresentError, // 3
-    '4-电流示值误差(直接测量)': form.value.currentRepresentErrorDirect, // 4
-    '5-电流示值误差(间接测量)': form.value.currentRepresentErrorIndirect, // 5
-    '6-纹波电压': form.value.rippleVoltage, // 6
-    '7-输出电压短期稳定性': form.value.voltageOutputStability,
+    '1-电源电压调整率': form1.value.voltageRegulation, // 1
+    '2-负载调整率': form1.value.loadRegulation, // 2
+    '3-电压示值误差': form1.value.voltageRepresentError, // 3
+    '4-电流示值误差(直接测量)': form1.value.currentRepresentErrorDirect, // 4
+    '5-电流示值误差(间接测量)': form1.value.currentRepresentErrorIndirect, // 5
+    '6-纹波电压': form1.value.rippleVoltage, // 6
+    '7-输出电压短期稳定性': form1.value.voltageOutputStability,
   }
 }, {
   deep: true,
@@ -307,7 +307,7 @@
           editable: true,
 
         }
-        if (form.value.voltageRepresentationValueErrorType === '1') {
+        if (form1.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
@@ -345,7 +345,7 @@
           editable: true,
         }
         // 1数字式、2指针式
-        if (form.value.ammeterDirectType === '1') {
+        if (form1.value.ammeterDirectType === '1') {
           //  数字式
           ammeterDirectList.value.push({
             ...data,
@@ -383,7 +383,7 @@
           maximumError: '', // 最大允许误差
         }
         // 1数字式、2指针式
-        if (form.value.ammeterIndirectType === '1') {
+        if (form1.value.ammeterIndirectType === '1') {
           //  数字式
           ammeterIndirectList.value.push({
             ...data,
@@ -521,15 +521,15 @@
     switch (i) {
       case 3:
         // 电压表示值误差
-        form.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
         break
       case 4:
         // 电流表示值误差(直接测量)
-        form.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
         break
       case 5:
         // 电流表示值误差(间接测量)
-        form.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
         break
     }
     // }
@@ -578,7 +578,7 @@
   }
 })
 // 电压表示值误差、监听电流表示值误差(直接测量)
-watch(() => form.value.voltageRepresentationValueErrorType, (newValue) => {
+watch(() => form1.value.voltageRepresentationValueErrorType, (newValue) => {
   if (newValue === '2') {
     columns_voltage_representation.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -589,7 +589,7 @@
   if (!pageEditFlag.value) { return }
   voltageRepresentationValueErrorList.value = []
 })
-watch(() => form.value.ammeterDirectType, (newValue) => {
+watch(() => form1.value.ammeterDirectType, (newValue) => {
   if (newValue === '2') {
     columns_ammeter_direct.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -601,7 +601,7 @@
   ammeterDirectList.value = []
 })
 // 监听电流表示值误差(间接测量)
-watch(() => form.value.ammeterIndirectType, (newValue) => {
+watch(() => form1.value.ammeterIndirectType, (newValue) => {
   if (newValue === '2') { // 指针式
     columns_ammeter_indirect.value = columns_ammeter_indirect_pointer.value
   }
@@ -795,18 +795,18 @@
   return result
 }
 fecthDict()
-defineExpose({ list, checkAllList, form, getList })
+defineExpose({ list1, checkAllList, form1, getList })
 </script>
 
 <template>
   <div style="padding: 0 10px;display: flex;justify-content: space-between;">
-    <el-checkbox v-model="form.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+    <el-checkbox v-model="form1.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
       外观及功能性检查
     </el-checkbox>
   </div>
   <!-- 电源电压调整率 -->
   <template-table
-    :show="Boolean(form.voltageRegulation)"
+    :show="Boolean(form1.voltageRegulation)"
     :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation" :page-type="pageType" title="电源电压调整率" index="1" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -816,7 +816,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电源电压调整率
       </el-checkbox>
     </template>
@@ -845,7 +845,7 @@
 
   <!-- 负载调整率 -->
   <template-table
-    :show="Boolean(form.loadRegulation)"
+    :show="Boolean(form1.loadRegulation)"
     :data="loadRegulationList" :columns="columns_load_regulation" :page-type="pageType" title="负载调整率" index="2" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -855,7 +855,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         负载调整率
       </el-checkbox>
     </template>
@@ -888,7 +888,7 @@
 
   <!--  电压表示值误差 -->
   <template-table
-    :show="Boolean(form.voltageRepresentError)"
+    :show="Boolean(form1.voltageRepresentError)"
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -898,18 +898,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电压示值误差
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.voltageRepresentationValueErrorType"
+        v-model="form1.voltageRepresentationValueErrorType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -930,10 +929,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorDirect)"
+    :show="Boolean(form1.currentRepresentErrorDirect)"
     :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"
+    @custom-select="customSelect"
     @disabled="disabled"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(直接测量)')"
     @add-row="addRow"
@@ -941,18 +940,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(直接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form1.ammeterDirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -961,29 +959,28 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorIndirect)"
+    :show="Boolean(form1.currentRepresentErrorIndirect)"
     :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"
-    @customSelect="customSelect"
+    @custom-select="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(间接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterIndirectType"
+        v-model="form1.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -992,7 +989,7 @@
 
   <!-- 纹波电压 -->
   <template-table
-    :show="Boolean(form.rippleVoltage)"
+    :show="Boolean(form1.rippleVoltage)"
     :data="rippleVoltageList" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="6" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1002,7 +999,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         纹波电压
       </el-checkbox>
     </template>
@@ -1028,7 +1025,7 @@
 
   <!--  输出电压短期稳定性 -->
   <template-table
-    :show="Boolean(form.voltageOutputStability)"
+    :show="Boolean(form1.voltageOutputStability)"
     :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability" :page-type="pageType" title="输出电压短期稳定性" index="7" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1038,7 +1035,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         输出电压短期稳定性
       </el-checkbox>
     </template>

diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 07a7a7a..66401ed 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -1,6 +1,6 @@
 <!-- 显示图片或链接 -->
 <script lang="ts" setup name="showPhoto">
-import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
+// import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
 import { computed, onMounted, onUpdated, ref } from 'vue'
 import { getPhotoUrl } from '../../api/file'
 const props = defineProps({
diff --git a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
index 4242468..b05138c 100644
--- a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
+++ b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
-import { el } from 'element-plus/es/locale'
+// import { el } from 'element-plus/es/locale'
 import { interchangeListTerminate } from '@/api/business/manager/sendReceive'
 import type { deptType } from '@/global'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index c6a1758..4385469 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -35,7 +35,7 @@
   },
 })
 
-const form = ref({
+const form1 = ref({
   voltageRepresentationValueErrorType: '1', // 电压表示值误差类型：1数字式、2指针式
   ammeterDirectType: '1', // 电流表示值误差(直接测量)类型：1数字式、2指针式
   ammeterIndirectType: '1', // 电流表示值误差(间接测量)类型：1数字式、2指针式
@@ -50,12 +50,12 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form.value = newVal
+  form1.value = newVal
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
-const list = ref<IList[]>([])
+const list1 = ref<IList[]>([])
 const lineVoltageRegulationList = ref<IList[]>([]) // 电源电压调整率
 const loadRegulationList = ref<IList[]>([]) // 负载调整率
 const voltageRepresentationValueErrorList = ref<IList[]>([]) // 电压表示值误差
@@ -76,9 +76,9 @@
     '6-纹波电压': rippleVoltageList.value, // 6
     '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7
   }
-  list.value = []
+  list1.value = []
   for (const i in listDict.value) {
-    list.value = [...list.value, ...listDict.value[i]]
+    list1.value = [...list1.value, ...listDict.value[i]]
   }
 }, {
   deep: true,
@@ -92,7 +92,7 @@
 // })
 // 清空所有数据
 function clearAllList() {
-  list.value = []
+  list1.value = []
   lineVoltageRegulationList.value = [] // 电源电压调整率
   loadRegulationList.value = [] // 负载调整率
   voltageRepresentationValueErrorList.value = [] // 电压表示值误差
@@ -238,15 +238,15 @@
 )
 // 表格对应的 选择状态
 let chekedDict = {} as { [key: string]: any }
-watch(() => form.value, () => {
+watch(() => form1.value, () => {
   chekedDict = {
-    '1-电源电压调整率': form.value.voltageRegulation, // 1
-    '2-负载调整率': form.value.loadRegulation, // 2
-    '3-电压示值误差': form.value.voltageRepresentError, // 3
-    '4-电流示值误差(直接测量)': form.value.currentRepresentErrorDirect, // 4
-    '5-电流示值误差(间接测量)': form.value.currentRepresentErrorIndirect, // 5
-    '6-纹波电压': form.value.rippleVoltage, // 6
-    '7-输出电压短期稳定性': form.value.voltageOutputStability,
+    '1-电源电压调整率': form1.value.voltageRegulation, // 1
+    '2-负载调整率': form1.value.loadRegulation, // 2
+    '3-电压示值误差': form1.value.voltageRepresentError, // 3
+    '4-电流示值误差(直接测量)': form1.value.currentRepresentErrorDirect, // 4
+    '5-电流示值误差(间接测量)': form1.value.currentRepresentErrorIndirect, // 5
+    '6-纹波电压': form1.value.rippleVoltage, // 6
+    '7-输出电压短期稳定性': form1.value.voltageOutputStability,
   }
 }, {
   deep: true,
@@ -307,7 +307,7 @@
           editable: true,
 
         }
-        if (form.value.voltageRepresentationValueErrorType === '1') {
+        if (form1.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
@@ -345,7 +345,7 @@
           editable: true,
         }
         // 1数字式、2指针式
-        if (form.value.ammeterDirectType === '1') {
+        if (form1.value.ammeterDirectType === '1') {
           //  数字式
           ammeterDirectList.value.push({
             ...data,
@@ -383,7 +383,7 @@
           maximumError: '', // 最大允许误差
         }
         // 1数字式、2指针式
-        if (form.value.ammeterIndirectType === '1') {
+        if (form1.value.ammeterIndirectType === '1') {
           //  数字式
           ammeterIndirectList.value.push({
             ...data,
@@ -521,15 +521,15 @@
     switch (i) {
       case 3:
         // 电压表示值误差
-        form.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
         break
       case 4:
         // 电流表示值误差(直接测量)
-        form.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
         break
       case 5:
         // 电流表示值误差(间接测量)
-        form.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
         break
     }
     // }
@@ -578,7 +578,7 @@
   }
 })
 // 电压表示值误差、监听电流表示值误差(直接测量)
-watch(() => form.value.voltageRepresentationValueErrorType, (newValue) => {
+watch(() => form1.value.voltageRepresentationValueErrorType, (newValue) => {
   if (newValue === '2') {
     columns_voltage_representation.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -589,7 +589,7 @@
   if (!pageEditFlag.value) { return }
   voltageRepresentationValueErrorList.value = []
 })
-watch(() => form.value.ammeterDirectType, (newValue) => {
+watch(() => form1.value.ammeterDirectType, (newValue) => {
   if (newValue === '2') {
     columns_ammeter_direct.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -601,7 +601,7 @@
   ammeterDirectList.value = []
 })
 // 监听电流表示值误差(间接测量)
-watch(() => form.value.ammeterIndirectType, (newValue) => {
+watch(() => form1.value.ammeterIndirectType, (newValue) => {
   if (newValue === '2') { // 指针式
     columns_ammeter_indirect.value = columns_ammeter_indirect_pointer.value
   }
@@ -795,18 +795,18 @@
   return result
 }
 fecthDict()
-defineExpose({ list, checkAllList, form, getList })
+defineExpose({ list1, checkAllList, form1, getList })
 </script>
 
 <template>
   <div style="padding: 0 10px;display: flex;justify-content: space-between;">
-    <el-checkbox v-model="form.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+    <el-checkbox v-model="form1.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
       外观及功能性检查
     </el-checkbox>
   </div>
   <!-- 电源电压调整率 -->
   <template-table
-    :show="Boolean(form.voltageRegulation)"
+    :show="Boolean(form1.voltageRegulation)"
     :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation" :page-type="pageType" title="电源电压调整率" index="1" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -816,7 +816,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电源电压调整率
       </el-checkbox>
     </template>
@@ -845,7 +845,7 @@
 
   <!-- 负载调整率 -->
   <template-table
-    :show="Boolean(form.loadRegulation)"
+    :show="Boolean(form1.loadRegulation)"
     :data="loadRegulationList" :columns="columns_load_regulation" :page-type="pageType" title="负载调整率" index="2" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -855,7 +855,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         负载调整率
       </el-checkbox>
     </template>
@@ -888,7 +888,7 @@
 
   <!--  电压表示值误差 -->
   <template-table
-    :show="Boolean(form.voltageRepresentError)"
+    :show="Boolean(form1.voltageRepresentError)"
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -898,18 +898,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电压示值误差
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.voltageRepresentationValueErrorType"
+        v-model="form1.voltageRepresentationValueErrorType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -930,10 +929,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorDirect)"
+    :show="Boolean(form1.currentRepresentErrorDirect)"
     :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"
+    @custom-select="customSelect"
     @disabled="disabled"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(直接测量)')"
     @add-row="addRow"
@@ -941,18 +940,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(直接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form1.ammeterDirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -961,29 +959,28 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorIndirect)"
+    :show="Boolean(form1.currentRepresentErrorIndirect)"
     :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"
-    @customSelect="customSelect"
+    @custom-select="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(间接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterIndirectType"
+        v-model="form1.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -992,7 +989,7 @@
 
   <!-- 纹波电压 -->
   <template-table
-    :show="Boolean(form.rippleVoltage)"
+    :show="Boolean(form1.rippleVoltage)"
     :data="rippleVoltageList" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="6" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1002,7 +999,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         纹波电压
       </el-checkbox>
     </template>
@@ -1028,7 +1025,7 @@
 
   <!--  输出电压短期稳定性 -->
   <template-table
-    :show="Boolean(form.voltageOutputStability)"
+    :show="Boolean(form1.voltageOutputStability)"
     :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability" :page-type="pageType" title="输出电压短期稳定性" index="7" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1038,7 +1035,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         输出电压短期稳定性
       </el-checkbox>
     </template>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 784617a..5e77696 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -141,7 +141,7 @@
     }
   }
   else if (form.value.belongStandardEquipment === '2') { // 第2套：直流稳压电源
-    if (!standardRef.value.getList().length && !Number(standardRef.value.form.appearanceFunctionCheck)) {
+    if (!standardRef.value.getList().length && !Number(standardRef.value.form1.appearanceFunctionCheck)) {
       ElMessage.warning('检定项不能为空')
       return false
     }
@@ -239,14 +239,14 @@
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
       itemId: infoId.value, // 检定项id
-      appearanceFunctionCheck: standardRef.value.form.appearanceFunctionCheck, // 外观及功能检查
-      voltageRegulation: standardRef.value.form.voltageRegulation, // 电源电压调整率
-      loadRegulation: standardRef.value.form.loadRegulation, // 负载调整率
-      voltageRepresentError: standardRef.value.form.voltageRepresentError, // 电压表示值误差
-      currentRepresentErrorDirect: standardRef.value.form.currentRepresentErrorDirect, // 电流表示值误差(直接测量)
-      currentRepresentErrorIndirect: standardRef.value.form.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
-      rippleVoltage: standardRef.value.form.rippleVoltage, // 纹波电压
-      voltageOutputStability: standardRef.value.form.voltageOutputStability, // 输出电压短期稳定性
+      appearanceFunctionCheck: standardRef.value.form1.appearanceFunctionCheck, // 外观及功能检查
+      voltageRegulation: standardRef.value.form1.voltageRegulation, // 电源电压调整率
+      loadRegulation: standardRef.value.form1.loadRegulation, // 负载调整率
+      voltageRepresentError: standardRef.value.form1.voltageRepresentError, // 电压表示值误差
+      currentRepresentErrorDirect: standardRef.value.form1.currentRepresentErrorDirect, // 电流表示值误差(直接测量)
+      currentRepresentErrorIndirect: standardRef.value.form1.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
+      rippleVoltage: standardRef.value.form1.rippleVoltage, // 纹波电压
+      voltageOutputStability: standardRef.value.form1.voltageOutputStability, // 输出电压短期稳定性
       measureItemDataDcPowerList: standardRef.value.getList().length
         ? standardRef.value.getList().map((item: any) => ({
           ...item,

diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 07a7a7a..66401ed 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -1,6 +1,6 @@
 <!-- 显示图片或链接 -->
 <script lang="ts" setup name="showPhoto">
-import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
+// import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
 import { computed, onMounted, onUpdated, ref } from 'vue'
 import { getPhotoUrl } from '../../api/file'
 const props = defineProps({
diff --git a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
index 4242468..b05138c 100644
--- a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
+++ b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
-import { el } from 'element-plus/es/locale'
+// import { el } from 'element-plus/es/locale'
 import { interchangeListTerminate } from '@/api/business/manager/sendReceive'
 import type { deptType } from '@/global'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index c6a1758..4385469 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -35,7 +35,7 @@
   },
 })
 
-const form = ref({
+const form1 = ref({
   voltageRepresentationValueErrorType: '1', // 电压表示值误差类型：1数字式、2指针式
   ammeterDirectType: '1', // 电流表示值误差(直接测量)类型：1数字式、2指针式
   ammeterIndirectType: '1', // 电流表示值误差(间接测量)类型：1数字式、2指针式
@@ -50,12 +50,12 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form.value = newVal
+  form1.value = newVal
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
-const list = ref<IList[]>([])
+const list1 = ref<IList[]>([])
 const lineVoltageRegulationList = ref<IList[]>([]) // 电源电压调整率
 const loadRegulationList = ref<IList[]>([]) // 负载调整率
 const voltageRepresentationValueErrorList = ref<IList[]>([]) // 电压表示值误差
@@ -76,9 +76,9 @@
     '6-纹波电压': rippleVoltageList.value, // 6
     '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7
   }
-  list.value = []
+  list1.value = []
   for (const i in listDict.value) {
-    list.value = [...list.value, ...listDict.value[i]]
+    list1.value = [...list1.value, ...listDict.value[i]]
   }
 }, {
   deep: true,
@@ -92,7 +92,7 @@
 // })
 // 清空所有数据
 function clearAllList() {
-  list.value = []
+  list1.value = []
   lineVoltageRegulationList.value = [] // 电源电压调整率
   loadRegulationList.value = [] // 负载调整率
   voltageRepresentationValueErrorList.value = [] // 电压表示值误差
@@ -238,15 +238,15 @@
 )
 // 表格对应的 选择状态
 let chekedDict = {} as { [key: string]: any }
-watch(() => form.value, () => {
+watch(() => form1.value, () => {
   chekedDict = {
-    '1-电源电压调整率': form.value.voltageRegulation, // 1
-    '2-负载调整率': form.value.loadRegulation, // 2
-    '3-电压示值误差': form.value.voltageRepresentError, // 3
-    '4-电流示值误差(直接测量)': form.value.currentRepresentErrorDirect, // 4
-    '5-电流示值误差(间接测量)': form.value.currentRepresentErrorIndirect, // 5
-    '6-纹波电压': form.value.rippleVoltage, // 6
-    '7-输出电压短期稳定性': form.value.voltageOutputStability,
+    '1-电源电压调整率': form1.value.voltageRegulation, // 1
+    '2-负载调整率': form1.value.loadRegulation, // 2
+    '3-电压示值误差': form1.value.voltageRepresentError, // 3
+    '4-电流示值误差(直接测量)': form1.value.currentRepresentErrorDirect, // 4
+    '5-电流示值误差(间接测量)': form1.value.currentRepresentErrorIndirect, // 5
+    '6-纹波电压': form1.value.rippleVoltage, // 6
+    '7-输出电压短期稳定性': form1.value.voltageOutputStability,
   }
 }, {
   deep: true,
@@ -307,7 +307,7 @@
           editable: true,
 
         }
-        if (form.value.voltageRepresentationValueErrorType === '1') {
+        if (form1.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
@@ -345,7 +345,7 @@
           editable: true,
         }
         // 1数字式、2指针式
-        if (form.value.ammeterDirectType === '1') {
+        if (form1.value.ammeterDirectType === '1') {
           //  数字式
           ammeterDirectList.value.push({
             ...data,
@@ -383,7 +383,7 @@
           maximumError: '', // 最大允许误差
         }
         // 1数字式、2指针式
-        if (form.value.ammeterIndirectType === '1') {
+        if (form1.value.ammeterIndirectType === '1') {
           //  数字式
           ammeterIndirectList.value.push({
             ...data,
@@ -521,15 +521,15 @@
     switch (i) {
       case 3:
         // 电压表示值误差
-        form.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
         break
       case 4:
         // 电流表示值误差(直接测量)
-        form.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
         break
       case 5:
         // 电流表示值误差(间接测量)
-        form.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
         break
     }
     // }
@@ -578,7 +578,7 @@
   }
 })
 // 电压表示值误差、监听电流表示值误差(直接测量)
-watch(() => form.value.voltageRepresentationValueErrorType, (newValue) => {
+watch(() => form1.value.voltageRepresentationValueErrorType, (newValue) => {
   if (newValue === '2') {
     columns_voltage_representation.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -589,7 +589,7 @@
   if (!pageEditFlag.value) { return }
   voltageRepresentationValueErrorList.value = []
 })
-watch(() => form.value.ammeterDirectType, (newValue) => {
+watch(() => form1.value.ammeterDirectType, (newValue) => {
   if (newValue === '2') {
     columns_ammeter_direct.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -601,7 +601,7 @@
   ammeterDirectList.value = []
 })
 // 监听电流表示值误差(间接测量)
-watch(() => form.value.ammeterIndirectType, (newValue) => {
+watch(() => form1.value.ammeterIndirectType, (newValue) => {
   if (newValue === '2') { // 指针式
     columns_ammeter_indirect.value = columns_ammeter_indirect_pointer.value
   }
@@ -795,18 +795,18 @@
   return result
 }
 fecthDict()
-defineExpose({ list, checkAllList, form, getList })
+defineExpose({ list1, checkAllList, form1, getList })
 </script>
 
 <template>
   <div style="padding: 0 10px;display: flex;justify-content: space-between;">
-    <el-checkbox v-model="form.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+    <el-checkbox v-model="form1.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
       外观及功能性检查
     </el-checkbox>
   </div>
   <!-- 电源电压调整率 -->
   <template-table
-    :show="Boolean(form.voltageRegulation)"
+    :show="Boolean(form1.voltageRegulation)"
     :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation" :page-type="pageType" title="电源电压调整率" index="1" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -816,7 +816,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电源电压调整率
       </el-checkbox>
     </template>
@@ -845,7 +845,7 @@
 
   <!-- 负载调整率 -->
   <template-table
-    :show="Boolean(form.loadRegulation)"
+    :show="Boolean(form1.loadRegulation)"
     :data="loadRegulationList" :columns="columns_load_regulation" :page-type="pageType" title="负载调整率" index="2" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -855,7 +855,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         负载调整率
       </el-checkbox>
     </template>
@@ -888,7 +888,7 @@
 
   <!--  电压表示值误差 -->
   <template-table
-    :show="Boolean(form.voltageRepresentError)"
+    :show="Boolean(form1.voltageRepresentError)"
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -898,18 +898,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电压示值误差
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.voltageRepresentationValueErrorType"
+        v-model="form1.voltageRepresentationValueErrorType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -930,10 +929,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorDirect)"
+    :show="Boolean(form1.currentRepresentErrorDirect)"
     :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"
+    @custom-select="customSelect"
     @disabled="disabled"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(直接测量)')"
     @add-row="addRow"
@@ -941,18 +940,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(直接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form1.ammeterDirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -961,29 +959,28 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorIndirect)"
+    :show="Boolean(form1.currentRepresentErrorIndirect)"
     :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"
-    @customSelect="customSelect"
+    @custom-select="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(间接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterIndirectType"
+        v-model="form1.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -992,7 +989,7 @@
 
   <!-- 纹波电压 -->
   <template-table
-    :show="Boolean(form.rippleVoltage)"
+    :show="Boolean(form1.rippleVoltage)"
     :data="rippleVoltageList" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="6" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1002,7 +999,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         纹波电压
       </el-checkbox>
     </template>
@@ -1028,7 +1025,7 @@
 
   <!--  输出电压短期稳定性 -->
   <template-table
-    :show="Boolean(form.voltageOutputStability)"
+    :show="Boolean(form1.voltageOutputStability)"
     :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability" :page-type="pageType" title="输出电压短期稳定性" index="7" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1038,7 +1035,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         输出电压短期稳定性
       </el-checkbox>
     </template>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 784617a..5e77696 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -141,7 +141,7 @@
     }
   }
   else if (form.value.belongStandardEquipment === '2') { // 第2套：直流稳压电源
-    if (!standardRef.value.getList().length && !Number(standardRef.value.form.appearanceFunctionCheck)) {
+    if (!standardRef.value.getList().length && !Number(standardRef.value.form1.appearanceFunctionCheck)) {
       ElMessage.warning('检定项不能为空')
       return false
     }
@@ -239,14 +239,14 @@
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
       itemId: infoId.value, // 检定项id
-      appearanceFunctionCheck: standardRef.value.form.appearanceFunctionCheck, // 外观及功能检查
-      voltageRegulation: standardRef.value.form.voltageRegulation, // 电源电压调整率
-      loadRegulation: standardRef.value.form.loadRegulation, // 负载调整率
-      voltageRepresentError: standardRef.value.form.voltageRepresentError, // 电压表示值误差
-      currentRepresentErrorDirect: standardRef.value.form.currentRepresentErrorDirect, // 电流表示值误差(直接测量)
-      currentRepresentErrorIndirect: standardRef.value.form.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
-      rippleVoltage: standardRef.value.form.rippleVoltage, // 纹波电压
-      voltageOutputStability: standardRef.value.form.voltageOutputStability, // 输出电压短期稳定性
+      appearanceFunctionCheck: standardRef.value.form1.appearanceFunctionCheck, // 外观及功能检查
+      voltageRegulation: standardRef.value.form1.voltageRegulation, // 电源电压调整率
+      loadRegulation: standardRef.value.form1.loadRegulation, // 负载调整率
+      voltageRepresentError: standardRef.value.form1.voltageRepresentError, // 电压表示值误差
+      currentRepresentErrorDirect: standardRef.value.form1.currentRepresentErrorDirect, // 电流表示值误差(直接测量)
+      currentRepresentErrorIndirect: standardRef.value.form1.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
+      rippleVoltage: standardRef.value.form1.rippleVoltage, // 纹波电压
+      voltageOutputStability: standardRef.value.form1.voltageOutputStability, // 输出电压短期稳定性
       measureItemDataDcPowerList: standardRef.value.getList().length
         ? standardRef.value.getList().map((item: any) => ({
           ...item,
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index c89cbb1..c61236d 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -54,11 +54,11 @@
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
 const isFirstPage = ref(true)
-const infoId = ref('') // 列表id
+const infoId1 = ref('') // 列表id
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if ($route.params.id) {
-    infoId.value = $route.params.id as string
+    infoId1.value = $route.params.id as string
   }
 }
 
@@ -213,7 +213,7 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   getInfo({
-    id: infoId.value,
+    id: infoId1.value,
     belongStandardEquipment: itemFormData.value.belongStandardEquipment,
     // 我的任务跳转过来如果已经配置过检定项了，到编辑页面，且用一下三个字段替代传id请求详情
     itemId: $route.query.itemId, // 检定项id
@@ -237,8 +237,8 @@
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
-    infoId.value = res.data.id
-    emits('giveInfoId', infoId.value)
+    infoId1.value = res.data.id
+    emits('giveInfoId', infoId1.value)
     loading.close()
   })
 }
@@ -448,7 +448,7 @@
       if (item.dataType === '3' || item.dataType === '4' || item.dataType === '5') {
         return {
           ...item,
-          maximumError: Number(calcMaxError(item, index, 'item') || 0).toFixed(item.dataType === '3' ? 2 : 3),
+          maximumError: item.dataTypeType === '1' ? Number(item.maximumError || 0).toFixed(item.resolution.includes('.') ? item.resolution.substring(item.resolution.indexOf('.'), item.resolution.length - 1).length : 0 + 1) : Number(item.maximumError || 0).toFixed(3),
         }
       }
       else {
@@ -515,7 +515,7 @@
 
 watch(() => props.infoId, (newValue) => {
   if (newValue) {
-    infoId.value = newValue
+    infoId1.value = newValue
   }
 }, { immediate: true })
 
@@ -545,7 +545,7 @@
   <div class="measure-data-template-detail">
     <template-form-and-table
       ref="templateFormAndTableRef" :page-type="pageType"
-      @changeMeterIdentify="emits('changeMeterIdentify')"
+      @change-meter-identify="emits('changeMeterIdentify')"
     />
     <!-- 标签 -->
     <detail-block :title="pageType !== 'detail' ? '检定数据' : ''" :class="pageType === 'detail' ? 'setBottom' : ''">
@@ -752,7 +752,7 @@
         </template-table>
       </el-form>
       <!-- 历史修改记录 -->
-      <change-record v-if="pageType === 'detail' && current === 'change-record'" :info-id="infoId" />
+      <change-record v-if="pageType === 'detail' && current === 'change-record'" :info-id="infoId1" />
     </detail-block>
   </div>
 </template>

diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 07a7a7a..66401ed 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -1,6 +1,6 @@
 <!-- 显示图片或链接 -->
 <script lang="ts" setup name="showPhoto">
-import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
+// import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
 import { computed, onMounted, onUpdated, ref } from 'vue'
 import { getPhotoUrl } from '../../api/file'
 const props = defineProps({
diff --git a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
index 4242468..b05138c 100644
--- a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
+++ b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
-import { el } from 'element-plus/es/locale'
+// import { el } from 'element-plus/es/locale'
 import { interchangeListTerminate } from '@/api/business/manager/sendReceive'
 import type { deptType } from '@/global'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index c6a1758..4385469 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -35,7 +35,7 @@
   },
 })
 
-const form = ref({
+const form1 = ref({
   voltageRepresentationValueErrorType: '1', // 电压表示值误差类型：1数字式、2指针式
   ammeterDirectType: '1', // 电流表示值误差(直接测量)类型：1数字式、2指针式
   ammeterIndirectType: '1', // 电流表示值误差(间接测量)类型：1数字式、2指针式
@@ -50,12 +50,12 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form.value = newVal
+  form1.value = newVal
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
-const list = ref<IList[]>([])
+const list1 = ref<IList[]>([])
 const lineVoltageRegulationList = ref<IList[]>([]) // 电源电压调整率
 const loadRegulationList = ref<IList[]>([]) // 负载调整率
 const voltageRepresentationValueErrorList = ref<IList[]>([]) // 电压表示值误差
@@ -76,9 +76,9 @@
     '6-纹波电压': rippleVoltageList.value, // 6
     '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7
   }
-  list.value = []
+  list1.value = []
   for (const i in listDict.value) {
-    list.value = [...list.value, ...listDict.value[i]]
+    list1.value = [...list1.value, ...listDict.value[i]]
   }
 }, {
   deep: true,
@@ -92,7 +92,7 @@
 // })
 // 清空所有数据
 function clearAllList() {
-  list.value = []
+  list1.value = []
   lineVoltageRegulationList.value = [] // 电源电压调整率
   loadRegulationList.value = [] // 负载调整率
   voltageRepresentationValueErrorList.value = [] // 电压表示值误差
@@ -238,15 +238,15 @@
 )
 // 表格对应的 选择状态
 let chekedDict = {} as { [key: string]: any }
-watch(() => form.value, () => {
+watch(() => form1.value, () => {
   chekedDict = {
-    '1-电源电压调整率': form.value.voltageRegulation, // 1
-    '2-负载调整率': form.value.loadRegulation, // 2
-    '3-电压示值误差': form.value.voltageRepresentError, // 3
-    '4-电流示值误差(直接测量)': form.value.currentRepresentErrorDirect, // 4
-    '5-电流示值误差(间接测量)': form.value.currentRepresentErrorIndirect, // 5
-    '6-纹波电压': form.value.rippleVoltage, // 6
-    '7-输出电压短期稳定性': form.value.voltageOutputStability,
+    '1-电源电压调整率': form1.value.voltageRegulation, // 1
+    '2-负载调整率': form1.value.loadRegulation, // 2
+    '3-电压示值误差': form1.value.voltageRepresentError, // 3
+    '4-电流示值误差(直接测量)': form1.value.currentRepresentErrorDirect, // 4
+    '5-电流示值误差(间接测量)': form1.value.currentRepresentErrorIndirect, // 5
+    '6-纹波电压': form1.value.rippleVoltage, // 6
+    '7-输出电压短期稳定性': form1.value.voltageOutputStability,
   }
 }, {
   deep: true,
@@ -307,7 +307,7 @@
           editable: true,
 
         }
-        if (form.value.voltageRepresentationValueErrorType === '1') {
+        if (form1.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
@@ -345,7 +345,7 @@
           editable: true,
         }
         // 1数字式、2指针式
-        if (form.value.ammeterDirectType === '1') {
+        if (form1.value.ammeterDirectType === '1') {
           //  数字式
           ammeterDirectList.value.push({
             ...data,
@@ -383,7 +383,7 @@
           maximumError: '', // 最大允许误差
         }
         // 1数字式、2指针式
-        if (form.value.ammeterIndirectType === '1') {
+        if (form1.value.ammeterIndirectType === '1') {
           //  数字式
           ammeterIndirectList.value.push({
             ...data,
@@ -521,15 +521,15 @@
     switch (i) {
       case 3:
         // 电压表示值误差
-        form.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
         break
       case 4:
         // 电流表示值误差(直接测量)
-        form.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
         break
       case 5:
         // 电流表示值误差(间接测量)
-        form.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
         break
     }
     // }
@@ -578,7 +578,7 @@
   }
 })
 // 电压表示值误差、监听电流表示值误差(直接测量)
-watch(() => form.value.voltageRepresentationValueErrorType, (newValue) => {
+watch(() => form1.value.voltageRepresentationValueErrorType, (newValue) => {
   if (newValue === '2') {
     columns_voltage_representation.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -589,7 +589,7 @@
   if (!pageEditFlag.value) { return }
   voltageRepresentationValueErrorList.value = []
 })
-watch(() => form.value.ammeterDirectType, (newValue) => {
+watch(() => form1.value.ammeterDirectType, (newValue) => {
   if (newValue === '2') {
     columns_ammeter_direct.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -601,7 +601,7 @@
   ammeterDirectList.value = []
 })
 // 监听电流表示值误差(间接测量)
-watch(() => form.value.ammeterIndirectType, (newValue) => {
+watch(() => form1.value.ammeterIndirectType, (newValue) => {
   if (newValue === '2') { // 指针式
     columns_ammeter_indirect.value = columns_ammeter_indirect_pointer.value
   }
@@ -795,18 +795,18 @@
   return result
 }
 fecthDict()
-defineExpose({ list, checkAllList, form, getList })
+defineExpose({ list1, checkAllList, form1, getList })
 </script>
 
 <template>
   <div style="padding: 0 10px;display: flex;justify-content: space-between;">
-    <el-checkbox v-model="form.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+    <el-checkbox v-model="form1.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
       外观及功能性检查
     </el-checkbox>
   </div>
   <!-- 电源电压调整率 -->
   <template-table
-    :show="Boolean(form.voltageRegulation)"
+    :show="Boolean(form1.voltageRegulation)"
     :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation" :page-type="pageType" title="电源电压调整率" index="1" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -816,7 +816,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电源电压调整率
       </el-checkbox>
     </template>
@@ -845,7 +845,7 @@
 
   <!-- 负载调整率 -->
   <template-table
-    :show="Boolean(form.loadRegulation)"
+    :show="Boolean(form1.loadRegulation)"
     :data="loadRegulationList" :columns="columns_load_regulation" :page-type="pageType" title="负载调整率" index="2" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -855,7 +855,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         负载调整率
       </el-checkbox>
     </template>
@@ -888,7 +888,7 @@
 
   <!--  电压表示值误差 -->
   <template-table
-    :show="Boolean(form.voltageRepresentError)"
+    :show="Boolean(form1.voltageRepresentError)"
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -898,18 +898,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电压示值误差
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.voltageRepresentationValueErrorType"
+        v-model="form1.voltageRepresentationValueErrorType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -930,10 +929,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorDirect)"
+    :show="Boolean(form1.currentRepresentErrorDirect)"
     :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"
+    @custom-select="customSelect"
     @disabled="disabled"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(直接测量)')"
     @add-row="addRow"
@@ -941,18 +940,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(直接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form1.ammeterDirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -961,29 +959,28 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorIndirect)"
+    :show="Boolean(form1.currentRepresentErrorIndirect)"
     :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"
-    @customSelect="customSelect"
+    @custom-select="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(间接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterIndirectType"
+        v-model="form1.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -992,7 +989,7 @@
 
   <!-- 纹波电压 -->
   <template-table
-    :show="Boolean(form.rippleVoltage)"
+    :show="Boolean(form1.rippleVoltage)"
     :data="rippleVoltageList" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="6" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1002,7 +999,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         纹波电压
       </el-checkbox>
     </template>
@@ -1028,7 +1025,7 @@
 
   <!--  输出电压短期稳定性 -->
   <template-table
-    :show="Boolean(form.voltageOutputStability)"
+    :show="Boolean(form1.voltageOutputStability)"
     :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability" :page-type="pageType" title="输出电压短期稳定性" index="7" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1038,7 +1035,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         输出电压短期稳定性
       </el-checkbox>
     </template>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 784617a..5e77696 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -141,7 +141,7 @@
     }
   }
   else if (form.value.belongStandardEquipment === '2') { // 第2套：直流稳压电源
-    if (!standardRef.value.getList().length && !Number(standardRef.value.form.appearanceFunctionCheck)) {
+    if (!standardRef.value.getList().length && !Number(standardRef.value.form1.appearanceFunctionCheck)) {
       ElMessage.warning('检定项不能为空')
       return false
     }
@@ -239,14 +239,14 @@
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
       itemId: infoId.value, // 检定项id
-      appearanceFunctionCheck: standardRef.value.form.appearanceFunctionCheck, // 外观及功能检查
-      voltageRegulation: standardRef.value.form.voltageRegulation, // 电源电压调整率
-      loadRegulation: standardRef.value.form.loadRegulation, // 负载调整率
-      voltageRepresentError: standardRef.value.form.voltageRepresentError, // 电压表示值误差
-      currentRepresentErrorDirect: standardRef.value.form.currentRepresentErrorDirect, // 电流表示值误差(直接测量)
-      currentRepresentErrorIndirect: standardRef.value.form.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
-      rippleVoltage: standardRef.value.form.rippleVoltage, // 纹波电压
-      voltageOutputStability: standardRef.value.form.voltageOutputStability, // 输出电压短期稳定性
+      appearanceFunctionCheck: standardRef.value.form1.appearanceFunctionCheck, // 外观及功能检查
+      voltageRegulation: standardRef.value.form1.voltageRegulation, // 电源电压调整率
+      loadRegulation: standardRef.value.form1.loadRegulation, // 负载调整率
+      voltageRepresentError: standardRef.value.form1.voltageRepresentError, // 电压表示值误差
+      currentRepresentErrorDirect: standardRef.value.form1.currentRepresentErrorDirect, // 电流表示值误差(直接测量)
+      currentRepresentErrorIndirect: standardRef.value.form1.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
+      rippleVoltage: standardRef.value.form1.rippleVoltage, // 纹波电压
+      voltageOutputStability: standardRef.value.form1.voltageOutputStability, // 输出电压短期稳定性
       measureItemDataDcPowerList: standardRef.value.getList().length
         ? standardRef.value.getList().map((item: any) => ({
           ...item,
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index c89cbb1..c61236d 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -54,11 +54,11 @@
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
 const isFirstPage = ref(true)
-const infoId = ref('') // 列表id
+const infoId1 = ref('') // 列表id
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if ($route.params.id) {
-    infoId.value = $route.params.id as string
+    infoId1.value = $route.params.id as string
   }
 }
 
@@ -213,7 +213,7 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   getInfo({
-    id: infoId.value,
+    id: infoId1.value,
     belongStandardEquipment: itemFormData.value.belongStandardEquipment,
     // 我的任务跳转过来如果已经配置过检定项了，到编辑页面，且用一下三个字段替代传id请求详情
     itemId: $route.query.itemId, // 检定项id
@@ -237,8 +237,8 @@
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
-    infoId.value = res.data.id
-    emits('giveInfoId', infoId.value)
+    infoId1.value = res.data.id
+    emits('giveInfoId', infoId1.value)
     loading.close()
   })
 }
@@ -448,7 +448,7 @@
       if (item.dataType === '3' || item.dataType === '4' || item.dataType === '5') {
         return {
           ...item,
-          maximumError: Number(calcMaxError(item, index, 'item') || 0).toFixed(item.dataType === '3' ? 2 : 3),
+          maximumError: item.dataTypeType === '1' ? Number(item.maximumError || 0).toFixed(item.resolution.includes('.') ? item.resolution.substring(item.resolution.indexOf('.'), item.resolution.length - 1).length : 0 + 1) : Number(item.maximumError || 0).toFixed(3),
         }
       }
       else {
@@ -515,7 +515,7 @@
 
 watch(() => props.infoId, (newValue) => {
   if (newValue) {
-    infoId.value = newValue
+    infoId1.value = newValue
   }
 }, { immediate: true })
 
@@ -545,7 +545,7 @@
   <div class="measure-data-template-detail">
     <template-form-and-table
       ref="templateFormAndTableRef" :page-type="pageType"
-      @changeMeterIdentify="emits('changeMeterIdentify')"
+      @change-meter-identify="emits('changeMeterIdentify')"
     />
     <!-- 标签 -->
     <detail-block :title="pageType !== 'detail' ? '检定数据' : ''" :class="pageType === 'detail' ? 'setBottom' : ''">
@@ -752,7 +752,7 @@
         </template-table>
       </el-form>
       <!-- 历史修改记录 -->
-      <change-record v-if="pageType === 'detail' && current === 'change-record'" :info-id="infoId" />
+      <change-record v-if="pageType === 'detail' && current === 'change-record'" :info-id="infoId1" />
     </detail-block>
   </div>
 </template>
diff --git a/src/views/equipement/standard/checkRecord/list.vue b/src/views/equipement/standard/checkRecord/list.vue
index dc1335e..8b26e11 100644
--- a/src/views/equipement/standard/checkRecord/list.vue
+++ b/src/views/equipement/standard/checkRecord/list.vue
@@ -4,7 +4,7 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { string32 } from 'pdfjs-dist/types/src/shared/util'
+// import { string32 } from 'pdfjs-dist/types/src/shared/util'
 import type { IList, IListQuery } from './checkRecord-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
@@ -408,7 +408,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">

diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 07a7a7a..66401ed 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -1,6 +1,6 @@
 <!-- 显示图片或链接 -->
 <script lang="ts" setup name="showPhoto">
-import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
+// import { zIndex } from 'html2canvas/dist/types/css/property-descriptors/z-index'
 import { computed, onMounted, onUpdated, ref } from 'vue'
 import { getPhotoUrl } from '../../api/file'
 const props = defineProps({
diff --git a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
index 4242468..b05138c 100644
--- a/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
+++ b/src/views/business/manager/sendReceive/dialog/batchCreateEIRDialog.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
-import { el } from 'element-plus/es/locale'
+// import { el } from 'element-plus/es/locale'
 import { interchangeListTerminate } from '@/api/business/manager/sendReceive'
 import type { deptType } from '@/global'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index c6a1758..4385469 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -35,7 +35,7 @@
   },
 })
 
-const form = ref({
+const form1 = ref({
   voltageRepresentationValueErrorType: '1', // 电压表示值误差类型：1数字式、2指针式
   ammeterDirectType: '1', // 电流表示值误差(直接测量)类型：1数字式、2指针式
   ammeterIndirectType: '1', // 电流表示值误差(间接测量)类型：1数字式、2指针式
@@ -50,12 +50,12 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form.value = newVal
+  form1.value = newVal
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
-const list = ref<IList[]>([])
+const list1 = ref<IList[]>([])
 const lineVoltageRegulationList = ref<IList[]>([]) // 电源电压调整率
 const loadRegulationList = ref<IList[]>([]) // 负载调整率
 const voltageRepresentationValueErrorList = ref<IList[]>([]) // 电压表示值误差
@@ -76,9 +76,9 @@
     '6-纹波电压': rippleVoltageList.value, // 6
     '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7
   }
-  list.value = []
+  list1.value = []
   for (const i in listDict.value) {
-    list.value = [...list.value, ...listDict.value[i]]
+    list1.value = [...list1.value, ...listDict.value[i]]
   }
 }, {
   deep: true,
@@ -92,7 +92,7 @@
 // })
 // 清空所有数据
 function clearAllList() {
-  list.value = []
+  list1.value = []
   lineVoltageRegulationList.value = [] // 电源电压调整率
   loadRegulationList.value = [] // 负载调整率
   voltageRepresentationValueErrorList.value = [] // 电压表示值误差
@@ -238,15 +238,15 @@
 )
 // 表格对应的 选择状态
 let chekedDict = {} as { [key: string]: any }
-watch(() => form.value, () => {
+watch(() => form1.value, () => {
   chekedDict = {
-    '1-电源电压调整率': form.value.voltageRegulation, // 1
-    '2-负载调整率': form.value.loadRegulation, // 2
-    '3-电压示值误差': form.value.voltageRepresentError, // 3
-    '4-电流示值误差(直接测量)': form.value.currentRepresentErrorDirect, // 4
-    '5-电流示值误差(间接测量)': form.value.currentRepresentErrorIndirect, // 5
-    '6-纹波电压': form.value.rippleVoltage, // 6
-    '7-输出电压短期稳定性': form.value.voltageOutputStability,
+    '1-电源电压调整率': form1.value.voltageRegulation, // 1
+    '2-负载调整率': form1.value.loadRegulation, // 2
+    '3-电压示值误差': form1.value.voltageRepresentError, // 3
+    '4-电流示值误差(直接测量)': form1.value.currentRepresentErrorDirect, // 4
+    '5-电流示值误差(间接测量)': form1.value.currentRepresentErrorIndirect, // 5
+    '6-纹波电压': form1.value.rippleVoltage, // 6
+    '7-输出电压短期稳定性': form1.value.voltageOutputStability,
   }
 }, {
   deep: true,
@@ -307,7 +307,7 @@
           editable: true,
 
         }
-        if (form.value.voltageRepresentationValueErrorType === '1') {
+        if (form1.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
@@ -345,7 +345,7 @@
           editable: true,
         }
         // 1数字式、2指针式
-        if (form.value.ammeterDirectType === '1') {
+        if (form1.value.ammeterDirectType === '1') {
           //  数字式
           ammeterDirectList.value.push({
             ...data,
@@ -383,7 +383,7 @@
           maximumError: '', // 最大允许误差
         }
         // 1数字式、2指针式
-        if (form.value.ammeterIndirectType === '1') {
+        if (form1.value.ammeterIndirectType === '1') {
           //  数字式
           ammeterIndirectList.value.push({
             ...data,
@@ -521,15 +521,15 @@
     switch (i) {
       case 3:
         // 电压表示值误差
-        form.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.voltageRepresentationValueErrorType = dataLength ? data[0].dataTypeType : '1'
         break
       case 4:
         // 电流表示值误差(直接测量)
-        form.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterDirectType = dataLength ? data[0].dataTypeType : '1'
         break
       case 5:
         // 电流表示值误差(间接测量)
-        form.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
+        form1.value.ammeterIndirectType = dataLength ? data[0].dataTypeType : '1'
         break
     }
     // }
@@ -578,7 +578,7 @@
   }
 })
 // 电压表示值误差、监听电流表示值误差(直接测量)
-watch(() => form.value.voltageRepresentationValueErrorType, (newValue) => {
+watch(() => form1.value.voltageRepresentationValueErrorType, (newValue) => {
   if (newValue === '2') {
     columns_voltage_representation.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -589,7 +589,7 @@
   if (!pageEditFlag.value) { return }
   voltageRepresentationValueErrorList.value = []
 })
-watch(() => form.value.ammeterDirectType, (newValue) => {
+watch(() => form1.value.ammeterDirectType, (newValue) => {
   if (newValue === '2') {
     columns_ammeter_direct.value = columns_voltage_representation_value_error_pointer.value
   }
@@ -601,7 +601,7 @@
   ammeterDirectList.value = []
 })
 // 监听电流表示值误差(间接测量)
-watch(() => form.value.ammeterIndirectType, (newValue) => {
+watch(() => form1.value.ammeterIndirectType, (newValue) => {
   if (newValue === '2') { // 指针式
     columns_ammeter_indirect.value = columns_ammeter_indirect_pointer.value
   }
@@ -795,18 +795,18 @@
   return result
 }
 fecthDict()
-defineExpose({ list, checkAllList, form, getList })
+defineExpose({ list1, checkAllList, form1, getList })
 </script>
 
 <template>
   <div style="padding: 0 10px;display: flex;justify-content: space-between;">
-    <el-checkbox v-model="form.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+    <el-checkbox v-model="form1.appearanceFunctionCheck" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
       外观及功能性检查
     </el-checkbox>
   </div>
   <!-- 电源电压调整率 -->
   <template-table
-    :show="Boolean(form.voltageRegulation)"
+    :show="Boolean(form1.voltageRegulation)"
     :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation" :page-type="pageType" title="电源电压调整率" index="1" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -816,7 +816,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电源电压调整率
       </el-checkbox>
     </template>
@@ -845,7 +845,7 @@
 
   <!-- 负载调整率 -->
   <template-table
-    :show="Boolean(form.loadRegulation)"
+    :show="Boolean(form1.loadRegulation)"
     :data="loadRegulationList" :columns="columns_load_regulation" :page-type="pageType" title="负载调整率" index="2" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -855,7 +855,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.loadRegulation" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         负载调整率
       </el-checkbox>
     </template>
@@ -888,7 +888,7 @@
 
   <!--  电压表示值误差 -->
   <template-table
-    :show="Boolean(form.voltageRepresentError)"
+    :show="Boolean(form1.voltageRepresentError)"
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -898,18 +898,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageRepresentError" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电压示值误差
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.voltageRepresentationValueErrorType"
+        v-model="form1.voltageRepresentationValueErrorType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -930,10 +929,10 @@
 
   <!--  电流表示值误差(直接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorDirect)"
+    :show="Boolean(form1.currentRepresentErrorDirect)"
     :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"
+    @custom-select="customSelect"
     @disabled="disabled"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(直接测量)')"
     @add-row="addRow"
@@ -941,18 +940,17 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorDirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(直接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form1.ammeterDirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -961,29 +959,28 @@
 
   <!--  电流表示值误差(间接测量) -->
   <template-table
-    :show="Boolean(form.currentRepresentErrorIndirect)"
+    :show="Boolean(form1.currentRepresentErrorIndirect)"
     :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"
-    @customSelect="customSelect"
+    @custom-select="customSelect"
     @selection-change="(e) => handleSelectionChange(e, '电流示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.currentRepresentErrorIndirect" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         电流示值误差(间接测量)
       </el-checkbox>
     </template>
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterIndirectType"
+        v-model="form1.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
-        class="full-width-input"
-        style="margin-right: 10px;"
+        style="margin-right: 10px;width: 120px !important;"
       >
         <el-option v-for="item of typeList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -992,7 +989,7 @@
 
   <!-- 纹波电压 -->
   <template-table
-    :show="Boolean(form.rippleVoltage)"
+    :show="Boolean(form1.rippleVoltage)"
     :data="rippleVoltageList" :columns="columns_ripple_voltage" :page-type="pageType" title="纹波电压" index="6" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1002,7 +999,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.rippleVoltage" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         纹波电压
       </el-checkbox>
     </template>
@@ -1028,7 +1025,7 @@
 
   <!--  输出电压短期稳定性 -->
   <template-table
-    :show="Boolean(form.voltageOutputStability)"
+    :show="Boolean(form1.voltageOutputStability)"
     :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability" :page-type="pageType" title="输出电压短期稳定性" index="7" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
@@ -1038,7 +1035,7 @@
     @change-load-situationa="changeLoadSituationa"
   >
     <template #custom-check>
-      <el-checkbox v-model="form.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
+      <el-checkbox v-model="form1.voltageOutputStability" :checked="true" :true-label="1" :false-label="0" :disabled="pageType === 'detail'">
         输出电压短期稳定性
       </el-checkbox>
     </template>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 784617a..5e77696 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -141,7 +141,7 @@
     }
   }
   else if (form.value.belongStandardEquipment === '2') { // 第2套：直流稳压电源
-    if (!standardRef.value.getList().length && !Number(standardRef.value.form.appearanceFunctionCheck)) {
+    if (!standardRef.value.getList().length && !Number(standardRef.value.form1.appearanceFunctionCheck)) {
       ElMessage.warning('检定项不能为空')
       return false
     }
@@ -239,14 +239,14 @@
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
       itemId: infoId.value, // 检定项id
-      appearanceFunctionCheck: standardRef.value.form.appearanceFunctionCheck, // 外观及功能检查
-      voltageRegulation: standardRef.value.form.voltageRegulation, // 电源电压调整率
-      loadRegulation: standardRef.value.form.loadRegulation, // 负载调整率
-      voltageRepresentError: standardRef.value.form.voltageRepresentError, // 电压表示值误差
-      currentRepresentErrorDirect: standardRef.value.form.currentRepresentErrorDirect, // 电流表示值误差(直接测量)
-      currentRepresentErrorIndirect: standardRef.value.form.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
-      rippleVoltage: standardRef.value.form.rippleVoltage, // 纹波电压
-      voltageOutputStability: standardRef.value.form.voltageOutputStability, // 输出电压短期稳定性
+      appearanceFunctionCheck: standardRef.value.form1.appearanceFunctionCheck, // 外观及功能检查
+      voltageRegulation: standardRef.value.form1.voltageRegulation, // 电源电压调整率
+      loadRegulation: standardRef.value.form1.loadRegulation, // 负载调整率
+      voltageRepresentError: standardRef.value.form1.voltageRepresentError, // 电压表示值误差
+      currentRepresentErrorDirect: standardRef.value.form1.currentRepresentErrorDirect, // 电流表示值误差(直接测量)
+      currentRepresentErrorIndirect: standardRef.value.form1.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
+      rippleVoltage: standardRef.value.form1.rippleVoltage, // 纹波电压
+      voltageOutputStability: standardRef.value.form1.voltageOutputStability, // 输出电压短期稳定性
       measureItemDataDcPowerList: standardRef.value.getList().length
         ? standardRef.value.getList().map((item: any) => ({
           ...item,
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index c89cbb1..c61236d 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -54,11 +54,11 @@
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
 const isFirstPage = ref(true)
-const infoId = ref('') // 列表id
+const infoId1 = ref('') // 列表id
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if ($route.params.id) {
-    infoId.value = $route.params.id as string
+    infoId1.value = $route.params.id as string
   }
 }
 
@@ -213,7 +213,7 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   getInfo({
-    id: infoId.value,
+    id: infoId1.value,
     belongStandardEquipment: itemFormData.value.belongStandardEquipment,
     // 我的任务跳转过来如果已经配置过检定项了，到编辑页面，且用一下三个字段替代传id请求详情
     itemId: $route.query.itemId, // 检定项id
@@ -237,8 +237,8 @@
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
-    infoId.value = res.data.id
-    emits('giveInfoId', infoId.value)
+    infoId1.value = res.data.id
+    emits('giveInfoId', infoId1.value)
     loading.close()
   })
 }
@@ -448,7 +448,7 @@
       if (item.dataType === '3' || item.dataType === '4' || item.dataType === '5') {
         return {
           ...item,
-          maximumError: Number(calcMaxError(item, index, 'item') || 0).toFixed(item.dataType === '3' ? 2 : 3),
+          maximumError: item.dataTypeType === '1' ? Number(item.maximumError || 0).toFixed(item.resolution.includes('.') ? item.resolution.substring(item.resolution.indexOf('.'), item.resolution.length - 1).length : 0 + 1) : Number(item.maximumError || 0).toFixed(3),
         }
       }
       else {
@@ -515,7 +515,7 @@
 
 watch(() => props.infoId, (newValue) => {
   if (newValue) {
-    infoId.value = newValue
+    infoId1.value = newValue
   }
 }, { immediate: true })
 
@@ -545,7 +545,7 @@
   <div class="measure-data-template-detail">
     <template-form-and-table
       ref="templateFormAndTableRef" :page-type="pageType"
-      @changeMeterIdentify="emits('changeMeterIdentify')"
+      @change-meter-identify="emits('changeMeterIdentify')"
     />
     <!-- 标签 -->
     <detail-block :title="pageType !== 'detail' ? '检定数据' : ''" :class="pageType === 'detail' ? 'setBottom' : ''">
@@ -752,7 +752,7 @@
         </template-table>
       </el-form>
       <!-- 历史修改记录 -->
-      <change-record v-if="pageType === 'detail' && current === 'change-record'" :info-id="infoId" />
+      <change-record v-if="pageType === 'detail' && current === 'change-record'" :info-id="infoId1" />
     </detail-block>
   </div>
 </template>
diff --git a/src/views/equipement/standard/checkRecord/list.vue b/src/views/equipement/standard/checkRecord/list.vue
index dc1335e..8b26e11 100644
--- a/src/views/equipement/standard/checkRecord/list.vue
+++ b/src/views/equipement/standard/checkRecord/list.vue
@@ -4,7 +4,7 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { string32 } from 'pdfjs-dist/types/src/shared/util'
+// import { string32 } from 'pdfjs-dist/types/src/shared/util'
 import type { IList, IListQuery } from './checkRecord-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
@@ -408,7 +408,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-        @handleClickFollowLink="handleClickFollowLink"
+        @handle-click-follow-link="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index e55ec2d..c048057 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -1,7 +1,7 @@
 <!-- 核查管理 -->
 <script lang="ts" setup name="CheckManage">
 import { ElMessage } from 'element-plus'
-import { position } from 'html2canvas/dist/types/css/property-descriptors/position'
+// import { position } from 'html2canvas/dist/types/css/property-descriptors/position'
 import { getDictByCode } from '@/api/system/dict'
 import type { deptType, dictType } from '@/global'
 import { getCheckData } from '@/api/workBench/checkData'