diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index ddaa194..5278ff3 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -100,7 +100,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差(Ω)', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -110,7 +110,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -121,7 +121,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true, width: '180' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -132,7 +132,7 @@ { text: '端钮电压(V)', value: 'terminalVoltage', align: 'center', required: true, width: '180' }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -141,7 +141,7 @@ { text: '检定项目', value: 'params', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -151,7 +151,7 @@ { text: '标准值', value: 'standardValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_bottom_earth_resistanc_simulation = ref([ // 模拟式接地电阻--下面表格（辅助接地电阻试验） @@ -159,7 +159,7 @@ { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // ---------------------------------------------表格操作------------------------------------------------ @@ -576,6 +576,16 @@ :disabled="pageType === 'detail'" class="full-width-input" /> + + + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index ddaa194..5278ff3 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -100,7 +100,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差(Ω)', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -110,7 +110,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -121,7 +121,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true, width: '180' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -132,7 +132,7 @@ { text: '端钮电压(V)', value: 'terminalVoltage', align: 'center', required: true, width: '180' }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -141,7 +141,7 @@ { text: '检定项目', value: 'params', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -151,7 +151,7 @@ { text: '标准值', value: 'standardValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_bottom_earth_resistanc_simulation = ref([ // 模拟式接地电阻--下面表格（辅助接地电阻试验） @@ -159,7 +159,7 @@ { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // ---------------------------------------------表格操作------------------------------------------------ @@ -576,6 +576,16 @@ :disabled="pageType === 'detail'" class="full-width-input" /> + + + diff --git a/src/views/business/measure/item/components/thirteenth/templateDetail.vue b/src/views/business/measure/item/components/thirteenth/templateDetail.vue index 8b26394..43b88d8 100644 --- a/src/views/business/measure/item/components/thirteenth/templateDetail.vue +++ b/src/views/business/measure/item/components/thirteenth/templateDetail.vue @@ -401,7 +401,7 @@ bandWidth: '', // 频带宽度 bandWidthUnit: 'Hz', // 频带宽度单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'dB', // 技术指标单位 }) break @@ -440,7 +440,7 @@ horizontalDeflectCoefficient: '', // 水平偏转系数单位 horizontalDeflectCoefficientUnit: 'ns', // 水平偏转系数单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'ns', // 技术指标单位 }) break @@ -454,6 +454,7 @@ verticalDeflectCoefficient: '', // 垂直偏转系数 verticalDeflectCoefficientUnit: 'V', // 垂直偏转系数单位 standardValue: '', // 标准值 + nominalValueUnit: 'Ω', // 标称值单位 technicalIndex: '', // 技术指标 technicalIndexSymbol: '±', // 技术指标前符号 technicalIndexUnit: '%', // 技术指标单位 @@ -1052,9 +1053,12 @@ } } }) +const $route = useRoute() watch(() => props.form, (newValue) => { - if (newValue && Object.keys(newValue).length) { + const updataOld = $route.query.updataOld as string + console.log(updataOld) + if (newValue && Object.keys(newValue).length && updataOld !== 'true') { form.value.appearanceFunctionCheck = newValue.appearanceFunctionCheck // 外观及功能性检查 form.value.timeBase = newValue.timeBase // 时基(示波器-数字) form.value.scanTimeCoefficient = newValue.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟) @@ -1291,7 +1295,7 @@ - + diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index ddaa194..5278ff3 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -100,7 +100,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差(Ω)', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -110,7 +110,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -121,7 +121,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true, width: '180' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -132,7 +132,7 @@ { text: '端钮电压(V)', value: 'terminalVoltage', align: 'center', required: true, width: '180' }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -141,7 +141,7 @@ { text: '检定项目', value: 'params', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -151,7 +151,7 @@ { text: '标准值', value: 'standardValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_bottom_earth_resistanc_simulation = ref([ // 模拟式接地电阻--下面表格（辅助接地电阻试验） @@ -159,7 +159,7 @@ { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // ---------------------------------------------表格操作------------------------------------------------ @@ -576,6 +576,16 @@ :disabled="pageType === 'detail'" class="full-width-input" /> + + + diff --git a/src/views/business/measure/item/components/thirteenth/templateDetail.vue b/src/views/business/measure/item/components/thirteenth/templateDetail.vue index 8b26394..43b88d8 100644 --- a/src/views/business/measure/item/components/thirteenth/templateDetail.vue +++ b/src/views/business/measure/item/components/thirteenth/templateDetail.vue @@ -401,7 +401,7 @@ bandWidth: '', // 频带宽度 bandWidthUnit: 'Hz', // 频带宽度单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'dB', // 技术指标单位 }) break @@ -440,7 +440,7 @@ horizontalDeflectCoefficient: '', // 水平偏转系数单位 horizontalDeflectCoefficientUnit: 'ns', // 水平偏转系数单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'ns', // 技术指标单位 }) break @@ -454,6 +454,7 @@ verticalDeflectCoefficient: '', // 垂直偏转系数 verticalDeflectCoefficientUnit: 'V', // 垂直偏转系数单位 standardValue: '', // 标准值 + nominalValueUnit: 'Ω', // 标称值单位 technicalIndex: '', // 技术指标 technicalIndexSymbol: '±', // 技术指标前符号 technicalIndexUnit: '%', // 技术指标单位 @@ -1052,9 +1053,12 @@ } } }) +const $route = useRoute() watch(() => props.form, (newValue) => { - if (newValue && Object.keys(newValue).length) { + const updataOld = $route.query.updataOld as string + console.log(updataOld) + if (newValue && Object.keys(newValue).length && updataOld !== 'true') { form.value.appearanceFunctionCheck = newValue.appearanceFunctionCheck // 外观及功能性检查 form.value.timeBase = newValue.timeBase // 时基(示波器-数字) form.value.scanTimeCoefficient = newValue.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟) @@ -1291,7 +1295,7 @@ - + diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index 1ff1a29..2b66893 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -380,7 +380,7 @@ { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index ddaa194..5278ff3 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -100,7 +100,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差(Ω)', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -110,7 +110,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -121,7 +121,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true, width: '180' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -132,7 +132,7 @@ { text: '端钮电压(V)', value: 'terminalVoltage', align: 'center', required: true, width: '180' }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -141,7 +141,7 @@ { text: '检定项目', value: 'params', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -151,7 +151,7 @@ { text: '标准值', value: 'standardValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_bottom_earth_resistanc_simulation = ref([ // 模拟式接地电阻--下面表格（辅助接地电阻试验） @@ -159,7 +159,7 @@ { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // ---------------------------------------------表格操作------------------------------------------------ @@ -576,6 +576,16 @@ :disabled="pageType === 'detail'" class="full-width-input" /> + + + diff --git a/src/views/business/measure/item/components/thirteenth/templateDetail.vue b/src/views/business/measure/item/components/thirteenth/templateDetail.vue index 8b26394..43b88d8 100644 --- a/src/views/business/measure/item/components/thirteenth/templateDetail.vue +++ b/src/views/business/measure/item/components/thirteenth/templateDetail.vue @@ -401,7 +401,7 @@ bandWidth: '', // 频带宽度 bandWidthUnit: 'Hz', // 频带宽度单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'dB', // 技术指标单位 }) break @@ -440,7 +440,7 @@ horizontalDeflectCoefficient: '', // 水平偏转系数单位 horizontalDeflectCoefficientUnit: 'ns', // 水平偏转系数单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'ns', // 技术指标单位 }) break @@ -454,6 +454,7 @@ verticalDeflectCoefficient: '', // 垂直偏转系数 verticalDeflectCoefficientUnit: 'V', // 垂直偏转系数单位 standardValue: '', // 标准值 + nominalValueUnit: 'Ω', // 标称值单位 technicalIndex: '', // 技术指标 technicalIndexSymbol: '±', // 技术指标前符号 technicalIndexUnit: '%', // 技术指标单位 @@ -1052,9 +1053,12 @@ } } }) +const $route = useRoute() watch(() => props.form, (newValue) => { - if (newValue && Object.keys(newValue).length) { + const updataOld = $route.query.updataOld as string + console.log(updataOld) + if (newValue && Object.keys(newValue).length && updataOld !== 'true') { form.value.appearanceFunctionCheck = newValue.appearanceFunctionCheck // 外观及功能性检查 form.value.timeBase = newValue.timeBase // 时基(示波器-数字) form.value.scanTimeCoefficient = newValue.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟) @@ -1291,7 +1295,7 @@ - + diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index 1ff1a29..2b66893 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -380,7 +380,7 @@ { form.value.itemCategoryName = itemList.value.find(item => item.id === form.value.itemCategoryId)!.name form.value.belongStandardEquipmentName = standardList.value.find(item => item.value === form.value.belongStandardEquipment)!.name + form.value.updataOld = true emits('confirm', form.value) dialogFormVisible.value = false }) @@ -115,6 +117,7 @@ itemCategoryId: '', // 设备检定项分类表id itemCategoryName: '', // 设备检定项分类名字 configType: '', + updataOld: false, // 是否更新了之前的配置 } } // 初始化 diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index ddaa194..5278ff3 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -100,7 +100,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差(Ω)', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -110,7 +110,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -121,7 +121,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true, width: '180' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -132,7 +132,7 @@ { text: '端钮电压(V)', value: 'terminalVoltage', align: 'center', required: true, width: '180' }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -141,7 +141,7 @@ { text: '检定项目', value: 'params', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -151,7 +151,7 @@ { text: '标准值', value: 'standardValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_bottom_earth_resistanc_simulation = ref([ // 模拟式接地电阻--下面表格（辅助接地电阻试验） @@ -159,7 +159,7 @@ { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // ---------------------------------------------表格操作------------------------------------------------ @@ -576,6 +576,16 @@ :disabled="pageType === 'detail'" class="full-width-input" /> + + + diff --git a/src/views/business/measure/item/components/thirteenth/templateDetail.vue b/src/views/business/measure/item/components/thirteenth/templateDetail.vue index 8b26394..43b88d8 100644 --- a/src/views/business/measure/item/components/thirteenth/templateDetail.vue +++ b/src/views/business/measure/item/components/thirteenth/templateDetail.vue @@ -401,7 +401,7 @@ bandWidth: '', // 频带宽度 bandWidthUnit: 'Hz', // 频带宽度单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'dB', // 技术指标单位 }) break @@ -440,7 +440,7 @@ horizontalDeflectCoefficient: '', // 水平偏转系数单位 horizontalDeflectCoefficientUnit: 'ns', // 水平偏转系数单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'ns', // 技术指标单位 }) break @@ -454,6 +454,7 @@ verticalDeflectCoefficient: '', // 垂直偏转系数 verticalDeflectCoefficientUnit: 'V', // 垂直偏转系数单位 standardValue: '', // 标准值 + nominalValueUnit: 'Ω', // 标称值单位 technicalIndex: '', // 技术指标 technicalIndexSymbol: '±', // 技术指标前符号 technicalIndexUnit: '%', // 技术指标单位 @@ -1052,9 +1053,12 @@ } } }) +const $route = useRoute() watch(() => props.form, (newValue) => { - if (newValue && Object.keys(newValue).length) { + const updataOld = $route.query.updataOld as string + console.log(updataOld) + if (newValue && Object.keys(newValue).length && updataOld !== 'true') { form.value.appearanceFunctionCheck = newValue.appearanceFunctionCheck // 外观及功能性检查 form.value.timeBase = newValue.timeBase // 时基(示波器-数字) form.value.scanTimeCoefficient = newValue.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟) @@ -1291,7 +1295,7 @@ - + diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index 1ff1a29..2b66893 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -380,7 +380,7 @@ { form.value.itemCategoryName = itemList.value.find(item => item.id === form.value.itemCategoryId)!.name form.value.belongStandardEquipmentName = standardList.value.find(item => item.value === form.value.belongStandardEquipment)!.name + form.value.updataOld = true emits('confirm', form.value) dialogFormVisible.value = false }) @@ -115,6 +117,7 @@ itemCategoryId: '', // 设备检定项分类表id itemCategoryName: '', // 设备检定项分类名字 configType: '', + updataOld: false, // 是否更新了之前的配置 } } // 初始化 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 531371e..c73fb2e 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -150,6 +150,7 @@ getId = res.data } loading.close() + console.log('-------------------', form.updataOld) $router.push({ path: `measureItem/edit/${getId}`, @@ -159,6 +160,7 @@ itemCategoryId: form.itemCategoryId, // 设备检定项分类id itemCategoryName: form.itemCategoryName, // 设备检定项分类名称 belongStandardEquipment: form.belongStandardEquipment, // 检校标准装置(字典code) + updataOld: `${form.updataOld}`, // 是否更新了检定项或者标准装置 }, }) } diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index ddaa194..5278ff3 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -100,7 +100,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差(Ω)', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -110,7 +110,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -121,7 +121,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true, width: '180' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -132,7 +132,7 @@ { text: '端钮电压(V)', value: 'terminalVoltage', align: 'center', required: true, width: '180' }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -141,7 +141,7 @@ { text: '检定项目', value: 'params', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -151,7 +151,7 @@ { text: '标准值', value: 'standardValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_bottom_earth_resistanc_simulation = ref([ // 模拟式接地电阻--下面表格（辅助接地电阻试验） @@ -159,7 +159,7 @@ { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // ---------------------------------------------表格操作------------------------------------------------ @@ -576,6 +576,16 @@ :disabled="pageType === 'detail'" class="full-width-input" /> + + + diff --git a/src/views/business/measure/item/components/thirteenth/templateDetail.vue b/src/views/business/measure/item/components/thirteenth/templateDetail.vue index 8b26394..43b88d8 100644 --- a/src/views/business/measure/item/components/thirteenth/templateDetail.vue +++ b/src/views/business/measure/item/components/thirteenth/templateDetail.vue @@ -401,7 +401,7 @@ bandWidth: '', // 频带宽度 bandWidthUnit: 'Hz', // 频带宽度单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'dB', // 技术指标单位 }) break @@ -440,7 +440,7 @@ horizontalDeflectCoefficient: '', // 水平偏转系数单位 horizontalDeflectCoefficientUnit: 'ns', // 水平偏转系数单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'ns', // 技术指标单位 }) break @@ -454,6 +454,7 @@ verticalDeflectCoefficient: '', // 垂直偏转系数 verticalDeflectCoefficientUnit: 'V', // 垂直偏转系数单位 standardValue: '', // 标准值 + nominalValueUnit: 'Ω', // 标称值单位 technicalIndex: '', // 技术指标 technicalIndexSymbol: '±', // 技术指标前符号 technicalIndexUnit: '%', // 技术指标单位 @@ -1052,9 +1053,12 @@ } } }) +const $route = useRoute() watch(() => props.form, (newValue) => { - if (newValue && Object.keys(newValue).length) { + const updataOld = $route.query.updataOld as string + console.log(updataOld) + if (newValue && Object.keys(newValue).length && updataOld !== 'true') { form.value.appearanceFunctionCheck = newValue.appearanceFunctionCheck // 外观及功能性检查 form.value.timeBase = newValue.timeBase // 时基(示波器-数字) form.value.scanTimeCoefficient = newValue.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟) @@ -1291,7 +1295,7 @@ - + diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index 1ff1a29..2b66893 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -380,7 +380,7 @@ { form.value.itemCategoryName = itemList.value.find(item => item.id === form.value.itemCategoryId)!.name form.value.belongStandardEquipmentName = standardList.value.find(item => item.value === form.value.belongStandardEquipment)!.name + form.value.updataOld = true emits('confirm', form.value) dialogFormVisible.value = false }) @@ -115,6 +117,7 @@ itemCategoryId: '', // 设备检定项分类表id itemCategoryName: '', // 设备检定项分类名字 configType: '', + updataOld: false, // 是否更新了之前的配置 } } // 初始化 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 531371e..c73fb2e 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -150,6 +150,7 @@ getId = res.data } loading.close() + console.log('-------------------', form.updataOld) $router.push({ path: `measureItem/edit/${getId}`, @@ -159,6 +160,7 @@ itemCategoryId: form.itemCategoryId, // 设备检定项分类id itemCategoryName: form.itemCategoryName, // 设备检定项分类名称 belongStandardEquipment: form.belongStandardEquipment, // 检校标准装置(字典code) + updataOld: `${form.updataOld}`, // 是否更新了检定项或者标准装置 }, }) } diff --git a/src/views/equipement/standard/book/components/config/fourth/config.vue b/src/views/equipement/standard/book/components/config/fourth/config.vue index 02d03c2..340d92f 100644 --- a/src/views/equipement/standard/book/components/config/fourth/config.vue +++ b/src/views/equipement/standard/book/components/config/fourth/config.vue @@ -98,7 +98,7 @@ { text: '核查点', value: 'checkPoint', align: 'center', required: true }, { text: '循环次数（正行程和反行程）', value: 'cycleNumber', align: 'center', required: true }, { text: '最大允许误差绝对值', value: 'maximumErrorAbsolute', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_electrical_signal = ref([ // 电信号表头 { text: '核查项目', value: 'checkItem', align: 'center', required: true }, @@ -106,7 +106,7 @@ { text: '核查点', value: 'checkPoint', align: 'center', required: true }, { text: '核查标准示值', value: 'standardIndication', align: 'center', required: true }, { text: '最大允许误差绝对值', value: 'maximumErrorAbsolute', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 校验表格（点击保存的时候、增加行用） const checkList = (list: any, title: string) => { diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index ddaa194..5278ff3 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -100,7 +100,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差(Ω)', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -110,7 +110,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -121,7 +121,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true, width: '180' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -132,7 +132,7 @@ { text: '端钮电压(V)', value: 'terminalVoltage', align: 'center', required: true, width: '180' }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -141,7 +141,7 @@ { text: '检定项目', value: 'params', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -151,7 +151,7 @@ { text: '标准值', value: 'standardValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_bottom_earth_resistanc_simulation = ref([ // 模拟式接地电阻--下面表格（辅助接地电阻试验） @@ -159,7 +159,7 @@ { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // ---------------------------------------------表格操作------------------------------------------------ @@ -576,6 +576,16 @@ :disabled="pageType === 'detail'" class="full-width-input" /> + + + diff --git a/src/views/business/measure/item/components/thirteenth/templateDetail.vue b/src/views/business/measure/item/components/thirteenth/templateDetail.vue index 8b26394..43b88d8 100644 --- a/src/views/business/measure/item/components/thirteenth/templateDetail.vue +++ b/src/views/business/measure/item/components/thirteenth/templateDetail.vue @@ -401,7 +401,7 @@ bandWidth: '', // 频带宽度 bandWidthUnit: 'Hz', // 频带宽度单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'dB', // 技术指标单位 }) break @@ -440,7 +440,7 @@ horizontalDeflectCoefficient: '', // 水平偏转系数单位 horizontalDeflectCoefficientUnit: 'ns', // 水平偏转系数单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'ns', // 技术指标单位 }) break @@ -454,6 +454,7 @@ verticalDeflectCoefficient: '', // 垂直偏转系数 verticalDeflectCoefficientUnit: 'V', // 垂直偏转系数单位 standardValue: '', // 标准值 + nominalValueUnit: 'Ω', // 标称值单位 technicalIndex: '', // 技术指标 technicalIndexSymbol: '±', // 技术指标前符号 technicalIndexUnit: '%', // 技术指标单位 @@ -1052,9 +1053,12 @@ } } }) +const $route = useRoute() watch(() => props.form, (newValue) => { - if (newValue && Object.keys(newValue).length) { + const updataOld = $route.query.updataOld as string + console.log(updataOld) + if (newValue && Object.keys(newValue).length && updataOld !== 'true') { form.value.appearanceFunctionCheck = newValue.appearanceFunctionCheck // 外观及功能性检查 form.value.timeBase = newValue.timeBase // 时基(示波器-数字) form.value.scanTimeCoefficient = newValue.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟) @@ -1291,7 +1295,7 @@ - + diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index 1ff1a29..2b66893 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -380,7 +380,7 @@ { form.value.itemCategoryName = itemList.value.find(item => item.id === form.value.itemCategoryId)!.name form.value.belongStandardEquipmentName = standardList.value.find(item => item.value === form.value.belongStandardEquipment)!.name + form.value.updataOld = true emits('confirm', form.value) dialogFormVisible.value = false }) @@ -115,6 +117,7 @@ itemCategoryId: '', // 设备检定项分类表id itemCategoryName: '', // 设备检定项分类名字 configType: '', + updataOld: false, // 是否更新了之前的配置 } } // 初始化 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 531371e..c73fb2e 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -150,6 +150,7 @@ getId = res.data } loading.close() + console.log('-------------------', form.updataOld) $router.push({ path: `measureItem/edit/${getId}`, @@ -159,6 +160,7 @@ itemCategoryId: form.itemCategoryId, // 设备检定项分类id itemCategoryName: form.itemCategoryName, // 设备检定项分类名称 belongStandardEquipment: form.belongStandardEquipment, // 检校标准装置(字典code) + updataOld: `${form.updataOld}`, // 是否更新了检定项或者标准装置 }, }) } diff --git a/src/views/equipement/standard/book/components/config/fourth/config.vue b/src/views/equipement/standard/book/components/config/fourth/config.vue index 02d03c2..340d92f 100644 --- a/src/views/equipement/standard/book/components/config/fourth/config.vue +++ b/src/views/equipement/standard/book/components/config/fourth/config.vue @@ -98,7 +98,7 @@ { text: '核查点', value: 'checkPoint', align: 'center', required: true }, { text: '循环次数（正行程和反行程）', value: 'cycleNumber', align: 'center', required: true }, { text: '最大允许误差绝对值', value: 'maximumErrorAbsolute', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_electrical_signal = ref([ // 电信号表头 { text: '核查项目', value: 'checkItem', align: 'center', required: true }, @@ -106,7 +106,7 @@ { text: '核查点', value: 'checkPoint', align: 'center', required: true }, { text: '核查标准示值', value: 'standardIndication', align: 'center', required: true }, { text: '最大允许误差绝对值', value: 'maximumErrorAbsolute', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 校验表格（点击保存的时候、增加行用） const checkList = (list: any, title: string) => { diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue index 4ad3734..fd5afbe 100644 --- a/src/views/equipement/standard/book/components/config/third/config.vue +++ b/src/views/equipement/standard/book/components/config/third/config.vue @@ -54,7 +54,7 @@ { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' }, { text: '核查点', value: 'checkPoint', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' }, { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' }, { text: '核查类型', value: 'checkType', align: 'center', required: true, width: '220' }, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 3bdf6a1..6207d68 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -172,7 +172,7 @@ } } defineExpose({ - clearMulti, initColumnsState, + clearMulti, initColumnsState, table, }) onBeforeMount(() => { initColumnsState() diff --git a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue index 42a153f..051dcf5 100644 --- a/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailAddRowPattern.vue @@ -29,7 +29,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -42,7 +42,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -56,7 +56,7 @@ { text: '量', value: 'capacity', align: 'center', required: true, width: '120' }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -71,7 +71,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '线圈放大', value: 'coilEnlarge', align: 'center', required: false, width: '120' }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true }, @@ -85,7 +85,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '示值', value: 'indicatingValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '200' }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true }, diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 355721d..3934ce4 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true }, { text: '频率', value: 'frequency', align: 'center' }, diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index 65a8886..e91c597 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -140,7 +140,7 @@ { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'number' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'number' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value', width: '300' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'number', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 电压表示值误差(数字式) const columns_voltage_representation = ref(columns_voltage_representation_value_error_number.value) diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index ddaa194..5278ff3 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -100,7 +100,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差(Ω)', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -110,7 +110,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -121,7 +121,7 @@ { text: '量程', value: 'rangeRange', align: 'center', required: true, width: '180' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, width: '180' }, { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, width: '180' }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, width: '260' }, @@ -132,7 +132,7 @@ { text: '端钮电压(V)', value: 'terminalVoltage', align: 'center', required: true, width: '180' }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -141,7 +141,7 @@ { text: '检定项目', value: 'params', align: 'center', required: true }, { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度a', value: 'accuracyA', align: 'center', required: true }, { text: '最大允许误差', value: 'maximumError', align: 'center', required: false }, ]) @@ -151,7 +151,7 @@ { text: '标准值', value: 'standardValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_bottom_earth_resistanc_simulation = ref([ // 模拟式接地电阻--下面表格（辅助接地电阻试验） @@ -159,7 +159,7 @@ { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true }, { text: '辅助地阻', value: 'auxiliaryGroundResistance', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true, width: '90' }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // ---------------------------------------------表格操作------------------------------------------------ @@ -576,6 +576,16 @@ :disabled="pageType === 'detail'" class="full-width-input" /> + + + diff --git a/src/views/business/measure/item/components/thirteenth/templateDetail.vue b/src/views/business/measure/item/components/thirteenth/templateDetail.vue index 8b26394..43b88d8 100644 --- a/src/views/business/measure/item/components/thirteenth/templateDetail.vue +++ b/src/views/business/measure/item/components/thirteenth/templateDetail.vue @@ -401,7 +401,7 @@ bandWidth: '', // 频带宽度 bandWidthUnit: 'Hz', // 频带宽度单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'dB', // 技术指标单位 }) break @@ -440,7 +440,7 @@ horizontalDeflectCoefficient: '', // 水平偏转系数单位 horizontalDeflectCoefficientUnit: 'ns', // 水平偏转系数单位 technicalIndex: '', // 技术指标 - technicalIndexSymbol: '±', // 技术指标前符号 + technicalIndexSymbol: '<', // 技术指标前符号 technicalIndexUnit: 'ns', // 技术指标单位 }) break @@ -454,6 +454,7 @@ verticalDeflectCoefficient: '', // 垂直偏转系数 verticalDeflectCoefficientUnit: 'V', // 垂直偏转系数单位 standardValue: '', // 标准值 + nominalValueUnit: 'Ω', // 标称值单位 technicalIndex: '', // 技术指标 technicalIndexSymbol: '±', // 技术指标前符号 technicalIndexUnit: '%', // 技术指标单位 @@ -1052,9 +1053,12 @@ } } }) +const $route = useRoute() watch(() => props.form, (newValue) => { - if (newValue && Object.keys(newValue).length) { + const updataOld = $route.query.updataOld as string + console.log(updataOld) + if (newValue && Object.keys(newValue).length && updataOld !== 'true') { form.value.appearanceFunctionCheck = newValue.appearanceFunctionCheck // 外观及功能性检查 form.value.timeBase = newValue.timeBase // 时基(示波器-数字) form.value.scanTimeCoefficient = newValue.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟) @@ -1291,7 +1295,7 @@ - + diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index 1ff1a29..2b66893 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -380,7 +380,7 @@ { form.value.itemCategoryName = itemList.value.find(item => item.id === form.value.itemCategoryId)!.name form.value.belongStandardEquipmentName = standardList.value.find(item => item.value === form.value.belongStandardEquipment)!.name + form.value.updataOld = true emits('confirm', form.value) dialogFormVisible.value = false }) @@ -115,6 +117,7 @@ itemCategoryId: '', // 设备检定项分类表id itemCategoryName: '', // 设备检定项分类名字 configType: '', + updataOld: false, // 是否更新了之前的配置 } } // 初始化 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 531371e..c73fb2e 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -150,6 +150,7 @@ getId = res.data } loading.close() + console.log('-------------------', form.updataOld) $router.push({ path: `measureItem/edit/${getId}`, @@ -159,6 +160,7 @@ itemCategoryId: form.itemCategoryId, // 设备检定项分类id itemCategoryName: form.itemCategoryName, // 设备检定项分类名称 belongStandardEquipment: form.belongStandardEquipment, // 检校标准装置(字典code) + updataOld: `${form.updataOld}`, // 是否更新了检定项或者标准装置 }, }) } diff --git a/src/views/equipement/standard/book/components/config/fourth/config.vue b/src/views/equipement/standard/book/components/config/fourth/config.vue index 02d03c2..340d92f 100644 --- a/src/views/equipement/standard/book/components/config/fourth/config.vue +++ b/src/views/equipement/standard/book/components/config/fourth/config.vue @@ -98,7 +98,7 @@ { text: '核查点', value: 'checkPoint', align: 'center', required: true }, { text: '循环次数（正行程和反行程）', value: 'cycleNumber', align: 'center', required: true }, { text: '最大允许误差绝对值', value: 'maximumErrorAbsolute', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) const columns_electrical_signal = ref([ // 电信号表头 { text: '核查项目', value: 'checkItem', align: 'center', required: true }, @@ -106,7 +106,7 @@ { text: '核查点', value: 'checkPoint', align: 'center', required: true }, { text: '核查标准示值', value: 'standardIndication', align: 'center', required: true }, { text: '最大允许误差绝对值', value: 'maximumErrorAbsolute', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, ]) // 校验表格（点击保存的时候、增加行用） const checkList = (list: any, title: string) => { diff --git a/src/views/equipement/standard/book/components/config/third/config.vue b/src/views/equipement/standard/book/components/config/third/config.vue index 4ad3734..fd5afbe 100644 --- a/src/views/equipement/standard/book/components/config/third/config.vue +++ b/src/views/equipement/standard/book/components/config/third/config.vue @@ -54,7 +54,7 @@ { text: '核查项目', value: 'params', align: 'center', required: true, width: '90' }, { text: '核查点', value: 'checkPoint', align: 'center', required: true }, { text: '单位', value: 'unit', align: 'center', required: true }, - { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) < 1 } }, + { text: '分辨力', value: 'resolution', align: 'center', required: true, width: '220', reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '200' }, { text: '测量标准相对扩展不确定度Urel', value: 'urel', align: 'center', required: true, width: '200' }, { text: '核查类型', value: 'checkType', align: 'center', required: true, width: '220' }, diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue index 08e8c0b..ff23c55 100644 --- a/src/views/resource/customer/info/list.vue +++ b/src/views/resource/customer/info/list.vue @@ -180,7 +180,7 @@ dateRange.value = ['', ''] fetchData(true) } - +const tableRef = ref() // 表格组件ref // 审批按钮点击切换事件 const changeCurrentButton = (val: string) => { active.value = val // 此时的tab @@ -189,8 +189,11 @@ const hasStatus = columns.value.filter((col) => { return col.value === statusColumn.value.value }) + console.log('-------', val) if (val === '0') { + console.log('全部hasStatus.length', hasStatus.length) + // 全部的时候不要显示审批状态 if (hasStatus.length > 0) { columns.value.pop() @@ -199,8 +202,9 @@ else { // 其他状态下要显示审批状态字段 if (hasStatus.length === 0) { - columns.value.push(statusColumn.value) + columns.value.push({ text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' }) } + // tableRef.value.table.doLayout() } reset() // 刷新 @@ -309,18 +313,18 @@ searchQuery.value.createTimeEnd = '' } }) -watch(() => active.value, (val) => { - if (val === '10') { // 审批把审批状态加上 - if (columns.value[columns.value.length - 1].value !== 'approvalStatusName') { - columns.value.push({ text: '审批状态', value: 'approvalStatusName', align: 'center' }) - } - } - else { // 其他不显示审批状态 - if (columns.value[columns.value.length - 1].value === 'approvalStatusName') { - columns.value.pop() - } - } -}, { immediate: true }) +// watch(() => active.value, (val) => { +// if (val === '10') { // 审批把审批状态加上 +// if (columns.value[columns.value.length - 1].value !== 'approvalStatusName') { +// columns.value.push({ text: '审批状态', value: 'approvalStatusName', align: 'center' }) +// } +// } +// else { // 其他不显示审批状态 +// if (columns.value[columns.value.length - 1].value === 'approvalStatusName') { +// columns.value.pop() +// } +// } +// }, { immediate: true }) onMounted(async () => { await getDict() @@ -361,6 +365,7 @@