diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index 48e0223..4b7034a 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -182,7 +182,7 @@
     </el-checkbox>
   </div>
   <div style="padding: 0 10px;">
-    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true">
+    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true" :disabled="pageType === 'detail'">
       整定压力
     </el-checkbox>
   </div>

diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index 48e0223..4b7034a 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -182,7 +182,7 @@
     </el-checkbox>
   </div>
   <div style="padding: 0 10px;">
-    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true">
+    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true" :disabled="pageType === 'detail'">
       整定压力
     </el-checkbox>
   </div>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 98d9991..68e453a 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -329,6 +329,7 @@
         : [{}], // 整定压力
       appearanceFunctionCheck: getObject.value.appearanceFunctionCheck, // 外观及功能检查
       sealingTest: getObject.value.sealingTest, // 密封试验
+      rippleVoltage: getObject.value.rippleVoltage, // 整定压力
     }
   }
   else if (form.value.belongStandardEquipment === '8') { // 第8套：E2等砝码

diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index 48e0223..4b7034a 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -182,7 +182,7 @@
     </el-checkbox>
   </div>
   <div style="padding: 0 10px;">
-    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true">
+    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true" :disabled="pageType === 'detail'">
       整定压力
     </el-checkbox>
   </div>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 98d9991..68e453a 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -329,6 +329,7 @@
         : [{}], // 整定压力
       appearanceFunctionCheck: getObject.value.appearanceFunctionCheck, // 外观及功能检查
       sealingTest: getObject.value.sealingTest, // 密封试验
+      rippleVoltage: getObject.value.rippleVoltage, // 整定压力
     }
   }
   else if (form.value.belongStandardEquipment === '8') { // 第8套：E2等砝码
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index 41321f0..e72d3dc 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -77,6 +77,7 @@
 const rippleVoltageList = ref<IDetailMeasureList[]>([]) // 纹波电压
 const outputVoltageStabilityList = ref<IDetailMeasureList[]>([]) // 输出电压短期稳定性
 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({})
+const measureItemData = ref<any[]>([])
 const setListDict = () => {
   listDict.value = {
     '1-电源电压调整率': lineVoltageRegulationList.value, // 1
@@ -217,7 +218,16 @@
     itemId: $route.query.itemId, // 检定项id
     orderId: $route.query.orderId, // 任务单id
     sampleId: $route.query.sampleId, // 被检设备id
-  }).then((res) => {
+  }).then(async (res) => {
+    // 获取检定项数据
+    const params = {
+      id: $route.query.itemId,
+      itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名字
+      belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置字典code
+    }
+    const response = await getItemInfo(params)
+    measureItemData.value = JSON.parse(JSON.stringify(response.data.measureItemDataDcPowerList))
+
     console.log(res.data, '编辑 详情')
     // 有关于检定项的数据
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
@@ -231,21 +241,29 @@
   })
 }
 // 最大允许误差 计算
-const calcMaxError = (item: any) => {
+const calcMaxError = (item: any, index: number, type: string) => {
+  let initData = {} as any
+  if (type === 'all') {
+    initData = measureItemData.value[index]
+  }
+  else {
+    initData = measureItemData.value.filter((citem: any) => citem.dataType === item.dataType)[index]
+  }
+  console.log(initData, '对应的鉴定数据')
   // 1数字式、2指针式
   if (item.dataTypeType === '1') {
-    if (item.maximumError === '2') {
-      return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)) || 0
+    if (initData.maximumError === '2') {
+      return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB) * Number(initData.resolution)) || 0
     }
-    else if (item.maximumError === '2') {
-      return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)) || 0
+    else if (initData.maximumError === '3') {
+      return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB)) || 0
     }
-    else if (item.maximumError === '1') {
-      return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0
+    else if (initData.maximumError === '1') {
+      return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0
     }
   }
   else if (item.dataTypeType === '2') {
-    return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0
+    return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0
   }
 }
 // 初始化数据
@@ -264,7 +282,7 @@
 // 初始化输入数据
 function initInputData(data: any[]) {
   initAllData()
-  data.forEach((item) => {
+  data.forEach((item, index) => {
     switch (item.dataType) {
       case '1':
         // 电源电压调整率
@@ -276,15 +294,15 @@
         break
       case '3':
         // 电压示值误差
-        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 2) : transformDecimal(Number(item.maximumError) || 0, 2) })
+        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(2) })
         break
       case '4':
         // 电流示值误差(直接测量)
-        ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+        ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(3) })
         break
       case '5':
         // 电流示值误差(间接测量)
-        ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+        ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: Number(calcMaxError(item, index, 'all')).toFixed(3) })
         break
       case '6':
         // 纹波电压
@@ -326,6 +344,7 @@
     itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量)
     itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压
     itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性
+    measureItemData.value = JSON.parse(JSON.stringify(res.data.measureItemDataDcPowerList))
     initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' })))
   })
 }
@@ -362,7 +381,17 @@
   const params = {
     belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
     itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-    measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })),
+    measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })).map((item: any, index: number) => {
+      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),
+        }
+      }
+      else {
+        return item
+      }
+    }),
   }
   const res = await calculateHandle(params)
   result = res.data

diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index 48e0223..4b7034a 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -182,7 +182,7 @@
     </el-checkbox>
   </div>
   <div style="padding: 0 10px;">
-    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true">
+    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true" :disabled="pageType === 'detail'">
       整定压力
     </el-checkbox>
   </div>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 98d9991..68e453a 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -329,6 +329,7 @@
         : [{}], // 整定压力
       appearanceFunctionCheck: getObject.value.appearanceFunctionCheck, // 外观及功能检查
       sealingTest: getObject.value.sealingTest, // 密封试验
+      rippleVoltage: getObject.value.rippleVoltage, // 整定压力
     }
   }
   else if (form.value.belongStandardEquipment === '8') { // 第8套：E2等砝码
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index 41321f0..e72d3dc 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -77,6 +77,7 @@
 const rippleVoltageList = ref<IDetailMeasureList[]>([]) // 纹波电压
 const outputVoltageStabilityList = ref<IDetailMeasureList[]>([]) // 输出电压短期稳定性
 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({})
+const measureItemData = ref<any[]>([])
 const setListDict = () => {
   listDict.value = {
     '1-电源电压调整率': lineVoltageRegulationList.value, // 1
@@ -217,7 +218,16 @@
     itemId: $route.query.itemId, // 检定项id
     orderId: $route.query.orderId, // 任务单id
     sampleId: $route.query.sampleId, // 被检设备id
-  }).then((res) => {
+  }).then(async (res) => {
+    // 获取检定项数据
+    const params = {
+      id: $route.query.itemId,
+      itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名字
+      belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置字典code
+    }
+    const response = await getItemInfo(params)
+    measureItemData.value = JSON.parse(JSON.stringify(response.data.measureItemDataDcPowerList))
+
     console.log(res.data, '编辑 详情')
     // 有关于检定项的数据
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
@@ -231,21 +241,29 @@
   })
 }
 // 最大允许误差 计算
-const calcMaxError = (item: any) => {
+const calcMaxError = (item: any, index: number, type: string) => {
+  let initData = {} as any
+  if (type === 'all') {
+    initData = measureItemData.value[index]
+  }
+  else {
+    initData = measureItemData.value.filter((citem: any) => citem.dataType === item.dataType)[index]
+  }
+  console.log(initData, '对应的鉴定数据')
   // 1数字式、2指针式
   if (item.dataTypeType === '1') {
-    if (item.maximumError === '2') {
-      return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)) || 0
+    if (initData.maximumError === '2') {
+      return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB) * Number(initData.resolution)) || 0
     }
-    else if (item.maximumError === '2') {
-      return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)) || 0
+    else if (initData.maximumError === '3') {
+      return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB)) || 0
     }
-    else if (item.maximumError === '1') {
-      return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0
+    else if (initData.maximumError === '1') {
+      return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0
     }
   }
   else if (item.dataTypeType === '2') {
-    return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0
+    return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0
   }
 }
 // 初始化数据
@@ -264,7 +282,7 @@
 // 初始化输入数据
 function initInputData(data: any[]) {
   initAllData()
-  data.forEach((item) => {
+  data.forEach((item, index) => {
     switch (item.dataType) {
       case '1':
         // 电源电压调整率
@@ -276,15 +294,15 @@
         break
       case '3':
         // 电压示值误差
-        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 2) : transformDecimal(Number(item.maximumError) || 0, 2) })
+        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(2) })
         break
       case '4':
         // 电流示值误差(直接测量)
-        ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+        ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(3) })
         break
       case '5':
         // 电流示值误差(间接测量)
-        ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+        ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: Number(calcMaxError(item, index, 'all')).toFixed(3) })
         break
       case '6':
         // 纹波电压
@@ -326,6 +344,7 @@
     itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量)
     itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压
     itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性
+    measureItemData.value = JSON.parse(JSON.stringify(res.data.measureItemDataDcPowerList))
     initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' })))
   })
 }
@@ -362,7 +381,17 @@
   const params = {
     belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
     itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-    measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })),
+    measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })).map((item: any, index: number) => {
+      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),
+        }
+      }
+      else {
+        return item
+      }
+    }),
   }
   const res = await calculateHandle(params)
   result = res.data
diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
index d2675ad..fa9d201 100644
--- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
@@ -83,7 +83,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustFirst', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustFirst', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustFirst', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -93,7 +93,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustSecond', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustSecond', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustSecond', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -103,7 +103,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustThird', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustThird', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustThird', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -137,7 +137,10 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
+    itemFormData.value.appearance = `${res.data.appearance}`
+    itemFormData.value.tightness = `${res.data.tightness}`
+    itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck) // 外观及功能检查
+    itemFormData.value.sealingTest = Number(res.data.sealingTest) // 密封
     res.data.measureDataSafetyValueList.forEach((item: any) => {
       list.value.push({
         beforeAdjustAverage: item.beforeAdjustAverage,
@@ -216,8 +219,9 @@
   getItemInfo(params).then((res) => {
     console.log(res.data, 'data')
     // itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
-    itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
-    itemFormData.value.sealingTest = res.data.sealingTest // 密封
+    itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck) // 外观及功能检查
+    itemFormData.value.sealingTest = Number(res.data.sealingTest) // 密封
+    console.log(itemFormData.value, 'itemFormData.value')
     // console.log(itemFormData.value, 'itemFormData.value')
     initInputData(res.data.measureItemDataSafetyValveList)
   })
@@ -371,7 +375,7 @@
       >
         <el-row>
           <!-- 外观  -->
-          <el-col v-if="itemFormData.appearanceFunctionCheck" :span="6">
+          <el-col v-if="itemFormData.appearanceFunctionCheck === 1" :span="6">
             <el-form-item label="外观检查:" prop="appearance">
               <el-select v-model="itemFormData.appearance" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option
@@ -384,7 +388,7 @@
             </el-form-item>
           </el-col>
           <!-- 密封试验 -->
-          <el-col v-if="itemFormData.sealingTest" :span="6">
+          <el-col v-if="itemFormData.sealingTest === 1" :span="6">
             <el-form-item label="密封试验:" prop="tightness">
               <el-select v-model="itemFormData.tightness" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option

diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index 48e0223..4b7034a 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -182,7 +182,7 @@
     </el-checkbox>
   </div>
   <div style="padding: 0 10px;">
-    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true">
+    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true" :disabled="pageType === 'detail'">
       整定压力
     </el-checkbox>
   </div>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 98d9991..68e453a 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -329,6 +329,7 @@
         : [{}], // 整定压力
       appearanceFunctionCheck: getObject.value.appearanceFunctionCheck, // 外观及功能检查
       sealingTest: getObject.value.sealingTest, // 密封试验
+      rippleVoltage: getObject.value.rippleVoltage, // 整定压力
     }
   }
   else if (form.value.belongStandardEquipment === '8') { // 第8套：E2等砝码
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index 41321f0..e72d3dc 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -77,6 +77,7 @@
 const rippleVoltageList = ref<IDetailMeasureList[]>([]) // 纹波电压
 const outputVoltageStabilityList = ref<IDetailMeasureList[]>([]) // 输出电压短期稳定性
 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({})
+const measureItemData = ref<any[]>([])
 const setListDict = () => {
   listDict.value = {
     '1-电源电压调整率': lineVoltageRegulationList.value, // 1
@@ -217,7 +218,16 @@
     itemId: $route.query.itemId, // 检定项id
     orderId: $route.query.orderId, // 任务单id
     sampleId: $route.query.sampleId, // 被检设备id
-  }).then((res) => {
+  }).then(async (res) => {
+    // 获取检定项数据
+    const params = {
+      id: $route.query.itemId,
+      itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名字
+      belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置字典code
+    }
+    const response = await getItemInfo(params)
+    measureItemData.value = JSON.parse(JSON.stringify(response.data.measureItemDataDcPowerList))
+
     console.log(res.data, '编辑 详情')
     // 有关于检定项的数据
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
@@ -231,21 +241,29 @@
   })
 }
 // 最大允许误差 计算
-const calcMaxError = (item: any) => {
+const calcMaxError = (item: any, index: number, type: string) => {
+  let initData = {} as any
+  if (type === 'all') {
+    initData = measureItemData.value[index]
+  }
+  else {
+    initData = measureItemData.value.filter((citem: any) => citem.dataType === item.dataType)[index]
+  }
+  console.log(initData, '对应的鉴定数据')
   // 1数字式、2指针式
   if (item.dataTypeType === '1') {
-    if (item.maximumError === '2') {
-      return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)) || 0
+    if (initData.maximumError === '2') {
+      return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB) * Number(initData.resolution)) || 0
     }
-    else if (item.maximumError === '2') {
-      return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)) || 0
+    else if (initData.maximumError === '3') {
+      return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB)) || 0
     }
-    else if (item.maximumError === '1') {
-      return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0
+    else if (initData.maximumError === '1') {
+      return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0
     }
   }
   else if (item.dataTypeType === '2') {
-    return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0
+    return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0
   }
 }
 // 初始化数据
@@ -264,7 +282,7 @@
 // 初始化输入数据
 function initInputData(data: any[]) {
   initAllData()
-  data.forEach((item) => {
+  data.forEach((item, index) => {
     switch (item.dataType) {
       case '1':
         // 电源电压调整率
@@ -276,15 +294,15 @@
         break
       case '3':
         // 电压示值误差
-        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 2) : transformDecimal(Number(item.maximumError) || 0, 2) })
+        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(2) })
         break
       case '4':
         // 电流示值误差(直接测量)
-        ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+        ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(3) })
         break
       case '5':
         // 电流示值误差(间接测量)
-        ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+        ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: Number(calcMaxError(item, index, 'all')).toFixed(3) })
         break
       case '6':
         // 纹波电压
@@ -326,6 +344,7 @@
     itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量)
     itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压
     itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性
+    measureItemData.value = JSON.parse(JSON.stringify(res.data.measureItemDataDcPowerList))
     initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' })))
   })
 }
@@ -362,7 +381,17 @@
   const params = {
     belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
     itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-    measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })),
+    measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })).map((item: any, index: number) => {
+      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),
+        }
+      }
+      else {
+        return item
+      }
+    }),
   }
   const res = await calculateHandle(params)
   result = res.data
diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
index d2675ad..fa9d201 100644
--- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
@@ -83,7 +83,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustFirst', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustFirst', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustFirst', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -93,7 +93,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustSecond', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustSecond', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustSecond', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -103,7 +103,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustThird', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustThird', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustThird', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -137,7 +137,10 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
+    itemFormData.value.appearance = `${res.data.appearance}`
+    itemFormData.value.tightness = `${res.data.tightness}`
+    itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck) // 外观及功能检查
+    itemFormData.value.sealingTest = Number(res.data.sealingTest) // 密封
     res.data.measureDataSafetyValueList.forEach((item: any) => {
       list.value.push({
         beforeAdjustAverage: item.beforeAdjustAverage,
@@ -216,8 +219,9 @@
   getItemInfo(params).then((res) => {
     console.log(res.data, 'data')
     // itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
-    itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
-    itemFormData.value.sealingTest = res.data.sealingTest // 密封
+    itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck) // 外观及功能检查
+    itemFormData.value.sealingTest = Number(res.data.sealingTest) // 密封
+    console.log(itemFormData.value, 'itemFormData.value')
     // console.log(itemFormData.value, 'itemFormData.value')
     initInputData(res.data.measureItemDataSafetyValveList)
   })
@@ -371,7 +375,7 @@
       >
         <el-row>
           <!-- 外观  -->
-          <el-col v-if="itemFormData.appearanceFunctionCheck" :span="6">
+          <el-col v-if="itemFormData.appearanceFunctionCheck === 1" :span="6">
             <el-form-item label="外观检查:" prop="appearance">
               <el-select v-model="itemFormData.appearance" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option
@@ -384,7 +388,7 @@
             </el-form-item>
           </el-col>
           <!-- 密封试验 -->
-          <el-col v-if="itemFormData.sealingTest" :span="6">
+          <el-col v-if="itemFormData.sealingTest === 1" :span="6">
             <el-form-item label="密封试验:" prop="tightness">
               <el-select v-model="itemFormData.tightness" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option
diff --git a/src/views/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue
index 9b49687..df200b4 100644
--- a/src/views/dataManagement/components/data/standardDevice.vue
+++ b/src/views/dataManagement/components/data/standardDevice.vue
@@ -1,4 +1,300 @@
 <!-- 标准装置分析  --数据看板 -->
+<script name="standardDevice" lang="ts" setup>
+import dayjs from 'dayjs'
+import { colors } from '../environment/colors'
+import { getRangeAllTime } from '@/utils/date'
+const props = defineProps({
+  lab: {
+    type: String,
+    default: '',
+  },
+})
+
+watch(() => props.lab, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+const showChart = ref<any[]>([
+  {
+    name: '近五年标准装置复查趋势',
+    type: 'line',
+    source: 'system',
+    smooth: false,
+  },
+  {
+    name: '标准装置状态分析',
+    type: 'bar-horizontal',
+    source: 'system',
+  },
+  {
+    name: '近一年部门核查分析',
+    type: 'bar-vertical',
+    source: 'system',
+  },
+  {
+    name: '当年标准装置核查排行版',
+    type: 'rank-table',
+    source: 'system',
+    columns: [
+      {
+        text: '标准装置名称',
+        value: 'name',
+        align: 'center',
+      },
+      {
+        text: '本年度核查次数',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '最近核查时间',
+        value: 'count',
+        align: 'center',
+      },
+
+    ],
+    data: [],
+  },
+])
+watch(() => showChart.value.length, () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  })
+})
+// 模拟数据
+const loading = ref(false)
+function fetchData() {
+  loading.value = true
+  // 近五年标准装置复查趋势
+  const name1 = ['电学电源组', '热工压力组', '无线脉冲组']
+  const name2 = [] as any[]
+  for (let i = Number(dayjs().format('YYYY')); i > Number(dayjs().format('YYYY')) - 5; i--) {
+    name2.push(i)
+  }
+  showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0].xAxisData = name2.reverse
+  showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0].data = name1.map(item => ({
+    name: item,
+    data: name2.map(item => Math.floor(Math.random() * 100) + 1),
+    symbol: 'emptyCircle',
+  }))
+  //  标准装置状态分析
+  const name3 = ['撤销', '更换', '建标']
+  showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0].data = name3.map(item => ({
+    name: item,
+    data: name1.map(item => Math.floor(Math.random() * 100) + 1),
+  }))
+  showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0].xAxisData = name1
+  // 近一年部门核查分析
+  const name4 = dayjs().subtract(6, 'month').format('YYYY-MM')
+  console.log(name4, 'name4')
+  setTimeout(() => {
+    loading.value = false
+  }, 3000)
+}
+setTimeout(() => {
+  fetchData()
+}, 100)
+</script>
+
 <template>
-  标准装置分析
+  <div class="container">
+    <!-- 展示内容 -->
+    <div class="content-count">
+      <!-- 统计数据 -->
+      <div class="count">
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              标准装置总数
+            </div>
+            <div class="content-count">
+              30214
+            </div>
+          </div>
+        </div>
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              当年复查标准装置总数
+            </div>
+            <div class="content-count">
+              1538
+            </div>
+          </div>
+        </div>
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              核查记录总数
+            </div>
+            <div class="content-count">
+              1445
+            </div>
+          </div>
+        </div>
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              核查记录总数(本年度)
+            </div>
+            <div class="content-count">
+              3641
+            </div>
+          </div>
+        </div>
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              核查记录总数(本季度)
+            </div>
+            <div class="content-count">
+              1039
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 图表区域 -->
+      <div class="content">
+        <div class="chart">
+          <div v-for="(item, index) in showChart" :key="item" :style="{ width: `${showChart.length === 4 ? '48%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+            <div class="chart-name">
+              {{ item.name }}
+            </div>
+            <div v-if="item.needSearch" class="chart-search" />
+            <div v-loading="loading" class="chart-page">
+              <pie-chart v-if="item.type === 'pie'" :data="item.data" :colors="colors" :center="item.center" label-formatter="{style1|{c}}" :label-position="item.labelPosition" :radius="item.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
+              <line-chart v-if="item.type === 'line'" :colors="colors" :gradient="item.gradient" :x-axis-data="item.xAxisData" :data="item.data" :smooth="item.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
+              <bar-chart-horizontal-rank v-if="item.type === 'rank'" :colors="colors" label-position="" :x-axis-data="item.xAxisData" :data="item.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
+              <scroll-table v-if="item.type === 'rank-table'" style="width: 100%;" :height="330" :data="item.data" :columns="item.columns" />
+              <bar-chart-horizontal v-if="item.type === 'bar-horizontal'" :bar-coner="0" :data="item.data" :x-axis-data="item.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
+              <bar-chart-vertical v-if="item.type === 'bar-vertical'" :bar-coner="0" :data="item.data" :x-axis-data="item.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
+            </div>
+          </div>
+        </div>
+        <div class="swiper" />
+      </div>
+    </div>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.content {
+  display: flex;
+
+  .chart {
+    width: 70%;
+  }
+
+  .swiper {
+    width: 30%;
+  }
+}
+
+.icon-button-icon {
+  width: 50px;
+  height: 50px;
+}
+
+.container {
+  position: relative;
+  // height: 500px;
+
+  .btns {
+    width: 100%;
+    position: absolute;
+    top: -36px;
+    right: 60%;
+    // left: 50%;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 60px;
+  }
+
+  .count {
+    display: flex;
+    width: 66%;
+    margin: 0 auto;
+    position: absolute;
+    top: -40px;
+    left: 50%;
+    transform: translateX(-50%);
+
+    .count-item {
+      // margin-left: 20px;
+      width: 40%;
+      height: 75px;
+      display: flex;
+      padding: 0 10px;
+      justify-content: space-around;
+
+      .header-icon {
+        width: 20%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+      }
+
+      .header-content {
+        // width: 60%;
+        padding: 10px;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+
+        .content-title {
+          font-weight: 700;
+        }
+
+        .content-count {
+          font-weight: 700;
+          font-size: 24px;
+          color: #1aaf8b;
+        }
+      }
+    }
+  }
+
+  .chart {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    // margin-top: 15px;
+    padding-top: 20px;
+
+    .chart-item {
+      width: 33%;
+      height: 348px;
+      // border: 1px solid red;
+      margin-top: 10px;
+
+      .chart-name {
+        color: #3d6fb6;
+        font-size: 18px;
+        font-weight: 700;
+      }
+
+      .chart-page {
+        height: 330px;
+      }
+    }
+  }
+}
+</style>
+

diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue
index 48e0223..4b7034a 100644
--- a/src/views/business/measure/item/components/sixth/templateDetail.vue
+++ b/src/views/business/measure/item/components/sixth/templateDetail.vue
@@ -182,7 +182,7 @@
     </el-checkbox>
   </div>
   <div style="padding: 0 10px;">
-    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true">
+    <el-checkbox v-model="form.rippleVoltage" :true-label="1" :false-label="0" :checked="true" :disabled="pageType === 'detail'">
       整定压力
     </el-checkbox>
   </div>
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 98d9991..68e453a 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -329,6 +329,7 @@
         : [{}], // 整定压力
       appearanceFunctionCheck: getObject.value.appearanceFunctionCheck, // 外观及功能检查
       sealingTest: getObject.value.sealingTest, // 密封试验
+      rippleVoltage: getObject.value.rippleVoltage, // 整定压力
     }
   }
   else if (form.value.belongStandardEquipment === '8') { // 第8套：E2等砝码
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index 41321f0..e72d3dc 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -77,6 +77,7 @@
 const rippleVoltageList = ref<IDetailMeasureList[]>([]) // 纹波电压
 const outputVoltageStabilityList = ref<IDetailMeasureList[]>([]) // 输出电压短期稳定性
 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({})
+const measureItemData = ref<any[]>([])
 const setListDict = () => {
   listDict.value = {
     '1-电源电压调整率': lineVoltageRegulationList.value, // 1
@@ -217,7 +218,16 @@
     itemId: $route.query.itemId, // 检定项id
     orderId: $route.query.orderId, // 任务单id
     sampleId: $route.query.sampleId, // 被检设备id
-  }).then((res) => {
+  }).then(async (res) => {
+    // 获取检定项数据
+    const params = {
+      id: $route.query.itemId,
+      itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名字
+      belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置字典code
+    }
+    const response = await getItemInfo(params)
+    measureItemData.value = JSON.parse(JSON.stringify(response.data.measureItemDataDcPowerList))
+
     console.log(res.data, '编辑 详情')
     // 有关于检定项的数据
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
@@ -231,21 +241,29 @@
   })
 }
 // 最大允许误差 计算
-const calcMaxError = (item: any) => {
+const calcMaxError = (item: any, index: number, type: string) => {
+  let initData = {} as any
+  if (type === 'all') {
+    initData = measureItemData.value[index]
+  }
+  else {
+    initData = measureItemData.value.filter((citem: any) => citem.dataType === item.dataType)[index]
+  }
+  console.log(initData, '对应的鉴定数据')
   // 1数字式、2指针式
   if (item.dataTypeType === '1') {
-    if (item.maximumError === '2') {
-      return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)) || 0
+    if (initData.maximumError === '2') {
+      return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB) * Number(initData.resolution)) || 0
     }
-    else if (item.maximumError === '2') {
-      return (Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)) || 0
+    else if (initData.maximumError === '3') {
+      return (Number(initData.errorParamA) * Number(item.measureIndicationValue) + Number(initData.errorParamB)) || 0
     }
-    else if (item.maximumError === '1') {
-      return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0
+    else if (initData.maximumError === '1') {
+      return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0
     }
   }
   else if (item.dataTypeType === '2') {
-    return (Number(item.accuracyA) * Number(item.fullScaleValue)) || 0
+    return (Number(initData.accuracyA) * Number(initData.fullScaleValue)) || 0
   }
 }
 // 初始化数据
@@ -264,7 +282,7 @@
 // 初始化输入数据
 function initInputData(data: any[]) {
   initAllData()
-  data.forEach((item) => {
+  data.forEach((item, index) => {
     switch (item.dataType) {
       case '1':
         // 电源电压调整率
@@ -276,15 +294,15 @@
         break
       case '3':
         // 电压示值误差
-        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 2) : transformDecimal(Number(item.maximumError) || 0, 2) })
+        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(2) })
         break
       case '4':
         // 电流示值误差(直接测量)
-        ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+        ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: Number(calcMaxError(item, index, 'all') || 0).toFixed(3) })
         break
       case '5':
         // 电流示值误差(间接测量)
-        ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+        ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: Number(calcMaxError(item, index, 'all')).toFixed(3) })
         break
       case '6':
         // 纹波电压
@@ -326,6 +344,7 @@
     itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量)
     itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压
     itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性
+    measureItemData.value = JSON.parse(JSON.stringify(res.data.measureItemDataDcPowerList))
     initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' })))
   })
 }
@@ -362,7 +381,17 @@
   const params = {
     belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
     itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-    measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })),
+    measureDataDcPowerList: list.map((item: any) => ({ ...item, exceedMark: 0 })).map((item: any, index: number) => {
+      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),
+        }
+      }
+      else {
+        return item
+      }
+    }),
   }
   const res = await calculateHandle(params)
   result = res.data
diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
index d2675ad..fa9d201 100644
--- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue
@@ -83,7 +83,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustFirst', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustFirst', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustFirst', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -93,7 +93,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustSecond', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustSecond', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustSecond', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -103,7 +103,7 @@
     required: false,
     children: [
       { text: '调整前', value: 'beforeAdjustThird', align: 'center', required: true, width: '180', type: 'inputNumber' },
-      { text: '调整后', value: 'afterAdjustThird', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '调整后', value: 'afterAdjustThird', align: 'center', required: false, width: '180', type: 'inputNumber' },
     ],
   },
   {
@@ -137,7 +137,10 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
+    itemFormData.value.appearance = `${res.data.appearance}`
+    itemFormData.value.tightness = `${res.data.tightness}`
+    itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck) // 外观及功能检查
+    itemFormData.value.sealingTest = Number(res.data.sealingTest) // 密封
     res.data.measureDataSafetyValueList.forEach((item: any) => {
       list.value.push({
         beforeAdjustAverage: item.beforeAdjustAverage,
@@ -216,8 +219,9 @@
   getItemInfo(params).then((res) => {
     console.log(res.data, 'data')
     // itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观
-    itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
-    itemFormData.value.sealingTest = res.data.sealingTest // 密封
+    itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck) // 外观及功能检查
+    itemFormData.value.sealingTest = Number(res.data.sealingTest) // 密封
+    console.log(itemFormData.value, 'itemFormData.value')
     // console.log(itemFormData.value, 'itemFormData.value')
     initInputData(res.data.measureItemDataSafetyValveList)
   })
@@ -371,7 +375,7 @@
       >
         <el-row>
           <!-- 外观  -->
-          <el-col v-if="itemFormData.appearanceFunctionCheck" :span="6">
+          <el-col v-if="itemFormData.appearanceFunctionCheck === 1" :span="6">
             <el-form-item label="外观检查:" prop="appearance">
               <el-select v-model="itemFormData.appearance" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option
@@ -384,7 +388,7 @@
             </el-form-item>
           </el-col>
           <!-- 密封试验 -->
-          <el-col v-if="itemFormData.sealingTest" :span="6">
+          <el-col v-if="itemFormData.sealingTest === 1" :span="6">
             <el-form-item label="密封试验:" prop="tightness">
               <el-select v-model="itemFormData.tightness" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option
diff --git a/src/views/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue
index 9b49687..df200b4 100644
--- a/src/views/dataManagement/components/data/standardDevice.vue
+++ b/src/views/dataManagement/components/data/standardDevice.vue
@@ -1,4 +1,300 @@
 <!-- 标准装置分析  --数据看板 -->
+<script name="standardDevice" lang="ts" setup>
+import dayjs from 'dayjs'
+import { colors } from '../environment/colors'
+import { getRangeAllTime } from '@/utils/date'
+const props = defineProps({
+  lab: {
+    type: String,
+    default: '',
+  },
+})
+
+watch(() => props.lab, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+const showChart = ref<any[]>([
+  {
+    name: '近五年标准装置复查趋势',
+    type: 'line',
+    source: 'system',
+    smooth: false,
+  },
+  {
+    name: '标准装置状态分析',
+    type: 'bar-horizontal',
+    source: 'system',
+  },
+  {
+    name: '近一年部门核查分析',
+    type: 'bar-vertical',
+    source: 'system',
+  },
+  {
+    name: '当年标准装置核查排行版',
+    type: 'rank-table',
+    source: 'system',
+    columns: [
+      {
+        text: '标准装置名称',
+        value: 'name',
+        align: 'center',
+      },
+      {
+        text: '本年度核查次数',
+        value: 'dept',
+        align: 'center',
+      },
+      {
+        text: '最近核查时间',
+        value: 'count',
+        align: 'center',
+      },
+
+    ],
+    data: [],
+  },
+])
+watch(() => showChart.value.length, () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  })
+})
+// 模拟数据
+const loading = ref(false)
+function fetchData() {
+  loading.value = true
+  // 近五年标准装置复查趋势
+  const name1 = ['电学电源组', '热工压力组', '无线脉冲组']
+  const name2 = [] as any[]
+  for (let i = Number(dayjs().format('YYYY')); i > Number(dayjs().format('YYYY')) - 5; i--) {
+    name2.push(i)
+  }
+  showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0].xAxisData = name2.reverse
+  showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0].data = name1.map(item => ({
+    name: item,
+    data: name2.map(item => Math.floor(Math.random() * 100) + 1),
+    symbol: 'emptyCircle',
+  }))
+  //  标准装置状态分析
+  const name3 = ['撤销', '更换', '建标']
+  showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0].data = name3.map(item => ({
+    name: item,
+    data: name1.map(item => Math.floor(Math.random() * 100) + 1),
+  }))
+  showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0].xAxisData = name1
+  // 近一年部门核查分析
+  const name4 = dayjs().subtract(6, 'month').format('YYYY-MM')
+  console.log(name4, 'name4')
+  setTimeout(() => {
+    loading.value = false
+  }, 3000)
+}
+setTimeout(() => {
+  fetchData()
+}, 100)
+</script>
+
 <template>
-  标准装置分析
+  <div class="container">
+    <!-- 展示内容 -->
+    <div class="content-count">
+      <!-- 统计数据 -->
+      <div class="count">
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              标准装置总数
+            </div>
+            <div class="content-count">
+              30214
+            </div>
+          </div>
+        </div>
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              当年复查标准装置总数
+            </div>
+            <div class="content-count">
+              1538
+            </div>
+          </div>
+        </div>
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              核查记录总数
+            </div>
+            <div class="content-count">
+              1445
+            </div>
+          </div>
+        </div>
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              核查记录总数(本年度)
+            </div>
+            <div class="content-count">
+              3641
+            </div>
+          </div>
+        </div>
+        <div class="count-item">
+          <div class="header-icon">
+            <svg-icon name="icon-env-device-online" class="icon-button-icon" />
+          </div>
+          <div class="header-content">
+            <div class="content-title">
+              核查记录总数(本季度)
+            </div>
+            <div class="content-count">
+              1039
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 图表区域 -->
+      <div class="content">
+        <div class="chart">
+          <div v-for="(item, index) in showChart" :key="item" :style="{ width: `${showChart.length === 4 ? '48%' : index === 0 || index === 1 ? '48%' : '31.5%'}` }" class="chart-item">
+            <div class="chart-name">
+              {{ item.name }}
+            </div>
+            <div v-if="item.needSearch" class="chart-search" />
+            <div v-loading="loading" class="chart-page">
+              <pie-chart v-if="item.type === 'pie'" :data="item.data" :colors="colors" :center="item.center" label-formatter="{style1|{c}}" :label-position="item.labelPosition" :radius="item.radius" :grid="{ top: 50, left: 15, right: 15, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
+              <line-chart v-if="item.type === 'line'" :colors="colors" :gradient="item.gradient" :x-axis-data="item.xAxisData" :data="item.data" :smooth="item.smooth" :grid="{ top: 47, left: 5, right: 5, bottom: 10, containLabel: true }" :legend="{ itemWidth: 8, itemHeight: 2, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '5' }" />
+              <bar-chart-horizontal-rank v-if="item.type === 'rank'" :colors="colors" label-position="" :x-axis-data="item.xAxisData" :data="item.data" font-color="#000" :grid="{ top: 10, left: 20, right: 20, bottom: 10, containLabel: true }" :legend="{ }" />
+              <scroll-table v-if="item.type === 'rank-table'" style="width: 100%;" :height="330" :data="item.data" :columns="item.columns" />
+              <bar-chart-horizontal v-if="item.type === 'bar-horizontal'" :bar-coner="0" :data="item.data" :x-axis-data="item.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
+              <bar-chart-vertical v-if="item.type === 'bar-vertical'" :bar-coner="0" :data="item.data" :x-axis-data="item.xAxisData" :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', left: '0', top: '10' }" />
+            </div>
+          </div>
+        </div>
+        <div class="swiper" />
+      </div>
+    </div>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.content {
+  display: flex;
+
+  .chart {
+    width: 70%;
+  }
+
+  .swiper {
+    width: 30%;
+  }
+}
+
+.icon-button-icon {
+  width: 50px;
+  height: 50px;
+}
+
+.container {
+  position: relative;
+  // height: 500px;
+
+  .btns {
+    width: 100%;
+    position: absolute;
+    top: -36px;
+    right: 60%;
+    // left: 50%;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 60px;
+  }
+
+  .count {
+    display: flex;
+    width: 66%;
+    margin: 0 auto;
+    position: absolute;
+    top: -40px;
+    left: 50%;
+    transform: translateX(-50%);
+
+    .count-item {
+      // margin-left: 20px;
+      width: 40%;
+      height: 75px;
+      display: flex;
+      padding: 0 10px;
+      justify-content: space-around;
+
+      .header-icon {
+        width: 20%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+      }
+
+      .header-content {
+        // width: 60%;
+        padding: 10px;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+
+        .content-title {
+          font-weight: 700;
+        }
+
+        .content-count {
+          font-weight: 700;
+          font-size: 24px;
+          color: #1aaf8b;
+        }
+      }
+    }
+  }
+
+  .chart {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    // margin-top: 15px;
+    padding-top: 20px;
+
+    .chart-item {
+      width: 33%;
+      height: 348px;
+      // border: 1px solid red;
+      margin-top: 10px;
+
+      .chart-name {
+        color: #3d6fb6;
+        font-size: 18px;
+        font-weight: 700;
+      }
+
+      .chart-page {
+        height: 330px;
+      }
+    }
+  }
+}
+</style>
+
diff --git a/src/views/quality/internal/internalPlan/components/edit.vue b/src/views/quality/internal/internalPlan/components/edit.vue
index 2fb75ac..2ce275b 100644
--- a/src/views/quality/internal/internalPlan/components/edit.vue
+++ b/src/views/quality/internal/internalPlan/components/edit.vue
@@ -37,6 +37,7 @@
   planUserList: [] as any, // 组员
 })
 // 用户列表
+const userList = ref<any[]>([])
 const userList1 = ref<any[]>([])
 const userList2 = ref<any[]>([])
 // 表单验证规则
@@ -146,9 +147,9 @@
     })
   }
   // 用户
-  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  //   userList.value = res.data.rows
-  // })
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
   userList1.value = [...await filterUser(quality.roleTips['质量负责人']), ...await filterUser(quality.roleTips['内审组长'])]
   userList2.value = await filterUser(quality.roleTips['内审组员'])
 }