diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index e91c597..d9c25a8 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -122,14 +122,14 @@ { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' }, { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' }, { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'select' }, - { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, + { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) const columns_load_regulation = ref([ // 负载调整率 { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' }, { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' }, { text: '负载情况', value: 'loadSituation', align: 'center', required: true, type: 'select' }, - { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, + { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) // 电压表示值误差(数字式)、电流表示值误差(直接测量)--(数字式) const columns_voltage_representation_value_error_number = ref([ @@ -188,14 +188,14 @@ { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' }, { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' }, - { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, + { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) // 输出电压短期稳定性 const columns_output_voltage_stability = ref([ { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' }, { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' }, - { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, + { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) // --------------------------------表格操作--------------------------------------------------- // 多选 diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue index e91c597..d9c25a8 100644 --- a/src/views/business/measure/item/components/second/templateDetail.vue +++ b/src/views/business/measure/item/components/second/templateDetail.vue @@ -122,14 +122,14 @@ { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' }, { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' }, { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'select' }, - { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, + { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) const columns_load_regulation = ref([ // 负载调整率 { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' }, { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' }, { text: '负载情况', value: 'loadSituation', align: 'center', required: true, type: 'select' }, - { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, + { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) // 电压表示值误差(数字式)、电流表示值误差(直接测量)--(数字式) const columns_voltage_representation_value_error_number = ref([ @@ -188,14 +188,14 @@ { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' }, { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' }, - { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, + { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) // 输出电压短期稳定性 const columns_output_voltage_stability = ref([ { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' }, { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' }, - { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, + { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) // --------------------------------表格操作--------------------------------------------------- // 多选 diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue index f789db0..1788f6c 100644 --- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue @@ -285,8 +285,8 @@ { text: '四次谐波幅度', value: 'sixValue', align: 'center', required: false, type: pageType.value === 'detail' ? 'text' : 'number' }, { text: '四次谐波失真', value: 'sevenValue', align: 'center', required: false, type: 'text' }, { text: '二次谐波失真指标上限', value: 'upperIndexTwice', align: 'center', required: false, type: 'text' }, - { text: '三次谐波失真指标上限', value: 'upperIndexThrice', align: 'center', required: false, type: 'text' }, - { text: '四次谐波失真指标上限', value: 'upperIndexQuartic', align: 'center', required: false, type: 'text' }, + { text: '三次谐波失真指标上限', value: 'upperIndexThrice', align: 'center', required: false, type: '' }, + { text: '四次谐波失真指标上限', value: 'upperIndexQuartic', align: 'center', required: false, type: '' }, { text: '结论', value: 'conclusion', align: 'center', required: false, type: 'text' }, ]) // 谐波失真展示单位的列 @@ -869,6 +869,22 @@ + + + + + + @@ -923,7 +939,7 @@ -