diff --git a/src/views/business/measure/item/components/third/templateDetail-interface.ts b/src/views/business/measure/item/components/third/templateDetail-interface.ts index de3be59..48091dc 100644 --- a/src/views/business/measure/item/components/third/templateDetail-interface.ts +++ b/src/views/business/measure/item/components/third/templateDetail-interface.ts @@ -1,7 +1,7 @@ export interface IList { id: string accuracyA?: string // 准确度a - auxiliaryGroundResistance?: string // 辅助地阻 + auxiliaryGroundResistance?: string | number // 辅助地阻 dataType: string // 检定项数据类型(一个检定项中区分两个表格)(字典code),同对应的检定项类型 errorParamA?: string // 误差参数a errorParamB?: string // 误差参数b @@ -9,13 +9,13 @@ maximumAllowFactorB?: string // 最大允许值相关系数b maximumAllowValue?: string // 最大允许值 maximumError?: string // 最大允许误差 - measureIndicationValue?: string // 被检表示值 + measureIndicationValue?: string | number // 被检表示值 minimumAllowFactorA?: string // 最小允许值相关系数a minimumAllowValue?: string // 最小允许值 nominalValue?: string // 标称值 rangeRange?: string // 量程 - resolution?: number // 分辨力 - standardValue?: string // 标准值 + resolution?: number | string // 分辨力 + standardValue?: string | number // 标准值 terminalVoltage?: string // 端钮电压 unit?: string // 单位 params?: string // 检定项目 diff --git a/src/views/business/measure/item/components/third/templateDetail-interface.ts b/src/views/business/measure/item/components/third/templateDetail-interface.ts index de3be59..48091dc 100644 --- a/src/views/business/measure/item/components/third/templateDetail-interface.ts +++ b/src/views/business/measure/item/components/third/templateDetail-interface.ts @@ -1,7 +1,7 @@ export interface IList { id: string accuracyA?: string // 准确度a - auxiliaryGroundResistance?: string // 辅助地阻 + auxiliaryGroundResistance?: string | number // 辅助地阻 dataType: string // 检定项数据类型(一个检定项中区分两个表格)(字典code),同对应的检定项类型 errorParamA?: string // 误差参数a errorParamB?: string // 误差参数b @@ -9,13 +9,13 @@ maximumAllowFactorB?: string // 最大允许值相关系数b maximumAllowValue?: string // 最大允许值 maximumError?: string // 最大允许误差 - measureIndicationValue?: string // 被检表示值 + measureIndicationValue?: string | number // 被检表示值 minimumAllowFactorA?: string // 最小允许值相关系数a minimumAllowValue?: string // 最小允许值 nominalValue?: string // 标称值 rangeRange?: string // 量程 - resolution?: number // 分辨力 - standardValue?: string // 标准值 + resolution?: number | string // 分辨力 + standardValue?: string | number // 标准值 terminalVoltage?: string // 端钮电压 unit?: string // 单位 params?: string // 检定项目 diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index f8155da..98422b9 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -1,6 +1,7 @@ @@ -306,7 +598,7 @@ - + *{{ item.text }} + diff --git a/src/views/business/measure/item/components/third/templateDetail-interface.ts b/src/views/business/measure/item/components/third/templateDetail-interface.ts index de3be59..48091dc 100644 --- a/src/views/business/measure/item/components/third/templateDetail-interface.ts +++ b/src/views/business/measure/item/components/third/templateDetail-interface.ts @@ -1,7 +1,7 @@ export interface IList { id: string accuracyA?: string // 准确度a - auxiliaryGroundResistance?: string // 辅助地阻 + auxiliaryGroundResistance?: string | number // 辅助地阻 dataType: string // 检定项数据类型(一个检定项中区分两个表格)(字典code),同对应的检定项类型 errorParamA?: string // 误差参数a errorParamB?: string // 误差参数b @@ -9,13 +9,13 @@ maximumAllowFactorB?: string // 最大允许值相关系数b maximumAllowValue?: string // 最大允许值 maximumError?: string // 最大允许误差 - measureIndicationValue?: string // 被检表示值 + measureIndicationValue?: string | number // 被检表示值 minimumAllowFactorA?: string // 最小允许值相关系数a minimumAllowValue?: string // 最小允许值 nominalValue?: string // 标称值 rangeRange?: string // 量程 - resolution?: number // 分辨力 - standardValue?: string // 标准值 + resolution?: number | string // 分辨力 + standardValue?: string | number // 标准值 terminalVoltage?: string // 端钮电压 unit?: string // 单位 params?: string // 检定项目 diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index f8155da..98422b9 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -1,6 +1,7 @@ @@ -306,7 +598,7 @@ - + *{{ item.text }} + diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 76be90e..61f4679 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -200,6 +200,14 @@ measureItemConfigCalibrator, // 检定项配置 } } + else if (form.value.belongStandardEquipment === '3') { // 第3套:多功能电气安全校准器 + params = { + helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明 + itemId: infoId.value, // 检定项id + itemRemark: form.value.itemRemark, // 检定项备注 + measureItemDataElectricalSafetyList: standardRef.value.listBottom.concat(standardRef.value.listTop), // 检定项 + } + } else if (form.value.belongStandardEquipment === '4') { // 第四套:0.02级活塞式压力计 // await standardRef.value.recalculateData() params = { @@ -220,9 +228,6 @@ // 保存 const save = () => { - if (form.value.belongStandardEquipment !== '1' && form.value.belongStandardEquipment !== '4') { - return false - } if (!check()) { return false } ruleFormRef.value!.validate((valid: boolean) => { if (valid) { @@ -287,8 +292,8 @@ }) // 检定项表格 } else if (form.value.belongStandardEquipment === '4') { // 第四套:0.02级活塞式压力计 - // getList.value = response.measureItemDataPistonGaugeList // 检定项表格 - // getObject.value = response.measureItemConfigPistonGauge // 检定项表单 + getList.value = response.measureItemDataPistonGaugeList // 检定项表格 + getObject.value = response.measureItemConfigPistonGauge // 检定项表单 } } @@ -326,6 +331,8 @@ if (form.value.belongStandardEquipment === '1') { // 第一套:多功能校准源 getList.value = response.measureItemDataCalibratorList // 检定项表格 getObject.value = response.measureItemConfigCalibrator // 检定项表单 + } if (form.value.belongStandardEquipment === '3') { // 第3套:多功能电气安全校准器 + getList.value = response.measureItemDataElectricalSafetyList // 检定项表格 } else if (form.value.belongStandardEquipment === '4') { // 第四套:0.02级活塞式压力计 getList.value = response.measureItemDataPistonGaugeList // 检定项表格 diff --git a/src/views/business/measure/item/components/third/templateDetail-interface.ts b/src/views/business/measure/item/components/third/templateDetail-interface.ts index de3be59..48091dc 100644 --- a/src/views/business/measure/item/components/third/templateDetail-interface.ts +++ b/src/views/business/measure/item/components/third/templateDetail-interface.ts @@ -1,7 +1,7 @@ export interface IList { id: string accuracyA?: string // 准确度a - auxiliaryGroundResistance?: string // 辅助地阻 + auxiliaryGroundResistance?: string | number // 辅助地阻 dataType: string // 检定项数据类型(一个检定项中区分两个表格)(字典code),同对应的检定项类型 errorParamA?: string // 误差参数a errorParamB?: string // 误差参数b @@ -9,13 +9,13 @@ maximumAllowFactorB?: string // 最大允许值相关系数b maximumAllowValue?: string // 最大允许值 maximumError?: string // 最大允许误差 - measureIndicationValue?: string // 被检表示值 + measureIndicationValue?: string | number // 被检表示值 minimumAllowFactorA?: string // 最小允许值相关系数a minimumAllowValue?: string // 最小允许值 nominalValue?: string // 标称值 rangeRange?: string // 量程 - resolution?: number // 分辨力 - standardValue?: string // 标准值 + resolution?: number | string // 分辨力 + standardValue?: string | number // 标准值 terminalVoltage?: string // 端钮电压 unit?: string // 单位 params?: string // 检定项目 diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index f8155da..98422b9 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -1,6 +1,7 @@ @@ -306,7 +598,7 @@ - + *{{ item.text }} + diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 76be90e..61f4679 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -200,6 +200,14 @@ measureItemConfigCalibrator, // 检定项配置 } } + else if (form.value.belongStandardEquipment === '3') { // 第3套:多功能电气安全校准器 + params = { + helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明 + itemId: infoId.value, // 检定项id + itemRemark: form.value.itemRemark, // 检定项备注 + measureItemDataElectricalSafetyList: standardRef.value.listBottom.concat(standardRef.value.listTop), // 检定项 + } + } else if (form.value.belongStandardEquipment === '4') { // 第四套:0.02级活塞式压力计 // await standardRef.value.recalculateData() params = { @@ -220,9 +228,6 @@ // 保存 const save = () => { - if (form.value.belongStandardEquipment !== '1' && form.value.belongStandardEquipment !== '4') { - return false - } if (!check()) { return false } ruleFormRef.value!.validate((valid: boolean) => { if (valid) { @@ -287,8 +292,8 @@ }) // 检定项表格 } else if (form.value.belongStandardEquipment === '4') { // 第四套:0.02级活塞式压力计 - // getList.value = response.measureItemDataPistonGaugeList // 检定项表格 - // getObject.value = response.measureItemConfigPistonGauge // 检定项表单 + getList.value = response.measureItemDataPistonGaugeList // 检定项表格 + getObject.value = response.measureItemConfigPistonGauge // 检定项表单 } } @@ -326,6 +331,8 @@ if (form.value.belongStandardEquipment === '1') { // 第一套:多功能校准源 getList.value = response.measureItemDataCalibratorList // 检定项表格 getObject.value = response.measureItemConfigCalibrator // 检定项表单 + } if (form.value.belongStandardEquipment === '3') { // 第3套:多功能电气安全校准器 + getList.value = response.measureItemDataElectricalSafetyList // 检定项表格 } else if (form.value.belongStandardEquipment === '4') { // 第四套:0.02级活塞式压力计 getList.value = response.measureItemDataPistonGaugeList // 检定项表格 diff --git a/src/views/business/measure/item/useCalculateResolution.ts b/src/views/business/measure/item/useCalculateResolution.ts new file mode 100644 index 0000000..eb1e4c7 --- /dev/null +++ b/src/views/business/measure/item/useCalculateResolution.ts @@ -0,0 +1,16 @@ +// 标准装置前端所做的计算 +import { ElMessage } from 'element-plus' +import { calc } from '../../../../utils/useCalc' +// 计算分辨率点击减号 +export function clickSub(row: any) { + if (calc(row.resolution!, 10, '*') > 1) { + ElMessage.warning('要求分辨力不能大于1') + } + else { + row.resolution = calc(row.resolution!, 10, '*') + } +} +// 计算分辨率点击减号 +export function clickAdd(row: any) { + row.resolution = calc(row.resolution!, 10, '/') +}